From c4e8c98689dcedf035484cd079eac8d9678286db Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 24 Jul 2022 16:45:32 +0300 Subject: Added Washing test results tables Related Work Items: #6660 --- ...TENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs | 2 +- .../DB/RML_EXTENSION_TEST_RESULTS.cs | 5 +- .../DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs | 28 + .../Tango.DAL.Remote/DB/RemoteADO.Context.cs | 18 +- .../Tango.DAL.Remote/DB/RemoteADO.edmx | 1039 +++++++++++--------- .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 167 ++-- .../Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs | 31 + .../Tango.DAL.Remote/Tango.DAL.Remote.csproj | 8 +- 8 files changed, 758 insertions(+), 540 deletions(-) create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs (limited to 'Software/Visual_Studio/Tango.DAL.Remote') diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs index 5a4c082be..9f3026268 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs @@ -26,9 +26,9 @@ namespace Tango.DAL.Remote.DB public string RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID { get; set; } public string LIQUID_TYPE_GUID { get; set; } - public virtual LIQUID_TYPES LIQUID_TYPES { get; set; } public virtual RML_EXTENSION_COLOR_CALIBRATIONS_TESTS RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS { get; set; } + public virtual LIQUID_TYPES LIQUID_TYPES { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs index c530978d8..e0543a58c 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs @@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB { this.TENSILE_RESULTS = new HashSet(); this.RML_EXTENSION_TEST_RESULTS_FILES = new HashSet(); + this.RML_EXTENSION_TEST_WASHING_RESULTS = new HashSet(); this.RUBBING_RESULTS = new HashSet(); } @@ -61,9 +62,11 @@ namespace Tango.DAL.Remote.DB public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection TENSILE_RESULTS { get; set; } - public virtual MACHINE MACHINE { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RML_EXTENSION_TEST_RESULTS_FILES { get; set; } + public virtual MACHINE MACHINE { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection RML_EXTENSION_TEST_WASHING_RESULTS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RUBBING_RESULTS { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs new file mode 100644 index 000000000..c97f1ab73 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs @@ -0,0 +1,28 @@ +//------------------------------------------------------------------------------ +// +// 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. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class RML_EXTENSION_TEST_WASHING_RESULTS + { + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public string RML_EXTENSION_TEST_RESULTS_GUID { get; set; } + public string WASHING_TEST_MATERIALS_GUID { get; set; } + public int COLOR { get; set; } + public Nullable WASHING_VALUE { get; set; } + + public virtual RML_EXTENSION_TEST_RESULTS RML_EXTENSION_TEST_RESULTS { get; set; } + public virtual WASHING_TEST_MATERIALS WASHING_TEST_MATERIALS { 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 504edd34b..a4879a500 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -43,6 +43,14 @@ namespace Tango.DAL.Remote.DB public virtual DbSet YARN_TEXTURINGS { get; set; } public virtual DbSet YARN_TYPES { get; set; } public virtual DbSet YARN_WHITE_SHADES { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_SHADES { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_SHADES_TESTS { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_SHADES_TESTS_DATA { get; set; } + public virtual DbSet RML_EXTENSION_TEST_RESULTS_FILES { get; set; } public virtual DbSet ACTION_LOGS { get; set; } public virtual DbSet
ADDRESSES { get; set; } public virtual DbSet APPLICATION_DISPLAY_PANEL_VERSIONS { get; set; } @@ -110,14 +118,7 @@ namespace Tango.DAL.Remote.DB public virtual DbSet PROCESS_PARAMETERS_TABLES_GROUPS { get; set; } public virtual DbSet PUBLISHED_PROCEDURE_PROJECTS { get; set; } public virtual DbSet PUBLISHED_PROCEDURE_PROJECTS_VERSIONS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_SHADES { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_SHADES_TESTS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_SHADES_TESTS_DATA { get; set; } - public virtual DbSet RML_EXTENSION_TEST_RESULTS_FILES { get; set; } + public virtual DbSet RML_EXTENSION_TEST_WASHING_RESULTS { get; set; } public virtual DbSet RMLS { get; set; } public virtual DbSet RMLS_SPOOLS { get; set; } public virtual DbSet ROLES { get; set; } @@ -142,6 +143,7 @@ namespace Tango.DAL.Remote.DB public virtual DbSet TECH_VALVES { get; set; } public virtual DbSet USERS { get; set; } public virtual DbSet USERS_ROLES { get; set; } + public virtual DbSet WASHING_TEST_MATERIALS { get; set; } public virtual DbSet WINDING_METHODS { 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 ed6e629ac..f367a5aa0 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -1230,6 +1230,18 @@ + + + + + + + + + + + + @@ -1653,6 +1665,15 @@ + + + + + + + + + @@ -2841,6 +2862,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3499,6 +3548,7 @@ + @@ -3526,6 +3576,7 @@ + @@ -3862,6 +3913,14 @@ + + + + + + + + @@ -4126,6 +4185,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4193,14 +4292,7 @@ - - - - - - - - + @@ -4225,6 +4317,7 @@ + @@ -4578,42 +4671,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + @@ -4769,8 +4838,9 @@ - + + @@ -5141,150 +5211,375 @@ - + - - - - - - - + + + + + - + - - - - - - - - - + + + + - + - - - + + + + + - + - - - + + + + + + + - + - - - + + + + + - + - - - - - - + + + + - + - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6325,108 +6620,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -6434,9 +6628,11 @@ - - - + + + + + @@ -6859,6 +7055,16 @@ + + + + + + + + + + @@ -7977,156 +8183,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - + - + - + @@ -8145,6 +8253,20 @@ + + + + + + + + + + + + + + @@ -8603,6 +8725,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9716,104 +9943,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -10207,6 +10342,16 @@ + + + + + + + + + + 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 27f6a9fa1..2cc7da5b5 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,98 +5,100 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + + - - - - + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -179,6 +181,7 @@ + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs new file mode 100644 index 000000000..62f08e111 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs @@ -0,0 +1,31 @@ +//------------------------------------------------------------------------------ +// +// 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. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class WASHING_TEST_MATERIALS + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public WASHING_TEST_MATERIALS() + { + this.RML_EXTENSION_TEST_WASHING_RESULTS = new HashSet(); + } + + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public string NAME { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection RML_EXTENSION_TEST_WASHING_RESULTS { get; set; } + } +} 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 e58f7fd5b..79beff832 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -327,6 +327,9 @@ RemoteADO.tt + + RemoteADO.tt + RemoteADO.tt @@ -399,6 +402,9 @@ RemoteADO.tt + + RemoteADO.tt + RemoteADO.tt @@ -485,7 +491,7 @@ - + \ No newline at end of file -- cgit v1.3.1