From 950da7fa1fbec7a886d0e603b95665d9fbbcc3b0 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Wed, 14 Oct 2020 08:21:06 +0300 Subject: Added Persistent column to event types. --- Software/DB/PPC/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/PPC/Tango_log.ldf | Bin 53673984 -> 53673984 bytes Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../Tango alarm events handling chart_Rev11.xlsx | Bin 0 -> 53633 bytes .../Tango alarm events handling chart_Rev12.xlsx | Bin 0 -> 54281 bytes .../Tango alarm events handling chart_Rev13.xlsx | Bin 0 -> 54479 bytes .../Tango alarm events handling chart_Rev17.xlsx | Bin 0 -> 63600 bytes .../Tango alarm events handling chart_Rev21.xlsx | Bin 0 -> 65389 bytes .../Tango alarm events handling chart_Rev23.xlsx | Bin 0 -> 65706 bytes .../Tango alarm events handling chart_Rev24.xlsx | Bin 0 -> 65722 bytes .../Tango alarm events handling chart_Rev25.xlsx | Bin 0 -> 65793 bytes ...arm events handling chart_Rev25_Persistent.xlsx | Bin 0 -> 67296 bytes Software/Visual_Studio/Resources/Events.xlsx | Bin 38293 -> 0 bytes .../Tango alarm events handling chart_Rev11.xlsx | Bin 53633 -> 0 bytes .../Tango alarm events handling chart_Rev12.xlsx | Bin 54281 -> 0 bytes .../Tango alarm events handling chart_Rev13.xlsx | Bin 54479 -> 0 bytes .../Tango alarm events handling chart_Rev17.xlsx | Bin 63600 -> 0 bytes .../Tango alarm events handling chart_Rev21.xlsx | Bin 65389 -> 0 bytes .../Tango alarm events handling chart_Rev23.xlsx | Bin 65706 -> 0 bytes .../Tango alarm events handling chart_Rev24.xlsx | Bin 65722 -> 0 bytes .../Tango alarm events handling chart_Rev25.xlsx | Bin 65793 -> 0 bytes .../Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs | 8 ++ .../Tango.BL/Entities/EventTypeBase.cs | 38 ++++++ .../Tango.DAL.Remote/DB/EVENT_TYPES.cs | 1 + .../Tango.DAL.Remote/DB/RemoteADO.edmx | 3 + .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 146 ++++++++++----------- .../Tango.EventsTypesGenerator/Events.xlsx | Bin 53943 -> 0 bytes .../Tango.EventsTypesGenerator/Program.cs | 3 + .../Tango.EventsTypesGenerator.csproj | 36 +---- 30 files changed, 130 insertions(+), 105 deletions(-) create mode 100644 Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev11.xlsx create mode 100644 Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev12.xlsx create mode 100644 Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev13.xlsx create mode 100644 Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev17.xlsx create mode 100644 Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev21.xlsx create mode 100644 Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev23.xlsx create mode 100644 Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev24.xlsx create mode 100644 Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev25.xlsx create mode 100644 Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev25_Persistent.xlsx delete mode 100644 Software/Visual_Studio/Resources/Events.xlsx delete mode 100644 Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev11.xlsx delete mode 100644 Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev12.xlsx delete mode 100644 Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev13.xlsx delete mode 100644 Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev17.xlsx delete mode 100644 Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev21.xlsx delete mode 100644 Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev23.xlsx delete mode 100644 Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev24.xlsx delete mode 100644 Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev25.xlsx delete mode 100644 Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Events.xlsx (limited to 'Software') diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf index d80e99d2a..373d44ba3 100644 Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf index 66e5c985c..4f9f81217 100644 Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 7a432c29a..c9919a345 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index d9c41f938..7b51bc9ac 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev11.xlsx b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev11.xlsx new file mode 100644 index 000000000..95aca7461 Binary files /dev/null and b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev11.xlsx differ diff --git a/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev12.xlsx b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev12.xlsx new file mode 100644 index 000000000..3d79ca650 Binary files /dev/null and b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev12.xlsx differ diff --git a/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev13.xlsx b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev13.xlsx new file mode 100644 index 000000000..426bc2959 Binary files /dev/null and b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev13.xlsx differ diff --git a/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev17.xlsx b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev17.xlsx new file mode 100644 index 000000000..17d4da18a Binary files /dev/null and b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev17.xlsx differ diff --git a/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev21.xlsx b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev21.xlsx new file mode 100644 index 000000000..f3c8b0e48 Binary files /dev/null and b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev21.xlsx differ diff --git a/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev23.xlsx b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev23.xlsx new file mode 100644 index 000000000..d5da8fee5 Binary files /dev/null and b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev23.xlsx differ diff --git a/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev24.xlsx b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev24.xlsx new file mode 100644 index 000000000..f34135551 Binary files /dev/null and b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev24.xlsx differ diff --git a/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev25.xlsx b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev25.xlsx new file mode 100644 index 000000000..23fd49f27 Binary files /dev/null and b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev25.xlsx differ diff --git a/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev25_Persistent.xlsx b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev25_Persistent.xlsx new file mode 100644 index 000000000..d8ebc6d1a Binary files /dev/null and b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev25_Persistent.xlsx differ diff --git a/Software/Visual_Studio/Resources/Events.xlsx b/Software/Visual_Studio/Resources/Events.xlsx deleted file mode 100644 index d4048d83a..000000000 Binary files a/Software/Visual_Studio/Resources/Events.xlsx and /dev/null differ diff --git a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev11.xlsx b/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev11.xlsx deleted file mode 100644 index 95aca7461..000000000 Binary files a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev11.xlsx and /dev/null differ diff --git a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev12.xlsx b/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev12.xlsx deleted file mode 100644 index 3d79ca650..000000000 Binary files a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev12.xlsx and /dev/null differ diff --git a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev13.xlsx b/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev13.xlsx deleted file mode 100644 index 426bc2959..000000000 Binary files a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev13.xlsx and /dev/null differ diff --git a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev17.xlsx b/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev17.xlsx deleted file mode 100644 index 17d4da18a..000000000 Binary files a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev17.xlsx and /dev/null differ diff --git a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev21.xlsx b/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev21.xlsx deleted file mode 100644 index f3c8b0e48..000000000 Binary files a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev21.xlsx and /dev/null differ diff --git a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev23.xlsx b/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev23.xlsx deleted file mode 100644 index d5da8fee5..000000000 Binary files a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev23.xlsx and /dev/null differ diff --git a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev24.xlsx b/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev24.xlsx deleted file mode 100644 index f34135551..000000000 Binary files a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev24.xlsx and /dev/null differ diff --git a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev25.xlsx b/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev25.xlsx deleted file mode 100644 index 23fd49f27..000000000 Binary files a/Software/Visual_Studio/Resources/Tango alarm events handling chart_Rev25.xlsx and /dev/null differ diff --git a/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs index a708cccaf..da6c8eabd 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs @@ -117,5 +117,13 @@ namespace Tango.BL.DTO get; set; } + /// + /// persistent + /// + public Boolean Persistent + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs index 49675a89b..8cbf615e8 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs @@ -51,6 +51,8 @@ namespace Tango.BL.Entities public event EventHandler GuidanceChanged; + public event EventHandler PersistentChanged; + public event EventHandler> MachinesEventsChanged; protected Int32 _code; @@ -398,6 +400,33 @@ namespace Tango.BL.Entities } } + protected Boolean _persistent; + + /// + /// Gets or sets the eventtypebase persistent. + /// + + [Column("PERSISTENT")] + + public Boolean Persistent + { + get + { + return _persistent; + } + + set + { + if (_persistent != value) + { + _persistent = value; + + OnPersistentChanged(value); + + } + } + } + protected SynchronizedObservableCollection _machinesevents; /// @@ -531,6 +560,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(Guidance)); } + /// + /// Called when the Persistent has changed. + /// + protected virtual void OnPersistentChanged(Boolean persistent) + { + PersistentChanged?.Invoke(this, persistent); + RaisePropertyChanged(nameof(Persistent)); + } + /// /// Called when the MachinesEvents has changed. /// 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 9b4079131..d404c0be0 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs @@ -35,6 +35,7 @@ namespace Tango.DAL.Remote.DB public string EVENT_ACTIONS { get; set; } public bool REQUIRES_USER_INTERVENTION { get; set; } public string GUIDANCE { get; set; } + public bool PERSISTENT { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection MACHINES_EVENTS { 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 378d6ece9..5c0ea72d2 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -310,6 +310,7 @@ + @@ -3665,6 +3666,7 @@ + @@ -6235,6 +6237,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 10fb76a2e..40cd29ef4 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,88 +5,88 @@ - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Events.xlsx b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Events.xlsx deleted file mode 100644 index a9183ec04..000000000 Binary files a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Events.xlsx and /dev/null differ diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs index ef2e67909..e5f94d95e 100644 --- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs @@ -33,6 +33,7 @@ namespace Tango.EventsTypesGenerator public String ActionsEmbedded { get; set; } public String NotificationTime { get; set; } public String Guidance { get; set; } + public String Persistent { get; set; } public override string ToString() { @@ -143,6 +144,7 @@ namespace Tango.EventsTypesGenerator if (te.NotificationTime != ev.NotificationTime) return true; if (te.Guidance != ev.Guidance) return true; if (te.RequiresUserIntervention != ev.RequiresUserIntervention) return true; + if (te.Persistent != ev.Persistent) return true; return false; } @@ -160,6 +162,7 @@ namespace Tango.EventsTypesGenerator ev.NotificationTime = (EventTypeNotificationTimes)Enum.Parse(typeof(EventTypeNotificationTimes), evx.NotificationTime.Replace(" ", ""), true); ev.Guidance = !String.IsNullOrWhiteSpace(evx.Guidance) ? evx.Guidance : null; ev.RequiresUserIntervention = evx.UserInterventionRequired == "Yes"; + ev.Persistent = evx.Persistent == "Yes"; } } } diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj index 9bb8729dc..7461a88a8 100644 --- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj @@ -56,43 +56,15 @@ - - Tango alarm events handling chart_Rev11.xlsx - PreserveNewest - - - Tango alarm events handling chart_Rev12.xlsx - PreserveNewest - - - Tango alarm events handling chart_Rev13.xlsx - PreserveNewest - - - Tango alarm events handling chart_Rev17.xlsx - PreserveNewest - - - Tango alarm events handling chart_Rev21.xlsx - PreserveNewest - - - Tango alarm events handling chart_Rev23.xlsx - PreserveNewest - - - Tango alarm events handling chart_Rev24.xlsx - PreserveNewest - - + Tango alarm events handling chart_Rev25.xlsx PreserveNewest + + Tango alarm events handling chart_Rev25_Persistent.xlsx + - - PreserveNewest - -- cgit v1.3.1