Set Submodel/Kind as per action

Author: juileetikekar

src/AasxPackageLogic/DispEditHelperEntities.cs

@@ -511,6 +511,14 @@ public void DisplayOrEditAasEntityAasEnv(
                             sm.Id = AdminShellUtil.GenerateIdAccordingTemplate(
                                 (buttonNdx == 2) ? Options.Curr.TemplateIdSubmodelInstance
                                     : Options.Curr.TemplateIdSubmodelTemplate);
+                            if(buttonNdx == 2)
+                            {
+                                sm.Kind = ModellingKind.Instance;
+                            }
+                            else
+                            {
+                                sm.Kind = ModellingKind.Template;
+                            }
                             env.Add(sm);
                             this.AddDiaryEntry(sm, new DiaryEntryStructChange(
                                 StructuralChangeReason.Create));
@@ -1350,8 +1358,12 @@ public void DisplayOrEditAasEntityAas(
                                 submodel.Kind = Aas.ModellingKind.Template;
                             }
                             else
+                            {
                                 submodel.Id = AdminShellUtil.GenerateIdAccordingTemplate(
                                     Options.Curr.TemplateIdSubmodelInstance);
+                                submodel.Kind = ModellingKind.Instance;
+                            }
+                                
 
                             // create ref
                             var smr = new Aas.Reference(Aas.ReferenceTypes.ModelReference, new List<Aas.IKey>() { new Aas.Key(Aas.KeyTypes.Submodel, submodel.Id) });

src/AasxPackageLogic/DispEditHelperModules.cs

@@ -348,11 +348,15 @@ public void DisplayOrEditEntityIdentifiable(AnyUiStackPanel stack,
                 new HintCheck(
                     () => {
                         int count = 0;
-                        foreach(var aas in env.AssetAdministrationShells)
+                        if(env != null && !env.AssetAdministrationShells.IsNullOrEmpty())
                         {
-                            if(aas.Id == identifiable.Id)
-                                count++;
+                            foreach(var aas in env.AssetAdministrationShells)
+                            {
+                                if(aas.Id == identifiable.Id)
+                                    count++;
+                            }
                         }
+                        
                         return (count >= 2?true:false);
                     },
                     "It is not allowed to have duplicate Ids in AAS of the same file. This will break functionality and we strongly encoure to make the Id unique!",