This commit is contained in:
2023-05-30 17:34:56 +08:00
parent e728c66786
commit 9da1c4cf30
194 changed files with 10680 additions and 9060 deletions

View File

@ -26,9 +26,9 @@ namespace IronIntel.Contractor.Maintenance
public string DriverName { get; set; }
public string TicketNumber { get; set; }
public DateTime TransactionDate { get; set; }
public string TransactionDateStr { get { return TransactionDate == DateTime.MinValue ? "" : TransactionDate.ToString("M/d/yyyy h:m tt"); } }
public string TransactionDateStr { get { return TransactionDate == DateTime.MinValue ? "" : TransactionDate.ToString("M/d/yyyy h:mm tt"); } }
public DateTime TransactionLocalDate { get; set; }
public string TransactionLocalDateStr { get { return TransactionLocalDate == DateTime.MinValue ? "" : TransactionLocalDate.ToString("M/d/yyyy h:m tt"); } }
public string TransactionLocalDateStr { get { return TransactionLocalDate == DateTime.MinValue ? "" : TransactionLocalDate.ToString("M/d/yyyy h:mm tt"); } }
public string AssetModel { get; set; }
public string AssetMake { get; set; }
public string AssetType { get; set; }
@ -52,14 +52,14 @@ namespace IronIntel.Contractor.Maintenance
public string LasetUpdatedBy { get; set; }
public string LasetUpdatedByName { get; set; }
public DateTime AddedOn { get; set; }
public string AddedOnStr { get { return AddedOn == DateTime.MinValue ? "" : AddedOn.ToString("M/d/yyyy h:m:s tt"); } }
public string AddedOnStr { get { return AddedOn == DateTime.MinValue ? "" : AddedOn.ToString("M/d/yyyy h:mm:ss tt"); } }
public DateTime LastUpdatedOn { get; set; }
public string LastUpdatedOnStr { get { return LastUpdatedOn == DateTime.MinValue ? "" : LastUpdatedOn.ToString("M/d/yyyy h:m:s tt"); } }
public string LastUpdatedOnStr { get { return LastUpdatedOn == DateTime.MinValue ? "" : LastUpdatedOn.ToString("M/d/yyyy h:mm:ss tt"); } }
public DateTime AddedOn_Local { get; set; }
public string AddedOn_LocalStr { get { return AddedOn_Local == DateTime.MinValue ? "" : AddedOn_Local.ToString("M/d/yyyy h:m:s tt"); } }
public string AddedOn_LocalStr { get { return AddedOn_Local == DateTime.MinValue ? "" : AddedOn_Local.ToString("M/d/yyyy h:mm:ss tt"); } }
public DateTime LastUpdatedOn_Local { get; set; }
public string LastUpdatedOn_LocalStr { get { return LastUpdatedOn_Local == DateTime.MinValue ? "" : LastUpdatedOn_Local.ToString("M/d/yyyy h:m:s tt"); } }
public string LastUpdatedOn_LocalStr { get { return LastUpdatedOn_Local == DateTime.MinValue ? "" : LastUpdatedOn_Local.ToString("M/d/yyyy h:mm:ss tt"); } }
}
}

View File

@ -110,7 +110,7 @@ namespace IronIntel.Contractor.Maintenance
{
if (AlertTime != DateTime.MinValue)
{
return AlertTime.ToString("M/d/yyyy h:m:s tt");
return AlertTime.ToString("M/d/yyyy h:mm:ss tt");
}
return "";
}
@ -249,7 +249,7 @@ namespace IronIntel.Contractor.Maintenance
if (StartDate == null)
return "";
else
return StartDate.Value.ToString("MM/dd/yyyy");
return StartDate.Value.ToString("M/d/yyyy");
}
}
public string LastAlertTimeString
@ -259,7 +259,7 @@ namespace IronIntel.Contractor.Maintenance
if (LastAlertTime == null)
return "";
else
return LastAlertTime.Value.ToString("MM/dd/yyyy");
return LastAlertTime.Value.ToString("M/d/yyyy");
}
}
}

View File

@ -434,7 +434,7 @@ namespace IronIntel.Contractor.Maintenance
alert.AlertTitle = FIDbAccess.GetFieldString(dr["ALERTTITLE"], string.Empty);
DateTime at = FIDbAccess.GetFieldDateTime(dr["ALERTTIME_UTC"], DateTime.MinValue);
if (at != DateTime.MinValue)
alert.AlertTime = at.ToString("M/d/yyyy h:m:s tt");
alert.AlertTime = at.ToString("M/d/yyyy h:mm:ss tt");
alerts.Add(alert);
}
return alerts.ToArray();

View File

@ -129,14 +129,14 @@ namespace IronIntel.Contractor.Maintenance
ls.Add(p.CustomerNumber);
else
{
p.CustomerNumber = Foresight.Standard.PhoneNumber.PreparePhonenumber(p.CustomerNumber);
ls.Add(p.CustomerNumber);
p.CustomerNumber = Foresight.Standard.PhoneNumber.FormatPhoneNumber(p.CustomerNumber);
ls.Add(Foresight.Standard.PhoneNumber.PreparePhonenumber(p.CustomerNumber));
}
}
}
return ls.ToArray();
}
}
public string TimeStr { get { return Time == DateTime.MinValue ? "" : Time.ToString("M/d/yyyy h:m tt"); } }
public string TimeStr { get { return Time == DateTime.MinValue ? "" : Time.ToString("M/d/yyyy h:mm tt"); } }
}
}