Implemented DAL Observables auto enumerations generation.

16 files changed, 224 insertions, 19 deletions

diff --git a/Software/Visual_Studio/Tango.CodeGeneration/EnumerationField.cs b/Software/Visual_Studio/Tango.CodeGeneration/EnumerationField.cs
new file mode 100644
index 000000000..f8bb98b9b
--- /dev/null
+++ b/Software/Visual_Studio/Tango.CodeGeneration/EnumerationField.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.CodeGeneration
+{
+    public class EnumerationField
+    {
+        public String Name { get; set; }
+        public int Value { get; set; }
+        public String Description { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/EnumerationFile.cs b/Software/Visual_Studio/Tango.CodeGeneration/EnumerationFile.cs
new file mode 100644
index 000000000..e49b7fa48
--- /dev/null
+++ b/Software/Visual_Studio/Tango.CodeGeneration/EnumerationFile.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.CodeGeneration
+{
+    public class EnumerationFile : CodeFile
+    {
+        public String Name { get; set; }
+
+        public List<EnumerationField> Fields { get; set; }
+
+        public EnumerationFile()
+        {
+            Fields = new List<EnumerationField>();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
index e9f1fd586..e2cc941e7 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
@@ -65,6 +65,8 @@
     <Compile Include="CodeObject.cs" />
     <Compile Include="DpProperty.cs" />
     <Compile Include="EntityCodeFile.cs" />
+    <Compile Include="EnumerationField.cs" />
+    <Compile Include="EnumerationFile.cs" />
     <Compile Include="Helper.cs" />
     <Compile Include="ICodeObject.cs" />
     <Compile Include="Method.cs" />
@@ -93,6 +95,7 @@
     <None Include="packages.config" />
     <EmbeddedResource Include="Templates\Namespace.cshtml" />
     <EmbeddedResource Include="Templates\EntityCodeFile.cshtml" />
+    <EmbeddedResource Include="Templates\EnumerationFile.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EnumerationFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EnumerationFile.cshtml
new file mode 100644
index 000000000..408c9b3d5
--- /dev/null
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EnumerationFile.cshtml
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.ComponentModel;
+
+namespace Tango.DAL.Observables
+{
+    public enum @(Model.Name)
+    {
+        @foreach (var prop in Model.Fields)
+        {
+    <div>
+        /// <summary>
+        /// (@prop.Description)
+        /// </summary>
+        [Description("@(prop.Description)")]
+        @(prop.Name) = @(prop.Value),
+
+    </div>
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
index 801937352..83482b978 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
@@ -370,6 +370,7 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="CODE" Type="integer" Nullable="false" />
           <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
@@ -408,7 +409,7 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
-          <Property Name="CODE" Type="int" Nullable="false" />
+          <Property Name="CODE" Type="integer" Nullable="false" />
           <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
@@ -909,6 +910,7 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="CODE" Type="Int64" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
@@ -947,7 +949,7 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
-          <Property Name="CODE" Type="Int32" Nullable="false" />
+          <Property Name="CODE" Type="Int64" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
@@ -1396,6 +1398,7 @@
               <MappingFragment StoreEntitySet="PERMISSIONS">
                 <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="CODE" ColumnName="CODE" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
index ceebf2b45..e96c0836c 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
@@ -39,7 +39,7 @@
         <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="14.75" />
         <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="14.75" PointY="3.75" />
         <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="14.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="14.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="14.75" PointY="11.75" />
         <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="2.75" PointY="15.75" />
         <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="16.75" PointY="3.75" />
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/PERMISSION.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/PERMISSION.cs
index b154557a3..6052bccc0 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/PERMISSION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/PERMISSION.cs
@@ -18,6 +18,7 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public long CODE { get; set; }
         public string NAME { get; set; }
         public string DESCRIPTION { get; set; }
     }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/ROLE.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ROLE.cs
index cb5f6770c..66f453b4e 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/ROLE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/ROLE.cs
@@ -18,7 +18,7 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
-        public int CODE { get; set; }
+        public long CODE { get; set; }
         public string NAME { get; set; }
         public string DESCRIPTION { get; set; }
     }
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/.cs
new file mode 100644
index 000000000..7512e6b24
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.ComponentModel;
+
+namespace Tango.DAL.Observables
+{
+    public enum 
+    {
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Permission.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Permission.cs
index 27696112b..47e2d49b8 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Permission.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Permission.cs
@@ -10,6 +10,25 @@ namespace Tango.DAL.Observables
     public class Permission : ObservableEntity<PERMISSION>
     {
 
+        private Int32 _code;
+        /// <summary>
+        /// Gets or sets the permission code.
+        /// </summary>
+        [EntityFieldName("CODE")]
+        public Int32 Code
+        {
+            get 
+            {
+                return _code; 
+            }
+
+            set 
+            {
+                _code = value; RaisePropertyChanged(nameof(Code)); 
+            }
+
+        }
+
         private String _name;
         /// <summary>
         /// Gets or sets the permission name.
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/RolesEnum.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/RolesEnum.cs
new file mode 100644
index 000000000..0cdce2fbd
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/RolesEnum.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.ComponentModel;
+
+namespace Tango.DAL.Observables
+{
+    public enum RolesEnum
+    {
+
+        /// <summary>
+        /// (User with standard permissions)
+        /// </summary>
+        [Description("User with standard permissions")]
+        StandardUser = 0,
+
+        /// <summary>
+        /// (Admin Admin)
+        /// </summary>
+        [Description("Admin Admin")]
+        AdminUser = 1,
+
+        /// <summary>
+        /// (Technician Role)
+        /// </summary>
+        [Description("Technician Role")]
+        Technician = 2,
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesGenerator.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesGenerator.cs
index 5eeca0ab5..f1c62530b 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesGenerator.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesGenerator.cs
@@ -7,6 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.CodeGeneration;
 using Tango.DAL.Remote.DB;
+using Tango.Settings;
 
 namespace Tango.DAL.Observables
 {
@@ -53,6 +54,39 @@ namespace Tango.DAL.Observables
 
                 File.WriteAllText(Path.Combine(targetPath, codeFile.Name + ".cs"), code);
             }
+
+            //Generate Enumerations...
+            using (RemoteDB db = new RemoteDB(SettingsManager.Default.DataBase.SQLServerAddress, false))
+            {
+                EnumerationFile enumFile = new EnumerationFile();
+                enumFile.Name = "RolesEnum";
+
+                foreach (var row in db.ROLES)
+                {
+                    EnumerationField field = new EnumerationField();
+                    field.Name = row.NAME.Replace(" ", "");
+                    field.Description = row.DESCRIPTION;
+                    field.Value = row.CODE;
+                    enumFile.Fields.Add(field);
+                }
+
+                String code = enumFile.GenerateCode();
+                File.WriteAllText(Path.Combine(targetPath, enumFile.Name + ".cs"), code);
+
+                enumFile = new EnumerationFile();
+
+                foreach (var row in db.PERMISSIONS)
+                {
+                    EnumerationField field = new EnumerationField();
+                    field.Name = row.NAME.Replace(" ", "");
+                    field.Description = row.DESCRIPTION;
+                    field.Value = row.CODE;
+                    enumFile.Fields.Add(field);
+                }
+
+                code = enumFile.GenerateCode();
+                File.WriteAllText(Path.Combine(targetPath, enumFile.Name + ".cs"), code);
+            }
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj b/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj
index ee4c64da7..094d607cb 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj
@@ -53,6 +53,7 @@
     <Compile Include="..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
+    <Compile Include="Entities\RolesEnum.cs" />
     <Compile Include="EntityFieldNameAttribute.cs" />
     <Compile Include="ExtensionMethods.cs" />
     <Compile Include="IObservableEntity.cs" />
@@ -60,7 +61,46 @@
     <Compile Include="ObservableEntity.cs" />
     <Compile Include="ObservablesEntitiesAdapter.cs" />
     <Compile Include="ObservablesGenerator.cs" />
-    <Compile Include="Entities\*.cs" />
+    <Compile Include="Entities\Action.cs" />
+    <Compile Include="Entities\Address.cs" />
+    <Compile Include="Entities\ApplicationDisplayPanelVersion.cs" />
+    <Compile Include="Entities\ApplicationFirmwareVersion.cs" />
+    <Compile Include="Entities\ApplicationOsVersion.cs" />
+    <Compile Include="Entities\ApplicationVersion.cs" />
+    <Compile Include="Entities\Cartridge.cs" />
+    <Compile Include="Entities\CartridgeType.cs" />
+    <Compile Include="Entities\Configuration.cs" />
+    <Compile Include="Entities\Contact.cs" />
+    <Compile Include="Entities\Dispenser.cs" />
+    <Compile Include="Entities\DispenserType.cs" />
+    <Compile Include="Entities\EmbeddedFirmwareVersion.cs" />
+    <Compile Include="Entities\EmbeddedSoftwareVersion.cs" />
+    <Compile Include="Entities\Event.cs" />
+    <Compile Include="Entities\EventsAction.cs" />
+    <Compile Include="Entities\FiberShape.cs" />
+    <Compile Include="Entities\FiberSynthesis.cs" />
+    <Compile Include="Entities\HardwareVersion.cs" />
+    <Compile Include="Entities\IdsPack.cs" />
+    <Compile Include="Entities\LinearMassDensityUnit.cs" />
+    <Compile Include="Entities\Liquid.cs" />
+    <Compile Include="Entities\LiquidsRml.cs" />
+    <Compile Include="Entities\Machine.cs" />
+    <Compile Include="Entities\MachinesConfiguration.cs" />
+    <Compile Include="Entities\MachinesEvent.cs" />
+    <Compile Include="Entities\MachineVersion.cs" />
+    <Compile Include="Entities\MachineVersionsConfiguration.cs" />
+    <Compile Include="Entities\MediaColor.cs" />
+    <Compile Include="Entities\MediaCondition.cs" />
+    <Compile Include="Entities\MediaMaterial.cs" />
+    <Compile Include="Entities\MediaPurpos.cs" />
+    <Compile Include="Entities\Organization.cs" />
+    <Compile Include="Entities\Permission.cs" />
+    <Compile Include="Entities\Rml.cs" />
+    <Compile Include="Entities\Role.cs" />
+    <Compile Include="Entities\RolesPermission.cs" />
+    <Compile Include="Entities\SyncConfiguration.cs" />
+    <Compile Include="Entities\User.cs" />
+    <Compile Include="Entities\UsersRole.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/PERMISSION.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/PERMISSION.cs
index 106c4b5a7..c342b49c0 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/PERMISSION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/PERMISSION.cs
@@ -24,6 +24,7 @@ namespace Tango.DAL.Remote.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public int CODE { get; set; }
         public string NAME { get; set; }
         public string DESCRIPTION { get; set; }
     
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index ac41dd749..618616584 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -382,6 +382,7 @@
           <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="CODE" Type="int" Nullable="false" />
           <Property Name="NAME" Type="nvarchar" MaxLength="30" Nullable="false" />
           <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="100" Nullable="false" />
         </EntityType>
@@ -1847,6 +1848,7 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="CODE" Type="Int32" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="30" FixedLength="false" Unicode="true" />
           <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" />
           <NavigationProperty Name="ROLES_PERMISSIONS" Relationship="RemoteModel.FK_ROLES_PERMISSIONS_PERMISSIONS" FromRole="PERMISSION" ToRole="ROLES_PERMISSIONS" />
@@ -2880,6 +2882,7 @@
               <MappingFragment StoreEntitySet="PERMISSIONS">
                 <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="CODE" ColumnName="CODE" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index 523f29bb1..77ddcf4bd 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -7,25 +7,25 @@
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
         <EntityTypeShape EntityType="RemoteModel.ACTION" Width="1.5" PointX="9" PointY="36.625" />
         <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="36.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="15.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="23.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="0.75" PointY="18.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="6.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="15.375" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="18.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="0.75" PointY="20.875" />
         <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="0.75" PointY="45.5" />
         <EntityTypeShape EntityType="RemoteModel.CARTRIDGE" Width="1.5" PointX="3" PointY="45.375" />
         <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="4.5" />
         <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="40.875" />
         <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="2.625" />
         <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="20.875" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="6.25" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="12.75" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="10" />
         <EntityTypeShape EntityType="RemoteModel.EVENT" Width="1.5" PointX="6" PointY="40.5" />
         <EntityTypeShape EntityType="RemoteModel.EVENTS_ACTIONS" Width="1.5" PointX="11.25" PointY="40.625" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="5.75" PointY="12.375" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHESISES" Width="1.5" PointX="5.75" PointY="24.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="10" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="5.75" PointY="15.625" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHESISES" Width="1.5" PointX="5.75" PointY="21.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="23.625" />
         <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="5.625" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="5.75" PointY="27.875" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="5.75" PointY="12.375" />
         <EntityTypeShape EntityType="RemoteModel.LIQUID" Width="1.5" PointX="3" PointY="10.875" />
         <EntityTypeShape EntityType="RemoteModel.LIQUIDS_RMLS" Width="1.5" PointX="10.25" PointY="12.25" />
         <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="26.5" />
@@ -33,12 +33,12 @@
         <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="30.125" />
         <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="5.25" PointY="2" />
         <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="8.25" PointY="30.25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="5.75" PointY="21.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="5.75" PointY="15.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="5.75" PointY="31" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="5.75" PointY="25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="5.75" PointY="31" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="5.75" PointY="27.875" />
         <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="5.75" PointY="18.75" />
         <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="31.875" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="6.75" PointY="44.875" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="6.75" PointY="44.75" />
         <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="8" PointY="10.125" />
         <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="3.75" PointY="40.625" />
         <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="9" PointY="40.75" />