aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Tango.DAL.Local
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2017-12-19 10:25:40 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2017-12-19 10:25:40 +0200
commitafc7a07d285e08d905c58dd5978441c155b2f296 (patch)
treea2f4f51ef2747ae3a2aded2637a352ce8ef85934 /Software/Visual_Studio/Tango.DAL.Local
parentad35c9c2df0001157ea13312382f3cdfdad67f06 (diff)
downloadTango-afc7a07d285e08d905c58dd5978441c155b2f296.tar.gz
Tango-afc7a07d285e08d905c58dd5978441c155b2f296.zip
MERGE.
Diffstat (limited to 'Software/Visual_Studio/Tango.DAL.Local')
-rw-r--r--Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs1
-rw-r--r--Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx39
-rw-r--r--Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram31
-rw-r--r--Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE_VERSIONS_CONFIGURATIONS.cs25
-rw-r--r--Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj3
5 files changed, 15 insertions, 84 deletions
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
index 1c639e33d..38ae0a849 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
@@ -49,7 +49,6 @@ namespace Tango.DAL.Local.DB
public virtual DbSet<LIQUID> LIQUIDS { get; set; }
public virtual DbSet<LIQUIDS_RMLS> LIQUIDS_RMLS { get; set; }
public virtual DbSet<MACHINE_VERSIONS> MACHINE_VERSIONS { get; set; }
- public virtual DbSet<MACHINE_VERSIONS_CONFIGURATIONS> MACHINE_VERSIONS_CONFIGURATIONS { get; set; }
public virtual DbSet<MACHINE> MACHINES { get; set; }
public virtual DbSet<MACHINES_CONFIGURATIONS> MACHINES_CONFIGURATIONS { get; set; }
public virtual DbSet<MACHINES_EVENTS> MACHINES_EVENTS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
index 83482b978..bd71d7457 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
@@ -262,18 +262,6 @@
<Property Name="DELETED" Type="bit" Nullable="false" />
<Property Name="VERSION" Type="real" Nullable="false" />
</EntityType>
- <EntityType Name="MACHINE_VERSIONS_CONFIGURATIONS">
- <Key>
- <PropertyRef Name="ID" />
- </Key>
- <Property Name="ID" Type="integer" Nullable="false" />
- <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="VERSION" Type="real" Nullable="false" />
- <Property Name="MACHINE_VERSION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
- <Property Name="CONFIGURATION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
- </EntityType>
<EntityType Name="MACHINES">
<Key>
<PropertyRef Name="ID" />
@@ -482,7 +470,6 @@
<EntitySet Name="LIQUIDS" EntityType="Self.LIQUIDS" store:Type="Tables" />
<EntitySet Name="LIQUIDS_RMLS" EntityType="Self.LIQUIDS_RMLS" store:Type="Tables" />
<EntitySet Name="MACHINE_VERSIONS" EntityType="Self.MACHINE_VERSIONS" store:Type="Tables" />
- <EntitySet Name="MACHINE_VERSIONS_CONFIGURATIONS" EntityType="Self.MACHINE_VERSIONS_CONFIGURATIONS" store:Type="Tables" />
<EntitySet Name="MACHINES" EntityType="Self.MACHINES" store:Type="Tables" />
<EntitySet Name="MACHINES_CONFIGURATIONS" EntityType="Self.MACHINES_CONFIGURATIONS" store:Type="Tables" />
<EntitySet Name="MACHINES_EVENTS" EntityType="Self.MACHINES_EVENTS" store:Type="Tables" />
@@ -528,7 +515,6 @@
<EntitySet Name="LIQUIDS" EntityType="LocalModel.LIQUID" />
<EntitySet Name="LIQUIDS_RMLS" EntityType="LocalModel.LIQUIDS_RMLS" />
<EntitySet Name="MACHINE_VERSIONS" EntityType="LocalModel.MACHINE_VERSIONS" />
- <EntitySet Name="MACHINE_VERSIONS_CONFIGURATIONS" EntityType="LocalModel.MACHINE_VERSIONS_CONFIGURATIONS" />
<EntitySet Name="MACHINES" EntityType="LocalModel.MACHINE" />
<EntitySet Name="MACHINES_CONFIGURATIONS" EntityType="LocalModel.MACHINES_CONFIGURATIONS" />
<EntitySet Name="MACHINES_EVENTS" EntityType="LocalModel.MACHINES_EVENTS" />
@@ -802,18 +788,6 @@
<Property Name="DELETED" Type="Boolean" Nullable="false" />
<Property Name="VERSION" Type="Double" Nullable="false" />
</EntityType>
- <EntityType Name="MACHINE_VERSIONS_CONFIGURATIONS">
- <Key>
- <PropertyRef Name="ID" />
- </Key>
- <Property Name="ID" Type="Int64" Nullable="false" />
- <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="VERSION" Type="Double" Nullable="false" />
- <Property Name="MACHINE_VERSION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
- <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
- </EntityType>
<EntityType Name="MACHINE">
<Key>
<PropertyRef Name="ID" />
@@ -1284,19 +1258,6 @@
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
- <EntitySetMapping Name="MACHINE_VERSIONS_CONFIGURATIONS">
- <EntityTypeMapping TypeName="LocalModel.MACHINE_VERSIONS_CONFIGURATIONS">
- <MappingFragment StoreEntitySet="MACHINE_VERSIONS_CONFIGURATIONS">
- <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" />
- <ScalarProperty Name="MACHINE_VERSION_GUID" ColumnName="MACHINE_VERSION_GUID" />
- <ScalarProperty Name="VERSION" ColumnName="VERSION" />
- <ScalarProperty Name="DELETED" ColumnName="DELETED" />
- <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
- <ScalarProperty Name="GUID" ColumnName="GUID" />
- <ScalarProperty Name="ID" ColumnName="ID" />
- </MappingFragment>
- </EntityTypeMapping>
- </EntitySetMapping>
<EntitySetMapping Name="MACHINES">
<EntityTypeMapping TypeName="LocalModel.MACHINE">
<MappingFragment StoreEntitySet="MACHINES">
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 e96c0836c..350983c76 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
@@ -29,22 +29,21 @@
<EntityTypeShape EntityType="LocalModel.LIQUID" Width="1.5" PointX="4.75" PointY="11.75" />
<EntityTypeShape EntityType="LocalModel.LIQUIDS_RMLS" Width="1.5" PointX="12.75" PointY="0.75" />
<EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="12.75" PointY="3.75" />
- <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS_CONFIGURATIONS" Width="1.5" PointX="12.75" PointY="6.75" />
- <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="6.75" PointY="12.75" />
- <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="12.75" PointY="10.75" />
- <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="8.75" PointY="13.75" />
- <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="10.75" PointY="13.75" />
- <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="12.75" PointY="13.75" />
- <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="14.75" PointY="0.75" />
- <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="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" />
- <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="4.75" PointY="16.75" />
- <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="16.75" PointY="6.75" />
+ <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="12.75" PointY="6.75" />
+ <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="6.75" PointY="12.75" />
+ <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="12.75" PointY="10.75" />
+ <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="8.75" PointY="13.75" />
+ <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="14.75" PointY="0.75" />
+ <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="14.75" />
+ <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="14.75" PointY="3.75" />
+ <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="14.75" PointY="6.75" />
+ <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="14.75" PointY="10.75" />
+ <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="10.75" PointY="14.75" />
+ <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="12.75" PointY="14.75" />
+ <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.75" PointY="14.75" />
+ <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="2.75" PointY="15.75" />
+ <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="4.75" PointY="15.75" />
+ <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="16.75" PointY="0.75" />
</Diagram>
</edmx:Diagrams>
</edmx:Designer>
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE_VERSIONS_CONFIGURATIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE_VERSIONS_CONFIGURATIONS.cs
deleted file mode 100644
index 79adafd58..000000000
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE_VERSIONS_CONFIGURATIONS.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <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.Local.DB
-{
- using System;
- using System.Collections.Generic;
-
- public partial class MACHINE_VERSIONS_CONFIGURATIONS
- {
- public long ID { get; set; }
- public string GUID { get; set; }
- public System.DateTime LAST_UPDATED { get; set; }
- public bool DELETED { get; set; }
- public double VERSION { get; set; }
- public string MACHINE_VERSION_GUID { get; set; }
- public string CONFIGURATION_GUID { get; set; }
- }
-}
diff --git a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
index 2296ce942..db5f258a2 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
@@ -161,9 +161,6 @@
<Compile Include="DB\MACHINE_VERSIONS.cs">
<DependentUpon>LocalADO.tt</DependentUpon>
</Compile>
- <Compile Include="DB\MACHINE_VERSIONS_CONFIGURATIONS.cs">
- <DependentUpon>LocalADO.tt</DependentUpon>
- </Compile>
<Compile Include="DB\MEDIA_COLORS.cs">
<DependentUpon>LocalADO.tt</DependentUpon>
</Compile>
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-19 17:38:16 +0000