From 20f49c625cd32b95154db138ed7eeebbadd04bf7 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Mon, 1 Nov 2021 14:53:16 +0200 Subject: Color selection and Job sequence package. Redesign list control, move Color Selection View to dialogs, implement save. --- .../Tango.DAL.Remote/DB/BRUSH_STOPS.cs | 3 + .../Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs | 1 + .../Tango.DAL.Remote/DB/RemoteADO.edmx | 12 ++ .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 176 ++++++++++----------- 4 files changed, 104 insertions(+), 88 deletions(-) (limited to 'Software/Visual_Studio/Tango.DAL.Remote') diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs index 34384cb8f..5671e17a3 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs @@ -55,6 +55,9 @@ namespace Tango.DAL.Remote.DB public string COLOR_CATALOG_GUID { get; set; } public string COLOR_CATALOGS_ITEM_GUID { get; set; } public bool IS_TRANSPARENT { get; set; } + public Nullable BEST_MATCH_R { get; set; } + public Nullable BEST_MATCH_G { get; set; } + public Nullable BEST_MATCH_B { get; set; } public virtual COLOR_CATALOGS COLOR_CATALOGS { get; set; } public virtual COLOR_CATALOGS_ITEMS COLOR_CATALOGS_ITEMS { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs index 9f08788ac..d54051db5 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs @@ -25,6 +25,7 @@ namespace Tango.DAL.Remote.DB public System.DateTime LAST_UPDATED { get; set; } public string NAME { get; set; } public int CODE { get; set; } + public string DESCRIPTION { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RMLS { 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 78b7b3fdf..ac31bd2b9 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -123,6 +123,9 @@ + + + @@ -950,6 +953,7 @@ + @@ -4787,6 +4791,9 @@ + + + @@ -5684,6 +5691,7 @@ + @@ -7810,6 +7818,9 @@ + + + @@ -8682,6 +8693,7 @@ + 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 10bd85a35..b2979ab7f 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,94 +5,94 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.3.1