Lots of changes :/

7 files changed, 188 insertions, 66 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs
index 8fd81fd24..5447968ec 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs
@@ -29,9 +29,11 @@ namespace Tango.DAL.Remote.DB
         public string DESCRIPTION { get; set; }
         public string EVENT_TYPES_CATEGORY_GUID { get; set; }
         public string EVENT_TYPES_GROUP_GUID { get; set; }
+        public string HTML_PAGE_GUID { get; set; }
     
         public virtual EVENT_TYPES_GROUPS EVENT_TYPES_GROUPS { get; set; }
         public virtual EVENT_TYPES_CATEGORIES EVENT_TYPES_CATEGORIES { get; set; }
+        public virtual HTML_PAGES HTML_PAGES { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<EVENT_TYPES_ACTIONS> EVENT_TYPES_ACTIONS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_DANCERS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_DANCERS.cs
index 58f60dc58..21f6d2e84 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_DANCERS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_DANCERS.cs
@@ -23,6 +23,7 @@ namespace Tango.DAL.Remote.DB
         public double K { get; set; }
         public double X { get; set; }
         public int PULSE_PER_MM_SPRING { get; set; }
+        public int ZERO_POINT { get; set; }
     
         public virtual HARDWARE_DANCER_TYPES HARDWARE_DANCER_TYPES { get; set; }
         public virtual HARDWARE_VERSIONS HARDWARE_VERSIONS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HTML_PAGES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HTML_PAGES.cs
new file mode 100644
index 000000000..f0b1932c1
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HTML_PAGES.cs
@@ -0,0 +1,34 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Remote.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class HTML_PAGES
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public HTML_PAGES()
+        {
+            this.EVENT_TYPES = new HashSet<EVENT_TYPES>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public int CODE { get; set; }
+        public string NAME { get; set; }
+        public string DESCRIPTION { get; set; }
+        public string HTML { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<EVENT_TYPES> EVENT_TYPES { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
index 10da7a03b..06a12e5c7 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -57,6 +57,7 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<HARDWARE_VERSIONS> HARDWARE_VERSIONS { get; set; }
         public virtual DbSet<HARDWARE_WINDER_TYPES> HARDWARE_WINDER_TYPES { get; set; }
         public virtual DbSet<HARDWARE_WINDERS> HARDWARE_WINDERS { get; set; }
+        public virtual DbSet<HTML_PAGES> HTML_PAGES { get; set; }
         public virtual DbSet<IDS_PACK_FORMULAS> IDS_PACK_FORMULAS { get; set; }
         public virtual DbSet<IDS_PACKS> IDS_PACKS { get; set; }
         public virtual DbSet<JOB_RUNS> JOB_RUNS { 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 058977e64..0985da6fe 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -271,6 +271,7 @@
           <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="100" Nullable="false" />
           <Property Name="EVENT_TYPES_CATEGORY_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="EVENT_TYPES_GROUP_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="HTML_PAGE_GUID" Type="varchar" MaxLength="36" />
         </EntityType>
         <EntityType Name="EVENT_TYPES_ACTIONS">
           <Key>
@@ -348,6 +349,7 @@
           <Property Name="K" Type="float" Nullable="false" />
           <Property Name="X" Type="float" Nullable="false" />
           <Property Name="PULSE_PER_MM_SPRING" Type="int" Nullable="false" />
+          <Property Name="ZERO_POINT" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="HARDWARE_MOTOR_TYPES">
           <Key>
@@ -453,6 +455,18 @@
           <Property Name="HARDWARE_VERSION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="MILLIMETER_PER_ROTATION" Type="int" Nullable="false" />
         </EntityType>
+        <EntityType Name="HTML_PAGES">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="CODE" Type="int" Nullable="false" />
+          <Property Name="NAME" Type="varchar" MaxLength="50" Nullable="false" />
+          <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" />
+          <Property Name="HTML" Type="nvarchar(max)" />
+        </EntityType>
         <EntityType Name="IDS_PACK_FORMULAS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -1158,6 +1172,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_EVENT_TYPES_HTML_PAGES">
+          <End Role="HTML_PAGES" Type="Self.HTML_PAGES" Multiplicity="0..1" />
+          <End Role="EVENT_TYPES" Type="Self.EVENT_TYPES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="HTML_PAGES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="EVENT_TYPES">
+              <PropertyRef Name="HTML_PAGE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_EVENTS_ACTIONS_ACTIONS">
           <End Role="ACTION_TYPES" Type="Self.ACTION_TYPES" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -1869,6 +1895,7 @@
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="Self.HARDWARE_VERSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HARDWARE_WINDER_TYPES" EntityType="Self.HARDWARE_WINDER_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HARDWARE_WINDERS" EntityType="Self.HARDWARE_WINDERS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="HTML_PAGES" EntityType="Self.HTML_PAGES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="IDS_PACK_FORMULAS" EntityType="Self.IDS_PACK_FORMULAS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="IDS_PACKS" EntityType="Self.IDS_PACKS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="JOB_RUNS" EntityType="Self.JOB_RUNS" Schema="dbo" store:Type="Tables" />
@@ -1977,6 +2004,10 @@
             <End Role="EVENT_TYPES_CATEGORIES" EntitySet="EVENT_TYPES_CATEGORIES" />
             <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" />
           </AssociationSet>
+          <AssociationSet Name="FK_EVENT_TYPES_HTML_PAGES" Association="Self.FK_EVENT_TYPES_HTML_PAGES">
+            <End Role="HTML_PAGES" EntitySet="HTML_PAGES" />
+            <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" />
+          </AssociationSet>
           <AssociationSet Name="FK_EVENTS_ACTIONS_ACTIONS" Association="Self.FK_EVENTS_ACTIONS_ACTIONS">
             <End Role="ACTION_TYPES" EntitySet="ACTION_TYPES" />
             <End Role="EVENT_TYPES_ACTIONS" EntitySet="EVENT_TYPES_ACTIONS" />
@@ -2223,6 +2254,7 @@
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="RemoteModel.HARDWARE_VERSIONS" />
           <EntitySet Name="HARDWARE_WINDER_TYPES" EntityType="RemoteModel.HARDWARE_WINDER_TYPES" />
           <EntitySet Name="HARDWARE_WINDERS" EntityType="RemoteModel.HARDWARE_WINDERS" />
+          <EntitySet Name="HTML_PAGES" EntityType="RemoteModel.HTML_PAGES" />
           <EntitySet Name="IDS_PACK_FORMULAS" EntityType="RemoteModel.IDS_PACK_FORMULAS" />
           <EntitySet Name="IDS_PACKS" EntityType="RemoteModel.IDS_PACKS" />
           <EntitySet Name="JOB_RUNS" EntityType="RemoteModel.JOB_RUNS" />
@@ -2371,6 +2403,10 @@
             <End Role="EVENT_TYPES_CATEGORIES" EntitySet="EVENT_TYPES_CATEGORIES" />
             <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" />
           </AssociationSet>
+          <AssociationSet Name="FK_EVENT_TYPES_HTML_PAGES" Association="RemoteModel.FK_EVENT_TYPES_HTML_PAGES">
+            <End Role="HTML_PAGES" EntitySet="HTML_PAGES" />
+            <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" />
+          </AssociationSet>
           <AssociationSet Name="FK_EVENTS_ACTIONS_EVENTS" Association="RemoteModel.FK_EVENTS_ACTIONS_EVENTS">
             <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" />
             <End Role="EVENT_TYPES_ACTIONS" EntitySet="EVENT_TYPES_ACTIONS" />
@@ -2841,8 +2877,10 @@
           <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" />
           <Property Name="EVENT_TYPES_CATEGORY_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="EVENT_TYPES_GROUP_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="HTML_PAGE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <NavigationProperty Name="EVENT_TYPES_GROUPS" Relationship="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES" FromRole="EVENT_TYPES" ToRole="EVENT_TYPES_GROUPS" />
           <NavigationProperty Name="EVENT_TYPES_CATEGORIES" Relationship="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES1" FromRole="EVENT_TYPES" ToRole="EVENT_TYPES_CATEGORIES" />
+          <NavigationProperty Name="HTML_PAGES" Relationship="RemoteModel.FK_EVENT_TYPES_HTML_PAGES" FromRole="EVENT_TYPES" ToRole="HTML_PAGES" />
           <NavigationProperty Name="EVENT_TYPES_ACTIONS" Relationship="RemoteModel.FK_EVENTS_ACTIONS_EVENTS" FromRole="EVENT_TYPES" ToRole="EVENT_TYPES_ACTIONS" />
           <NavigationProperty Name="MACHINES_EVENTS" Relationship="RemoteModel.FK_MACHINES_EVENTS_EVENTS" FromRole="EVENT_TYPES" ToRole="MACHINES_EVENTS" />
         </EntityType>
@@ -2929,6 +2967,7 @@
           <Property Name="K" Type="Double" Nullable="false" />
           <Property Name="X" Type="Double" Nullable="false" />
           <Property Name="PULSE_PER_MM_SPRING" Type="Int32" Nullable="false" />
+          <Property Name="ZERO_POINT" Type="Int32" Nullable="false" />
           <NavigationProperty Name="HARDWARE_DANCER_TYPES" Relationship="RemoteModel.FK_HARDWARE_DANCERS_HARDWARE_DANCER_TYPES" FromRole="HARDWARE_DANCERS" ToRole="HARDWARE_DANCER_TYPES" />
           <NavigationProperty Name="HARDWARE_VERSIONS" Relationship="RemoteModel.FK_HARDWARE_DANCERS_HARDWARE_VERSIONS" FromRole="HARDWARE_DANCERS" ToRole="HARDWARE_VERSIONS" />
         </EntityType>
@@ -3050,6 +3089,19 @@
           <NavigationProperty Name="HARDWARE_VERSIONS" Relationship="RemoteModel.FK_HARDWARE_WINDERS_HARDWARE_VERSIONS" FromRole="HARDWARE_WINDERS" ToRole="HARDWARE_VERSIONS" />
           <NavigationProperty Name="HARDWARE_WINDER_TYPES" Relationship="RemoteModel.FK_HARDWARE_WINDERS_HARDWARE_WINDER_TYPES" FromRole="HARDWARE_WINDERS" ToRole="HARDWARE_WINDER_TYPES" />
         </EntityType>
+        <EntityType Name="HTML_PAGES">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <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="CODE" Type="Int32" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="HTML" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="EVENT_TYPES" Relationship="RemoteModel.FK_EVENT_TYPES_HTML_PAGES" FromRole="HTML_PAGES" ToRole="EVENT_TYPES" />
+        </EntityType>
         <EntityType Name="IDS_PACK_FORMULAS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -3967,6 +4019,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_EVENT_TYPES_HTML_PAGES">
+          <End Type="RemoteModel.HTML_PAGES" Role="HTML_PAGES" Multiplicity="0..1" />
+          <End Type="RemoteModel.EVENT_TYPES" Role="EVENT_TYPES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="HTML_PAGES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="EVENT_TYPES">
+              <PropertyRef Name="HTML_PAGE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_EVENTS_ACTIONS_EVENTS">
           <End Type="RemoteModel.EVENT_TYPES" Role="EVENT_TYPES" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -4791,6 +4855,7 @@
           <EntitySetMapping Name="EVENT_TYPES">
             <EntityTypeMapping TypeName="RemoteModel.EVENT_TYPES">
               <MappingFragment StoreEntitySet="EVENT_TYPES">
+                <ScalarProperty Name="HTML_PAGE_GUID" ColumnName="HTML_PAGE_GUID" />
                 <ScalarProperty Name="EVENT_TYPES_GROUP_GUID" ColumnName="EVENT_TYPES_GROUP_GUID" />
                 <ScalarProperty Name="EVENT_TYPES_CATEGORY_GUID" ColumnName="EVENT_TYPES_CATEGORY_GUID" />
                 <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
@@ -4874,6 +4939,7 @@
           <EntitySetMapping Name="HARDWARE_DANCERS">
             <EntityTypeMapping TypeName="RemoteModel.HARDWARE_DANCERS">
               <MappingFragment StoreEntitySet="HARDWARE_DANCERS">
+                <ScalarProperty Name="ZERO_POINT" ColumnName="ZERO_POINT" />
                 <ScalarProperty Name="PULSE_PER_MM_SPRING" ColumnName="PULSE_PER_MM_SPRING" />
                 <ScalarProperty Name="X" ColumnName="X" />
                 <ScalarProperty Name="K" ColumnName="K" />
@@ -4997,6 +5063,19 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="HTML_PAGES">
+            <EntityTypeMapping TypeName="RemoteModel.HTML_PAGES">
+              <MappingFragment StoreEntitySet="HTML_PAGES">
+                <ScalarProperty Name="HTML" ColumnName="HTML" />
+                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="CODE" ColumnName="CODE" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="IDS_PACK_FORMULAS">
             <EntityTypeMapping TypeName="RemoteModel.IDS_PACK_FORMULAS">
               <MappingFragment StoreEntitySet="IDS_PACK_FORMULAS">
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 cc3421bd6..a77d11e6e 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,74 +5,75 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="3" PointY="94.875" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="40.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="70.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="76.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="57" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="1.5" PointY="79.625" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="10.75" PointY="10.875" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6" PointY="42.375" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="17" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="28.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="8.5" PointY="2.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6.25" PointY="4" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="64.5" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="52.625" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6" PointY="45.375" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="73.75" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="59.875" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="3" PointY="4.25" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="3" PointY="84.875" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="75.875" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="53.5" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="56.375" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="37.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="1.5" PointY="40.5" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="9.75" PointY="8.125" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="8" PointY="42.75" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="17.625" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="28.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="7.5" PointY="2.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="5.25" PointY="4.25" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="45.125" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="80.125" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="8" PointY="27" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="59.25" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="65.875" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="3" PointY="3.125" />
         <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="5.25" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="0.75" PointY="6" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="0.75" PointY="2.125" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="17.5" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="20.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="77.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="78.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="4.5" PointY="91.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="6.75" PointY="86.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="1.5" PointY="86.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3.75" PointY="81.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="82.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="87.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="82.625" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6" PointY="51" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="8.25" PointY="43.375" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="7.5" PointY="9.5" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="5.25" PointY="9.375" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="26.625" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="21.125" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="17.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="5.25" PointY="65.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="44.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="47.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="5.25" PointY="57.375" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="0.75" PointY="7" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="0.75" PointY="3.125" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="30.625" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="21.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="71.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="62" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="1.5" PointY="92.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="3.75" PointY="61.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="1.5" PointY="88.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3.75" PointY="55" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="62.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="67.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="58.375" />
+        <EntityTypeShape EntityType="RemoteModel.HTML_PAGES" Width="1.5" PointX="0.75" PointY="84.25" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="8" PointY="45.75" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10.25" PointY="34" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="7.5" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="5.25" PointY="10" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="27.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="21.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="18" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="5.25" PointY="43.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="34.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="48.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="5.25" PointY="47.625" />
         <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="5.25" PointY="38.25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="29.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="10" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="23.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="12.875" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6" PointY="61.25" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="35.625" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="6" PointY="73.25" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="32.375" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="33.625" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="6" PointY="69.125" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="8.25" PointY="69.25" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="7.5" PointY="12.875" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="23.75" />
-        <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="10.75" PointY="3.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="10.75" PointY="6.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="12.75" PointY="3.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="12.75" PointY="6.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="12.75" PointY="10.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MOTORS" Width="1.5" PointX="12.75" PointY="15.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="14.75" PointY="3.5" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="3" PointY="28.25" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="8.25" PointY="28.125" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="3" PointY="10.625" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="24.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="10.625" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="18.125" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="13.5" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="8" PointY="39.625" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="71.125" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="8" PointY="53.25" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="33" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="34.25" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="15.375" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="8" PointY="49.125" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="10.25" PointY="49.25" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="7.5" PointY="10.25" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="10.625" />
+        <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="9.75" PointY="4.125" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="11.75" PointY="4.125" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="11.75" PointY="8.125" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="11.75" PointY="11.125" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="11.75" PointY="15.125" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MOTORS" Width="1.5" PointX="13.75" PointY="4.125" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="13.75" PointY="8.125" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="3" PointY="27.25" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="10.25" PointY="28.125" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="3" PointY="24.125" />
         <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
@@ -101,6 +102,7 @@
         <AssociationConnector Association="RemoteModel.FK_IDS_PACKS_DISPENSER_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES" />
         <AssociationConnector Association="RemoteModel.FK_EVENT_TYPES_EVENT_TYPES_CATEGORIES1" />
+        <AssociationConnector Association="RemoteModel.FK_EVENT_TYPES_HTML_PAGES" />
         <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_EVENTS" />
         <AssociationConnector Association="RemoteModel.FK_MACHINES_EVENTS_EVENTS" />
         <AssociationConnector Association="RemoteModel.FK_RML_FIBER_SHAPES" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
index a56bee1d8..51d3510ce 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -161,6 +161,9 @@
     <Compile Include="DB\HARDWARE_WINDER_TYPES.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\HTML_PAGES.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\IDS_PACKS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>