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-06-09 15:58:22 +08:00
parent 246c726a10
commit 156d145a48
26 changed files with 401 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
IronIntelContractorBusiness/Machines/MachineItem.cs
View File

@ -247,7 +247,7 @@ namespace IronIntel.Contractor.Machines
public string AddedOnStr { get { return AddedOn == DateTime.MinValue ? "" : AddedOn.ToShortDateString(); } }
public string AddedBy { get; set; }
public string AddedByName { get; set; }
public string ShowName
public string DisplayName
{
get
{
@ -294,6 +294,8 @@ namespace IronIntel.Contractor.Machines
public long Id { get; set; }
public bool Active { get; }
public long DeviceID { get; set; }
public bool FIInstalltion { get; set; }
public string Installer { get; set; }
public string AddDateStr { get { return AddLocalDate == null ? "" : AddLocalDate.Value.ToShortDateString(); } }
public string InvoiceDateStr { get { return InvoiceDate == null ? "" : InvoiceDate.Value.ToShortDateString(); } }
public string ServiceStartDateStr { get { return ServiceStartDate == null ? "" : ServiceStartDate.Value.ToShortDateString(); } }

2
IronIntelContractorBusiness/Machines/MachineRentalInfo.cs
View File

@ -37,7 +37,7 @@ namespace IronIntel.Contractor.Machines
public bool Selected { get; set; }
public string ShowName
public string DisplayName
{
get
{