tsanie/fleet-contractor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
Tsanie Lily 2020-05-26 15:52:57 +08:00
parent 3a1348ee6d
commit 246c726a10
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IronIntelContractorSiteLib/InspectionBasePage.cs
View File

@ -616,6 +616,9 @@ namespace IronIntel.Contractor.Site
case (int)FuelRecordTypes.State: case (int)FuelRecordTypes.State:
questionType = QuestionTypes.DropDown; questionType = QuestionTypes.DropDown;
break; break;
case (int)FuelRecordTypes.Notes:
questionType = QuestionTypes.MultipleLineText;
break;
case (int)FuelRecordTypes.Picture: case (int)FuelRecordTypes.Picture:
questionType = QuestionTypes.Picture; questionType = QuestionTypes.Picture;
break; break;

8
IronIntelContractorSiteLib/Maintenance/AlertsBasePage.cs
View File

@ -93,6 +93,9 @@ namespace IronIntel.Contractor.Site.Maintenance
else else
endDate = endDate.Date.AddDays(1).AddSeconds(-1); endDate = endDate.Date.AddDays(1).AddSeconds(-1);
beginDate = SystemParams.CustomerDetail.CustomerTimeToUtc(beginDate);
endDate = SystemParams.CustomerDetail.CustomerTimeToUtc(endDate);
int assigned = -1; int assigned = -1;
int completed = -1; int completed = -1;
if (alertparam.AlertStatus != null && alertparam.AlertStatus.Length > 0) if (alertparam.AlertStatus != null && alertparam.AlertStatus.Length > 0)
@ -149,6 +152,9 @@ namespace IronIntel.Contractor.Site.Maintenance
else else
endDate = endDate.Date.AddDays(1).AddSeconds(-1); endDate = endDate.Date.AddDays(1).AddSeconds(-1);
beginDate = SystemParams.CustomerDetail.CustomerTimeToUtc(beginDate);
endDate = SystemParams.CustomerDetail.CustomerTimeToUtc(endDate);
int assigned = -1; int assigned = -1;
int completed = -1; int completed = -1;
if (alertparam.AlertStatus != null && alertparam.AlertStatus.Length > 0) if (alertparam.AlertStatus != null && alertparam.AlertStatus.Length > 0)
@ -261,7 +267,7 @@ namespace IronIntel.Contractor.Site.Maintenance
endDate = DateTime.MaxValue; endDate = DateTime.MaxValue;
else else
endDate = endDate.Date.AddDays(1).AddSeconds(-1); endDate = endDate.Date.AddDays(1).AddSeconds(-1);
alertparam.AlertStatus = new string[0]; alertparam.AlertStatus = new string[0];
AlertManager am = new AlertManager(SystemParams.DataDbConnectionString); 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); AlertInfo[] alerts = am.SearchAcknowledgedAlerts(session.SessionID, alertparam.SearchText, alertparam.AlertStatus, alertparam.AlertTypes, alertparam.AssetGroups, beginDate, endDate, session.User.UID);

2
Site

@ -1 +1 @@
Subproject commit 61a0879af8868e3480b1e45f0abd6a5df44328ca Subproject commit 140d1ffce0271bde011b93bce204fff9f8bf90b4