diff --git a/TBF/BenchControl/Elde/FlowMeter/FlowMeter.cs b/TBF/BenchControl/Elde/FlowMeter/FlowMeter.cs index 1cf973ec3..aef7a02c9 100644 --- a/TBF/BenchControl/Elde/FlowMeter/FlowMeter.cs +++ b/TBF/BenchControl/Elde/FlowMeter/FlowMeter.cs @@ -87,25 +87,28 @@ namespace TBF.BenchControl.Elde.FlowMeter DateTime calibrationDue = flowMeterCfg.CalibValidDate; IList calendarEvents = new List(); - /// Calibration due date calendar event - calendarEvents.Add(new TBF.UI.Calendar.CalibrationDueDateEvent(calibrationDue.Date, Name, - string.Format(Strings.Calibration_due_date_is_0, - calibrationDue.Date.ToString("dd.MM.yyyy")))); - if ((calibrationDue != DateTime.MinValue) && (DateTime.Now.Date <= calibrationDue.AddDays(-7))) + if (calibrationDue > DateTime.MinValue.AddDays(36)) { - /// Weekly reminders (last 5 weeks) - calendarEvents.Add(new TBF.UI.Calendar.CalibrationReminderEvent(calibrationDue.Date.AddDays(-35), Name, - string.Format(Strings.Calibration_due_date_is_0, - calibrationDue.Date.ToString("dd.MM.yyyy")), - false)); - } - if ((calibrationDue != DateTime.MinValue) && (DateTime.Now.Date <= calibrationDue.Date)) - { - /// Daily reminders (last 5 days) - calendarEvents.Add(new TBF.UI.Calendar.CalibrationReminderEvent(calibrationDue.AddDays(-5), Name, - string.Format(Strings.Calibration_due_date_is_0, - calibrationDue.Date.ToString("dd.MM.yyyy")), - true)); + /// Calibration due date calendar event + calendarEvents.Add(new TBF.UI.Calendar.CalibrationDueDateEvent(calibrationDue.Date, Name, + string.Format(Strings.Calibration_due_date_is_0, + calibrationDue.Date.ToString(TBF.UI.Constants.DateFormat)))); + if (DateTime.Now.Date <= calibrationDue.AddDays(-7)) + { + /// Weekly reminders (last 5 weeks) + calendarEvents.Add(new TBF.UI.Calendar.CalibrationReminderEvent(calibrationDue.Date.AddDays(-35), Name, + string.Format(Strings.Calibration_due_date_is_0, + calibrationDue.Date.ToString(TBF.UI.Constants.DateFormat)), + false)); + } + if (DateTime.Now.Date <= calibrationDue.Date) + { + /// Daily reminders (last 5 days) + calendarEvents.Add(new TBF.UI.Calendar.CalibrationReminderEvent(calibrationDue.AddDays(-5), Name, + string.Format(Strings.Calibration_due_date_is_0, + calibrationDue.Date.ToString(TBF.UI.Constants.DateFormat)), + true)); + } } return calendarEvents; } diff --git a/TBF/BenchControl/MettlerToledo/Standard/BalanceDev.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceDev.cs index 016d82440..d289898fe 100644 --- a/TBF/BenchControl/MettlerToledo/Standard/BalanceDev.cs +++ b/TBF/BenchControl/MettlerToledo/Standard/BalanceDev.cs @@ -135,25 +135,28 @@ namespace TBF.BenchControl.MettlerToledo.Standard DateTime calibrationDue = balanceCfg.CalibValidDate; IList calendarEvents = new List(); - /// Calibration due date calendar event - calendarEvents.Add(new TBF.UI.Calendar.CalibrationDueDateEvent(calibrationDue.Date, Name, - string.Format(Strings.Calibration_due_date_is_0, - calibrationDue.Date.ToString("dd.MM.yyyy")))); - if ((calibrationDue != DateTime.MinValue) && (DateTime.Now.Date <= calibrationDue.AddDays(-7))) + if (calibrationDue > DateTime.MinValue.AddDays(36)) { - /// Weekly reminders (last 5 weeks) - calendarEvents.Add(new TBF.UI.Calendar.CalibrationReminderEvent(calibrationDue.Date.AddDays(-35), Name, - string.Format(Strings.Calibration_due_date_is_0, - calibrationDue.Date.ToString("dd.MM.yyyy")), - false)); - } - if ((calibrationDue != DateTime.MinValue) && (DateTime.Now.Date <= calibrationDue.Date)) - { - /// Daily reminders (last 5 days) - calendarEvents.Add(new TBF.UI.Calendar.CalibrationReminderEvent(calibrationDue.AddDays(-5), Name, - string.Format(Strings.Calibration_due_date_is_0, - calibrationDue.Date.ToString("dd.MM.yyyy")), - true)); + /// Calibration due date calendar event + calendarEvents.Add(new TBF.UI.Calendar.CalibrationDueDateEvent(calibrationDue.Date, Name, + string.Format(Strings.Calibration_due_date_is_0, + calibrationDue.Date.ToString(TBF.UI.Constants.DateFormat)))); + if (DateTime.Now.Date <= calibrationDue.AddDays(-7)) + { + /// Weekly reminders (last 5 weeks) + calendarEvents.Add(new TBF.UI.Calendar.CalibrationReminderEvent(calibrationDue.Date.AddDays(-35), Name, + string.Format(Strings.Calibration_due_date_is_0, + calibrationDue.Date.ToString(TBF.UI.Constants.DateFormat)), + false)); + } + if (DateTime.Now.Date <= calibrationDue.Date) + { + /// Daily reminders (last 5 days) + calendarEvents.Add(new TBF.UI.Calendar.CalibrationReminderEvent(calibrationDue.AddDays(-5), Name, + string.Format(Strings.Calibration_due_date_is_0, + calibrationDue.Date.ToString(TBF.UI.Constants.DateFormat)), + true)); + } } return calendarEvents; } diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 75cdf8419..c6cf3acdb 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.26.1447.0")] -[assembly: AssemblyFileVersion("2.26.1447.0")] +[assembly: AssemblyVersion("2.26.1450.0")] +[assembly: AssemblyFileVersion("2.26.1450.0")] diff --git a/TBF/UI/Calendar/CalendarTabPageCtrl.cs b/TBF/UI/Calendar/CalendarTabPageCtrl.cs index daea6a879..1e14658a3 100644 --- a/TBF/UI/Calendar/CalendarTabPageCtrl.cs +++ b/TBF/UI/Calendar/CalendarTabPageCtrl.cs @@ -126,8 +126,10 @@ namespace TBF.UI.Calendar { IList eventsToTrigger = new List(); - foreach (var calEvent in eventsFromComponents) + for (int i = eventsFromComponents.Count - 1; i >= 0; i--) { + ICalendarEvent calEvent = eventsFromComponents[i]; + AutoAction a = calEvent.AutoAction; if (a == AutoAction.Notification || a == AutoAction.Warning || a == AutoAction.Error || a == AutoAction.FatalErr) { @@ -160,8 +162,10 @@ namespace TBF.UI.Calendar var session = (parentSession != null) ? parentSession : Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config); var customEvents = (customEventsFromDB != null) ? customEventsFromDB : session.QueryOver() .List(); - foreach (var calEvent in customEvents) + for (int i = customEvents.Count - 1; i >= 0; i--) { + CustomEvent calEvent = customEvents[i]; + AutoAction a = calEvent.AutoAction; if (a == AutoAction.Notification || a == AutoAction.Warning || a == AutoAction.Error || a == AutoAction.FatalErr) { @@ -234,8 +238,9 @@ namespace TBF.UI.Calendar ISession session = Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config); var customEventsFromDB = session.QueryOver().List(); - foreach (var calEvent in customEventsFromDB) + for (int i = customEventsFromDB.Count - 1; i >= 0; i--) { + CustomEvent calEvent = customEventsFromDB[i]; if (calEvent.AutoAction == selectedAction && Config.CalendarEvent.Utils.IsCalendarEventTrigerred(calEvent, currentTime)) { parametersList.Add(calEvent.Parameters);