michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix : Serving events from components, FlowMeter a BalanceDev calibration due date, ver. 2.26.1450

Browse Source
This commit is contained in:
Milan Hanajik
2020-04-21 13:34:18 +02:00
parent 267236a177
commit cafb59c9b0
4 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Calendar/CalendarTabPageCtrl.cs
+8 -3
View File
@@ -126,8 +126,10 @@ namespace TBF.UI.Calendar
{
IList<Events.Entities.Event> eventsToTrigger = new List<Events.Entities.Event>();
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<CustomEvent>() .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<CustomEvent>().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);