From 246c726a1046be482c83091ef443cdd276b9ad59 Mon Sep 17 00:00:00 2001 From: Tsanie Lily Date: Tue, 26 May 2020 15:52:57 +0800 Subject: [PATCH] sync --- IronIntelContractorSiteLib/InspectionBasePage.cs | 3 +++ IronIntelContractorSiteLib/Maintenance/AlertsBasePage.cs | 8 +++++++- Site | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/IronIntelContractorSiteLib/InspectionBasePage.cs b/IronIntelContractorSiteLib/InspectionBasePage.cs index dab216f..b447b31 100644 --- a/IronIntelContractorSiteLib/InspectionBasePage.cs +++ b/IronIntelContractorSiteLib/InspectionBasePage.cs @@ -616,6 +616,9 @@ namespace IronIntel.Contractor.Site case (int)FuelRecordTypes.State: questionType = QuestionTypes.DropDown; break; + case (int)FuelRecordTypes.Notes: + questionType = QuestionTypes.MultipleLineText; + break; case (int)FuelRecordTypes.Picture: questionType = QuestionTypes.Picture; break; diff --git a/IronIntelContractorSiteLib/Maintenance/AlertsBasePage.cs b/IronIntelContractorSiteLib/Maintenance/AlertsBasePage.cs index 3b3fcbf..06c4d77 100644 --- a/IronIntelContractorSiteLib/Maintenance/AlertsBasePage.cs +++ b/IronIntelContractorSiteLib/Maintenance/AlertsBasePage.cs @@ -93,6 +93,9 @@ namespace IronIntel.Contractor.Site.Maintenance else endDate = endDate.Date.AddDays(1).AddSeconds(-1); + beginDate = SystemParams.CustomerDetail.CustomerTimeToUtc(beginDate); + endDate = SystemParams.CustomerDetail.CustomerTimeToUtc(endDate); + int assigned = -1; int completed = -1; if (alertparam.AlertStatus != null && alertparam.AlertStatus.Length > 0) @@ -149,6 +152,9 @@ namespace IronIntel.Contractor.Site.Maintenance else endDate = endDate.Date.AddDays(1).AddSeconds(-1); + beginDate = SystemParams.CustomerDetail.CustomerTimeToUtc(beginDate); + endDate = SystemParams.CustomerDetail.CustomerTimeToUtc(endDate); + int assigned = -1; int completed = -1; if (alertparam.AlertStatus != null && alertparam.AlertStatus.Length > 0) @@ -261,7 +267,7 @@ namespace IronIntel.Contractor.Site.Maintenance endDate = DateTime.MaxValue; else endDate = endDate.Date.AddDays(1).AddSeconds(-1); - + alertparam.AlertStatus = new string[0]; AlertManager am = new AlertManager(SystemParams.DataDbConnectionString); AlertInfo[] alerts = am.SearchAcknowledgedAlerts(session.SessionID, alertparam.SearchText, alertparam.AlertStatus, alertparam.AlertTypes, alertparam.AssetGroups, beginDate, endDate, session.User.UID); diff --git a/Site b/Site index 61a0879..140d1ff 160000 --- a/Site +++ b/Site @@ -1 +1 @@ -Subproject commit 61a0879af8868e3480b1e45f0abd6a5df44328ca +Subproject commit 140d1ffce0271bde011b93bce204fff9f8bf90b4