#2189 change the get type name fn by xsd reader

Author: DavidBlaa

Components/XML/BExIS.Xml.Helpers/Mapping/XmlSchemaManager.cs

@@ -716,7 +716,7 @@ public long GenerateMetadataStructure(string nameOfStartNode, string schemaName)
                         //Debug.Writeline("package : " + element.Name);
                         //Debug.Writeline("--------------------------");
 
-                        string typeName = GetTypeOfName(element.Name);
+                        string typeName = GetTypeOfName(element);
                         string rootName = ((XmlSchemaElement)root).Name;
 
                         string xpathInternal = "Metadata/" + element.Name + "/" + typeName;
@@ -965,7 +965,7 @@ private MetadataCompoundAttribute get(XmlSchemaElement element, List<string> par
             if (ct.Name != null)
                 nameOfType = ct.Name;
             else
-                nameOfType = GetTypeOfName(element.Name);
+                nameOfType = GetTypeOfName(element);
 
             MetadataCompoundAttribute metadataCompountAttr = getExistingMetadataCompoundAttribute(nameOfType);
             string currentInternalXPath = internalXPath + "/" + element.Name + "/" + nameOfType;
@@ -1328,9 +1328,9 @@ private MetadataCompoundAttribute addMetadataAttributeToMetadataCompoundAttribut
                 MetadataAttribute attribute;
 
                 if (metadataAttributeManager.MetadataAttributeRepo != null &&
-                    getExistingMetadataAttribute(GetTypeOfName(element.Name)) != null)
+                    getExistingMetadataAttribute(GetTypeOfName(element)) != null)
                 {
-                    attribute = getExistingMetadataAttribute(GetTypeOfName(element.Name));
+                    attribute = getExistingMetadataAttribute(GetTypeOfName(element));
                 }
                 else
                 {
@@ -1443,7 +1443,7 @@ private MetadataAttribute createMetadataAttribute(XmlSchemaElement element, stri
                 {
                     XmlSchemaSimpleType type = (XmlSchemaSimpleType)element.ElementSchemaType;
 
-                    string name = GetTypeOfName(element.Name);
+                    string name = GetTypeOfName(element);
                     string description = "";
 
                     if (element.Annotation != null)
@@ -1507,7 +1507,7 @@ private MetadataAttribute createMetadataAttribute(XmlSchemaElement element, stri
                     var t = ComplexTypes.FirstOrDefault(c => c.Name.Equals(type.Name));
                     if (t != null) type = t;
 
-                    string name = GetTypeOfName(element.Name);
+                    string name = GetTypeOfName(element);
                     string description = "";
 
                     if (element.Annotation != null)
@@ -1628,7 +1628,8 @@ private MetadataCompoundAttribute createMetadataCompoundAttribute(XmlSchemaEleme
             {
                 // create a compoundAttribute
                 int i = 0;
-                MetadataCompoundAttribute mca = getExistingMetadataCompoundAttribute(element.Name + "Type"); ;// = metadataAttributeManager.MetadataCompoundAttributeRepo.Get(p => p.Name == element.Name+"Type").FirstOrDefault();
+                string typeName = GetTypeOfName(element);
+                MetadataCompoundAttribute mca = getExistingMetadataCompoundAttribute(typeName); ;// = metadataAttributeManager.MetadataCompoundAttributeRepo.Get(p => p.Name == element.Name+"Type").FirstOrDefault();
                                                                                                               //Debug.WriteLine("createMetadataCompoundAttribute" + i++);
                 DataType dt1 = dataTypeManager.Repo.Get(p => p.Name.ToLower().Equals("text")).FirstOrDefault();
                 if (dt1 == null)
@@ -1640,8 +1641,8 @@ private MetadataCompoundAttribute createMetadataCompoundAttribute(XmlSchemaEleme
                 {
                     mca = new MetadataCompoundAttribute
                     {
-                        ShortName = GetTypeOfName(element.Name),
-                        Name = GetTypeOfName(element.Name),
+                        ShortName = typeName,
+                        Name = typeName,
                         Description = "",
                         DataType = dt1
                     };
@@ -1909,9 +1910,9 @@ private void addMetadataAttributeToMappingFile(MetadataCompoundAttribute compoun
                 MetadataAttribute attribute;
 
                 if (metadataAttributeManager.MetadataAttributeRepo != null &&
-                        metadataAttributeManager.MetadataAttributeRepo.Query().Where(m => m.Name.Equals(GetTypeOfName(element.Name))).Count() > 0)
+                        metadataAttributeManager.MetadataAttributeRepo.Query().Where(m => m.Name.Equals(GetTypeOfName(element))).Count() > 0)
                 {
-                    attribute = metadataAttributeManager.MetadataAttributeRepo.Query().Where(m => m.Name.Equals(GetTypeOfName(element.Name))).First();
+                    attribute = metadataAttributeManager.MetadataAttributeRepo.Query().Where(m => m.Name.Equals(GetTypeOfName(element))).First();
                 }
                 else
                 {
@@ -2203,9 +2204,28 @@ private void checkDirectory(string filePath)
             }
         }
 
-        private string GetTypeOfName(string name)
+        private string GetTypeOfName(XmlSchemaElement element)
         {
-            return name + "Type";
+            string nameOfType = "";
+
+            // check if type is complex
+            XmlSchemaComplexType ct = XmlSchemaUtility.GetComplextType(element);
+
+            if (ct != null && ct.Name != null)
+            {
+                return ct.Name;
+            }
+
+            //check if simple type
+            XmlSchemaSimpleType st = XmlSchemaUtility.GetSimpleType(element);
+
+            if(st != null && st.Name != null)
+            {
+                return st.Name;
+            }
+
+            // nothing found so create a new name + XSDType
+            return element.Name + element.ElementType.GetType().Name; // bexis2InternType
         }
 
         #endregion helper functions

Components/XML/BExIS.Xml.Helpers/XmlSchemaUtility.cs

@@ -524,6 +524,14 @@ public static XmlSchemaComplexType GetComplextType(XmlSchemaElement element)
             return null;
         }
 
+        public static XmlSchemaSimpleType GetSimpleType(XmlSchemaElement element)
+        {
+            if (element.ElementSchemaType is XmlSchemaSimpleType)
+                return element.ElementSchemaType as XmlSchemaSimpleType;
+
+            return null;
+        }
+
         public static List<XmlSchemaElement> GetAllSimpleElements(List<XmlSchemaElement> elements)
         {
             List<XmlSchemaElement> simpleElementList = new List<XmlSchemaElement>();

Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI/SMM.Manifest.xml

@@ -12,21 +12,21 @@
 	<Exports>
 		<!--add proper menu items-->
 
-		<Export tag="settings" id="createDataset" order="1"
+		<!--<Export tag="settings" id="createDataset" order="1"
 						title="Manage Parties" description="" icon=""
 						controller="Party" action="index"
-						extends="./settingsRoot" />
+						extends="./settingsRoot" />-->
 
 		<!-- INTERNAL-->
 
-		<Export tag="internalApi" id="loadFromPartyUserRegisterationForm"
+		<!--<Export tag="internalApi" id="loadFromPartyUserRegisterationForm"
 						title="Load From Party User Registration Form" description="Load FromParty User Registration Form" icon=""
 						controller="PartyService" action="UserRegistration"
 						extends="" />
 		<Export tag="internalApi" id="GetPartyTypesForAccount"
 				title="Get partyTypes for account" description="Get partyTypes for account which are defined in setting.xml" icon=""
 				controller="PartyService" action="GetPartyTypesForAccount"
-				extends="" />
+				extends="" />-->
 		<Export tag="lunchbar" id="helpSmm" order="2"
 						title="Account / Parties" description="Parties Help Manual" icon=""
 						controller="Help" action="index"