.

IronIntelContractorBusiness/ExportExcel/ConvertFormat.cs

@@ -97,7 +97,7 @@ namespace IronIntel.Contractor
                     }
                     else if (DataType == CellDataType.Date)
                     {
-                        ft = "MM-dd-yyyy";
+                        ft = "M-d-yyyy";
                     }
                     else if (DataType == CellDataType.Bool)
                     {

IronIntelContractorBusiness/ExportExcel/ImportFromExcel.cs

@@ -228,7 +228,7 @@ namespace IronIntel.Contractor.ExportExcel
                         CellFormat cf = (CellFormat)stylepart.Stylesheet.CellFormats.ElementAt((int)cell.StyleIndex.Value);
                         if (cf.NumberFormatId >= 14 && cf.NumberFormatId <= 22)//Date
                         {
-                            value = DateTime.FromOADate(d).ToString("MM/dd/yyyy");
+                            value = DateTime.FromOADate(d).ToString("M/d/yyyy");
                         }
                     }
                 }

IronIntelContractorBusiness/ExportExcelManager.cs

@@ -260,10 +260,10 @@ namespace IronIntel.Contractor
                 dr[0] = asset.DisplayName;
                 dr[1] = asset.VIN;
                 dr[2] = r.UserName;
-                dr[3] = r.AdjustmentLocalTime.ToString("M/d/yyyy h:m tt");
+                dr[3] = r.AdjustmentLocalTime.ToString("M/d/yyyy h:mm tt");
                 dr[4] = r.Odometer;
                 dr[5] = r.UOM;
-                dr[6] = r.OdometerLocalTime.ToString("M/d/yyyy h:m tt");
+                dr[6] = r.OdometerLocalTime.ToString("M/d/yyyy h:mm tt");
                 dr[7] = r.Notes;
                 dt.Rows.Add(dr);
             }
@@ -314,9 +314,9 @@ namespace IronIntel.Contractor
                 dr[0] = asset.DisplayName;
                 dr[1] = asset.VIN;
                 dr[2] = r.UserName;
-                dr[3] = r.AdjustmentLocalTime.ToString("M/d/yyyy h:m tt");
+                dr[3] = r.AdjustmentLocalTime.ToString("M/d/yyyy h:mm tt");
                 dr[4] = r.EngineHours;
-                dr[5] = r.EngineHoursLocalTime.ToString("M/d/yyyy h:m tt");
+                dr[5] = r.EngineHoursLocalTime.ToString("M/d/yyyy h:mm tt");
                 dr[6] = r.Notes;
                 dt.Rows.Add(dr);
             }

IronIntelContractorBusiness/Machines/EngineHoursInfo.cs

@@ -83,7 +83,7 @@ namespace IronIntel.Contractor.Machines
         {
             get
             {
-                return AsofTime.ToString("M/d/yyyy h:m tt");
+                return AsofTime.ToString("M/d/yyyy h:mm tt");
             }
         }
         public DateTime AsofTimeLocal { get; set; }
@@ -91,7 +91,7 @@ namespace IronIntel.Contractor.Machines
         {
             get
             {
-                return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
+                return AsofTimeLocal.ToString("M/d/yyyy h:mm tt");
             }
         }
     }
@@ -109,7 +109,7 @@ namespace IronIntel.Contractor.Machines
         {
             get
             {
-                return AsofTime.ToString("M/d/yyyy h:m tt");
+                return AsofTime.ToString("M/d/yyyy h:mm tt");
             }
         }
         public DateTime AsofTimeLocal { get; set; }
@@ -117,7 +117,7 @@ namespace IronIntel.Contractor.Machines
         {
             get
             {
-                return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
+                return AsofTimeLocal.ToString("M/d/yyyy h:mm tt");
             }
         }
     }
@@ -133,7 +133,7 @@ namespace IronIntel.Contractor.Machines
         {
             get
             {
-                return AsofTime.ToString("M/d/yyyy h:m tt");
+                return AsofTime.ToString("M/d/yyyy h:mm tt");
             }
         }
         public DateTime AsofTimeLocal { get; set; }
@@ -141,7 +141,7 @@ namespace IronIntel.Contractor.Machines
         {
             get
             {
-                return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
+                return AsofTimeLocal.ToString("M/d/yyyy h:mm tt");
             }
         }
     }
@@ -153,13 +153,13 @@ namespace IronIntel.Contractor.Machines
         public string DisplayName { get; set; }//Asset Name
         public string VIN { get; set; }
         public DateTime AdjustmentTime { get; set; }
-        public string AdjustmentTimeText { get { return AdjustmentTime.ToString("M/d/yyyy h:m tt"); } }
+        public string AdjustmentTimeText { get { return AdjustmentTime.ToString("M/d/yyyy h:mm tt"); } }
         public DateTime EngineHoursTime { get; set; }
-        public string EngineHoursTimeText { get { return EngineHoursTime.ToString("M/d/yyyy h:m tt"); } }
+        public string EngineHoursTimeText { get { return EngineHoursTime.ToString("M/d/yyyy h:mm tt"); } }
         public DateTime AdjustmentLocalTime { get; set; }
-        public string AdjustmentLocalTimeText { get { return AdjustmentLocalTime.ToString("M/d/yyyy h:m tt"); } }
+        public string AdjustmentLocalTimeText { get { return AdjustmentLocalTime.ToString("M/d/yyyy h:mm tt"); } }
         public DateTime EngineHoursLocalTime { get; set; }
-        public string EngineHoursLocalTimeText { get { return EngineHoursLocalTime.ToString("M/d/yyyy h:m tt"); } }
+        public string EngineHoursLocalTimeText { get { return EngineHoursLocalTime.ToString("M/d/yyyy h:mm tt"); } }
 
         private double _EngineHours;
         public double EngineHours

IronIntelContractorBusiness/Machines/MachineItem.cs

@@ -167,15 +167,15 @@ namespace IronIntel.Contractor.Machines
 
         public string AddedOnStr
         {
-            get { return AddedLocalTime == null ? "" : AddedLocalTime.Value.ToString("MM/dd/yyyy"); }
+            get { return AddedLocalTime == null ? "" : AddedLocalTime.Value.ToString("M/d/yyyy"); }
         }
         public string EngineHoursDateTimeStr
         {
-            get { return EngineHoursLocalTime == null ? "" : EngineHoursLocalTime.Value.ToString("MM/dd/yyyy"); }
+            get { return EngineHoursLocalTime == null ? "" : EngineHoursLocalTime.Value.ToString("M/d/yyyy"); }
         }
         public string OdometerDateTimeStr
         {
-            get { return OdometerLocalTime == null ? "" : OdometerLocalTime.Value.ToString("MM/dd/yyyy"); }
+            get { return OdometerLocalTime == null ? "" : OdometerLocalTime.Value.ToString("M/d/yyyy"); }
         }
     }
 
@@ -316,10 +316,10 @@ namespace IronIntel.Contractor.Machines
         public bool Utilization { get; set; }
         public string SalesOrderNumber { get; set; }
         public string AddDateStr { get { return AddLocalDate == null ? "" : AddLocalDate.Value.ToShortDateString(); } }
-        public string AddDateStr1 { get { return AddLocalDate == null ? "" : AddLocalDate.Value.ToString("yyyy-MM-dd"); } }
+        public string AddDateStr1 { get { return AddLocalDate == null ? "" : AddLocalDate.Value.ToString("M/D/yyyy"); } }
         public string InvoiceDateStr { get { return InvoiceDate == null ? "" : InvoiceDate.Value.ToShortDateString(); } }
         public string ServiceStartDateStr { get { return ServiceStartDate == null ? "" : ServiceStartDate.Value.ToShortDateString(); } }
-        public string ServiceStartDateStr1 { get { return ServiceStartDate == null ? "" : ServiceStartDate.Value.ToString("yyyy-MM-dd"); } }
+        public string ServiceStartDateStr1 { get { return ServiceStartDate == null ? "" : ServiceStartDate.Value.ToString("M/D/yyyy"); } }
     }
 
     public class PairedAssetItem
@@ -339,7 +339,7 @@ namespace IronIntel.Contractor.Machines
 
     public class CommentItem : Foresight.Fleet.Services.CommentInfo
     {
-        public string SubmitDateStr { get { return SubmitLocalDate == DateTime.MinValue ? "" : SubmitLocalDate.ToString("M/d/yyyy h:m tt"); } }
+        public string SubmitDateStr { get { return SubmitLocalDate == DateTime.MinValue ? "" : SubmitLocalDate.ToString("M/d/yyyy h:mm tt"); } }
 
         public void FormatFollowUp()
         {
@@ -357,7 +357,7 @@ namespace IronIntel.Contractor.Machines
     }
     public class InstallNotesItemC : Foresight.Fleet.Services.Device.InstallNotesItem
     {
-        public string InstallTimeLocalStr { get { return InstallTimeLocal == DateTime.MinValue ? "" : InstallTimeLocal.ToString("M/d/yyyy h:m:s tt"); } }
+        public string InstallTimeLocalStr { get { return InstallTimeLocal == DateTime.MinValue ? "" : InstallTimeLocal.ToString("M/d/yyyy h:mm:ss tt"); } }
     }
 
     public class MachineGroup

IronIntelContractorBusiness/Machines/MachineManagement.cs

@@ -277,73 +277,6 @@ namespace IronIntel.Contractor.Machines
             }
         }
 
-        public static MachineItem[] GetMachines(string sessionid, string useriid, string searchtxt, string companyid = null)
-        {
-            string SQL = "select " + string.Format(MachineFields, "") + " from MACHINES  order by MACHINENAME";
-
-            FIDbAccess db = null;
-            if (string.IsNullOrEmpty(companyid))
-            {
-                companyid = SystemParams.CompanyID;
-                db = SystemParams.GetDbInstance();
-            }
-            else
-            {
-                string connetionstring = SystemParams.GetDbStringByCompany(companyid);
-                db = new FISqlConnection(connetionstring);
-            }
-
-            DataTable tb = db.GetDataTableBySQL(SQL);
-            if (tb.Rows.Count == 0)
-            {
-                return new MachineItem[0];
-            }
-            long[] availableAssetsids = null;
-            IronIntel.Contractor.Users.UserInfo user = null;
-            if (!string.IsNullOrWhiteSpace(useriid))
-            {
-                user = Users.UserManagement.GetUserByIID(useriid);
-                if (user.UserType < Users.UserTypes.Admin)
-                    availableAssetsids = FleetServiceClientHelper.CreateClient<AssetQueryClient>(companyid, sessionid).GetAvailableAssetsForUsers(companyid, useriid);
-            }
-
-            RefreshBaseData();
-            AssetMake[] makes = GetMachineMakes();
-            AssetModel[] models = GetMachineModels();
-            AssetType[] types = GetMachineTypes();
-
-            List<MachineItem> ls = new List<MachineItem>();
-            if (tb.Rows.Count > 0)
-            {
-                foreach (DataRow dr in tb.Rows)
-                {
-                    long mid = FIDbAccess.GetFieldInt64(dr["MACHINEID"], 0);
-                    if (!string.IsNullOrWhiteSpace(useriid) && user.UserType < Users.UserTypes.Admin && !availableAssetsids.Contains(mid))
-                        continue;
-
-                    MachineItem mi = ConvertToMachineItem(dr, makes, models, types);
-                    if (!string.IsNullOrWhiteSpace(searchtxt))
-                    {
-                        if (Helper.Contains(mi.VIN, searchtxt)
-                            || Helper.Contains(mi.MachineID.ToString(), searchtxt)
-                            || Helper.Contains(mi.Name, searchtxt)
-                            || Helper.Contains(mi.Name2, searchtxt)
-                            || Helper.Contains(mi.Make, searchtxt)
-                            || Helper.Contains(mi.MachineType, searchtxt)
-                            || Helper.Contains(mi.Model, searchtxt))
-                        {
-                            ls.Add(mi);
-                        }
-                    }
-                    else
-                    {
-                        ls.Add(mi);
-                    }
-                }
-            }
-            return ls.ToArray();
-        }
-
 
         public static MachineItem[] GetSelectMachinesByRental(string sessionid, string useriid, string searchtxt, string companyid = null)
         {

IronIntelContractorBusiness/Machines/OdometerInfo.cs

@@ -96,7 +96,7 @@ namespace IronIntel.Contractor.Machines
         {
             get
             {
-                return AsofTime.ToString("M/d/yyyy h:m tt");
+                return AsofTime.ToString("M/d/yyyy h:mm tt");
             }
         }
         public DateTime AsofTimeLocal { get; set; }
@@ -104,7 +104,7 @@ namespace IronIntel.Contractor.Machines
         {
             get
             {
-                return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
+                return AsofTimeLocal.ToString("M/d/yyyy h:mm tt");
             }
         }
     }
@@ -124,7 +124,7 @@ namespace IronIntel.Contractor.Machines
         {
             get
             {
-                return AsofTime.ToString("M/d/yyyy h:m tt");
+                return AsofTime.ToString("M/d/yyyy h:mm tt");
             }
         }
         public DateTime AsofTimeLocal { get; set; }
@@ -132,7 +132,7 @@ namespace IronIntel.Contractor.Machines
         {
             get
             {
-                return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
+                return AsofTimeLocal.ToString("M/d/yyyy h:mm tt");
             }
         }
     }
@@ -150,7 +150,7 @@ namespace IronIntel.Contractor.Machines
         {
             get
             {
-                return AsofTime.ToString("M/d/yyyy h:m tt");
+                return AsofTime.ToString("M/d/yyyy h:mm tt");
             }
         }
         public DateTime AsofTimeLocal { get; set; }
@@ -158,7 +158,7 @@ namespace IronIntel.Contractor.Machines
         {
             get
             {
-                return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
+                return AsofTimeLocal.ToString("M/d/yyyy h:mm tt");
             }
         }
     }
@@ -180,13 +180,13 @@ namespace IronIntel.Contractor.Machines
         public string DisplayName { get; set; }//Asset Name
         public string VIN { get; set; }
         public DateTime AdjustmentTime { get; set; }
-        public string AdjustmentTimeText { get { return AdjustmentTime.ToString("M/d/yyyy h:m tt"); } }
+        public string AdjustmentTimeText { get { return AdjustmentTime.ToString("M/d/yyyy h:mm tt"); } }
         public DateTime OdometerTime { get; set; }
-        public string OdometerTimeText { get { return OdometerTime.ToString("M/d/yyyy h:m tt"); } }
+        public string OdometerTimeText { get { return OdometerTime.ToString("M/d/yyyy h:mm tt"); } }
         public DateTime AdjustmentLocalTime { get; set; }
-        public string AdjustmentLocalTimeText { get { return AdjustmentLocalTime.ToString("M/d/yyyy h:m tt"); } }
+        public string AdjustmentLocalTimeText { get { return AdjustmentLocalTime.ToString("M/d/yyyy h:mm tt"); } }
         public DateTime OdometerLocalTime { get; set; }
-        public string OdometerLocalTimeText { get { return OdometerLocalTime.ToString("M/d/yyyy h:m tt"); } }
+        public string OdometerLocalTimeText { get { return OdometerLocalTime.ToString("M/d/yyyy h:mm tt"); } }
 
         private double _Odometer;
         public double Odometer

IronIntelContractorBusiness/Maintenance/FuelRecordInfo.cs

@@ -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"); } }
 
     }
 }

IronIntelContractorBusiness/Maintenance/MaintenanceInfo.cs

@@ -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");
             }
         }
     }

IronIntelContractorBusiness/Maintenance/MaintenanceManagement.cs

@@ -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();

IronIntelContractorBusiness/Maintenance/WorkOrderInfo.cs

@@ -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"); } }
     }
 }

IronIntelContractorBusiness/MapView/AssetMapViewManagement.cs

@@ -32,16 +32,15 @@ namespace IronIntel.Contractor.MapView
             qp.FilterString = filtertext;
             qp.OnRoad = onroad;
             qp.IncludeNoLocation = IncludeNoLocation;
-            qp.IncludeAssetGroups = true;
-            qp.IncludeJobSites = true;
             if (param != null)
             {
                 qp.ViewId = param.ViewID;
                 qp.AlertViewQueryParam = param;
             }
+            qp.Attachment = attachment;
 
             var client = FleetServiceClientHelper.CreateClient<MapViewQueryClient>(companyid, sessionid);
-            AssetMapViewPinItem[] assets = client.GetAssets(companyid, useriid, qp, attachment);
+            AssetMapViewPinItem[] assets = client.GetAssets(companyid, useriid, qp);
             List<AssetMapViewPinItemClient> result = new List<AssetMapViewPinItemClient>();
             foreach (var a in assets)
             {
@@ -122,6 +121,94 @@ namespace IronIntel.Contractor.MapView
             return results.ToArray();
         }
 
+        /// <summary>
+        /// 根据Contractorid获取机器基础信息列表
+        /// </summary>
+        /// <returns></returns>
+        public static MapViewAssetItem[] GetAssetBasicInfos(string sessionid, string companyid, string useriid)
+        {
+            if (string.IsNullOrEmpty(companyid))
+                companyid = SystemParams.CompanyID;
+
+            var client = FleetServiceClientHelper.CreateClient<MapViewQueryClient>(companyid, sessionid);
+            MapViewAssetItem[] assets = client.GetAvailableAssetItems(companyid, useriid);
+            return assets.OrderBy(a => a.Id).ToArray();
+        }
+
+        /// <summary>
+        /// 获取Dealer站点下多个Contractor机器几次信息列表
+        /// </summary>
+        /// <returns></returns>
+        public static MapViewAssetItem[] GetDealerAssetBasicInfos(string sessionid, string companyids, string useriid)
+        {
+            string[] cids = null;
+            if (!string.IsNullOrEmpty(companyids))
+                cids = companyids.Split(',');
+
+            var contractors = SystemParams.GetContractors();
+            if (cids == null || cids.Length == 0)
+                cids = contractors.Select(c => c.ID).ToArray();
+
+            if (cids == null || cids.Length == 0)
+                return new MapViewAssetItem[0];
+
+            int requestCount = 0;
+            Exception lasterror = null;
+            List<MapViewAssetItem> results = new List<MapViewAssetItem>();
+            foreach (var cid in cids)
+            {
+                requestCount++;
+                Thread th = new Thread((object state) =>
+                {
+                    try
+                    {
+                        var assets = GetAssetBasicInfos(sessionid, cid, useriid);
+                        lock (results)
+                        {
+                            results.AddRange(assets);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        lasterror = ex;
+                    }
+                    requestCount--;
+                });
+
+                th.Start();
+            }
+
+            while (true)
+            {
+                Thread.Sleep(10);
+                if (requestCount == 0)
+                {
+                    break;
+                }
+            }
+            if (lasterror != null)
+            {
+                throw lasterror;
+            }
+
+            return results.OrderBy(a => a.Id).ToArray();
+        }
+
+        /// <summary>
+        /// 根据机器ID获取机器基础信息列表
+        /// </summary>
+        /// <returns></returns>
+        public static MapViewAssetItem[] GetAssetItemsByAssets(string sessionid, string companyid, string useriid, long[] assetids)
+        {
+            if (string.IsNullOrEmpty(companyid))
+                companyid = SystemParams.CompanyID;
+
+            var client = FleetServiceClientHelper.CreateClient<MapViewQueryClient>(companyid, sessionid);
+            MapViewAssetItem[] assets = client.GetAssetItemsByAssets(companyid, useriid, assetids);
+            return assets.OrderBy(a => a.Id).ToArray();
+        }
+
+
         public static AssetDetailViewItem GetAssetDetailItem(string sessionid, string companyid, long machineid, string datasource = null)
         {
             var client = FleetServiceClientHelper.CreateClient<AssetQueryClient>(companyid, sessionid);

IronIntelContractorBusiness/Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("23.4.26")]
+[assembly: AssemblyFileVersion("23.5.11")]

IronIntelContractorSiteLib/Customer/CustomerRecordBasePage.cs

@@ -583,7 +583,7 @@ namespace IronIntel.Contractor.Site.Customer
 
     class CommentItem : CommentInfo
     {
-        public string SubmitLocalDateStr { get { return SubmitLocalDate == null ? "" : SubmitLocalDate.ToString("M/d/yyyy h:m:s tt"); } }
+        public string SubmitLocalDateStr { get { return SubmitLocalDate == null ? "" : SubmitLocalDate.ToString("M/d/yyyy h:mm:ss tt"); } }
 
     }
 

IronIntelContractorSiteLib/FilterQBasePage.cs

@@ -50,8 +50,8 @@ namespace IronIntel.Contractor.Site
                 CumulativeHours = c.CumulativeHours,
                 MachineTaskHourCheck = c.MachineTaskHourCheck,
                 DiffToService = c.DiffToService,
-                EstDueDate = c.ESTServiceNeededBy.ToString("MM/dd/yyyy"),
-                EstShipDate = c.ESTShopDate.ToString("MM/dd/yyyy"),
+                EstDueDate = c.ESTServiceNeededBy.ToString("M/d/yyyy"),
+                EstShipDate = c.ESTShopDate.ToString("M/d/yyyy"),
 
                 TaskComplete = c.TaskComplete,
                 UPSTrackingNumber = c.UPSTrackingNumber,
@@ -107,7 +107,7 @@ namespace IronIntel.Contractor.Site
 
                     // 组织 shipdates
                     var shipdates = datas.Distinct(new ShipDateEqualityComparer())
-                        .Select(m => m.ESTShopDate.ToString("MM/dd/yyyy"))
+                        .Select(m => m.ESTShopDate.ToString("M/d/yyyy"))
                         .OrderBy(d => d);
                     var shipgroup = new FilterQGroupByShipDate
                     {
@@ -117,7 +117,7 @@ namespace IronIntel.Contractor.Site
                     IEnumerable<MachineTasksNotificationInfo> dts = datas;
                     if (query.ShipDates != null && query.ShipDates.Length > 0)
                     {
-                        dts = datas.Where(m => query.ShipDates.Contains(m.ESTShopDate.ToString("MM/dd/yyyy")));
+                        dts = datas.Where(m => query.ShipDates.Contains(m.ESTShopDate.ToString("M/d/yyyy")));
                     }
                     else
                     {

IronIntelContractorSiteLib/InspectionBasePage.cs

@@ -258,7 +258,7 @@ namespace IronIntel.Contractor.Site
                 var sesstion = GetCurrentLoginSession();
                 if (sesstion != null)
                 {
-                    string clientdata = Request.Params["ClientData"];
+                    string clientdata = HttpUtility.HtmlDecode(Request.Params["ClientData"]);
                     string[] ps = JsonConvert.DeserializeObject<string[]>(clientdata);
                     bool teamintelligence = Helper.IsTrue(ps[0]);
                     DateTime startdate = Helper.DBMinDateTime;
@@ -894,7 +894,7 @@ namespace IronIntel.Contractor.Site
                 var user = GetCurrentUser();
                 if (user != null)
                 {
-                    string clientdata = Request.Params["ClientData"];
+                    string clientdata = HttpUtility.HtmlDecode(Request.Params["ClientData"]);
                     string[] ps = JsonConvert.DeserializeObject<string[]>(clientdata);
                     bool teamintelligence = Helper.IsTrue(ps[0]);
                     int state = 0;
@@ -2355,9 +2355,18 @@ namespace IronIntel.Contractor.Site
 
                     if (Request.Files.Count > 0)
                     {
-                        var logoFile = Request.Files[0];
-                        var logo = ConvertFile2bytes(logoFile);
-                        layout.LOGO = FI.FIC.ResManager.MakeThumbnail(logo, 0, 180, "H");
+                        for (int i = 0; i < Request.Files.Count; i++)
+                        {
+                            var logoFile = Request.Files[i];
+                            var logo = ConvertFile2bytes(logoFile);
+                            string key = Request.Files.AllKeys[i];
+                            if (string.Compare("iconFile", key, true) == 0)
+                                layout.LOGO = FI.FIC.ResManager.MakeThumbnail(logo, 0, 180, "H");
+                            else if (string.Compare("iconCenterFile", key, true) == 0)
+                                layout.CenterLOGO = FI.FIC.ResManager.MakeThumbnail(logo, 0, 180, "H");
+                            else if (string.Compare("iconRightFile", key, true) == 0)
+                                layout.RightLOGO = FI.FIC.ResManager.MakeThumbnail(logo, 0, 180, "H");
+                        }
                     }
 
                     if (teamintelligence)

IronIntelContractorSiteLib/IronIntelContractorSiteLib.csproj

@@ -37,6 +37,21 @@
     <AssemblyOriginatorKeyFile>LHBIS.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="FICBLC">
+      <HintPath>..\Reflib\FIC\FICBLC.dll</HintPath>
+    </Reference>
+    <Reference Include="FICIntf, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b006d6021b5c4397, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Reflib\FIC\FICIntf.dll</HintPath>
+    </Reference>
+    <Reference Include="FICIntfAdv, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b006d6021b5c4397, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Reflib\FIC\FICIntfAdv.dll</HintPath>
+    </Reference>
+    <Reference Include="FICModels, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b006d6021b5c4397, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Reflib\FIC\FICModels.dll</HintPath>
+    </Reference>
     <Reference Include="FICore">
       <HintPath>..\Reflib\FICore.dll</HintPath>
     </Reference>
@@ -179,22 +194,6 @@
     <None Include="LHBIS.snk" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\FI\FICG5\Core\Service\FICBLC\FICBLC.csproj">
-      <Project>{39e2a8c6-f58f-4839-b7c1-82d44153fc3a}</Project>
-      <Name>FICBLC</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\FI\FICG5\Core\Service\FICIntf\FICIntfAdv\FICIntfAdv.csproj">
-      <Project>{3ffa4093-4325-4fbb-a874-f288bfdcf7ba}</Project>
-      <Name>FICIntfAdv</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\FI\FICG5\Core\Service\FICIntf\FICIntf\FICIntf.csproj">
-      <Project>{4963deb2-f0e3-44a3-b5e1-e13e191a8de8}</Project>
-      <Name>FICIntf</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\FI\FICG5\Core\Service\FICModels\FICModels.csproj">
-      <Project>{f47ebf77-eed3-44e2-9983-ef556372a648}</Project>
-      <Name>FICModels</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\ForesightServices\Service\DataModel\FleetClientBase\FleetClientBase.csproj">
       <Project>{b0110465-8537-4fe7-bee6-b10faa0ba92d}</Project>
       <Name>FleetClientBase</Name>

IronIntelContractorSiteLib/MachineDeviceBasePage.cs

@@ -98,9 +98,6 @@ namespace IronIntel.Contractor.Site
                         case "GETJOBSITEASSETLIST":
                             result = GetJobsiteAssetList();
                             break;
-                        case "GETMACHINESBYGROUP":
-                            result = GetMachinesByGroup();
-                            break;
                         case "GETASSETSBYGROUP":
                             result = GetAssetsByGroup();
                             break;
@@ -149,9 +146,6 @@ namespace IronIntel.Contractor.Site
                         case "DELETERENTAL":
                             result = DeleteRental();
                             break;
-                        case "GETSELECTMACHINESBYCOMPANY":
-                            result = GetSelectMachinesByCompany();
-                            break;
                         case "SEARCHRENTALCHANGEHISTORY":
                             result = SearchRentalChangeHistory();
                             break;
@@ -676,37 +670,6 @@ namespace IronIntel.Contractor.Site
             }
         }
 
-        private object GetSelectMachinesByCompany()
-        {
-            try
-            {
-                var session = GetCurrentLoginSession();
-                if (session != null)
-                {
-                    var companyid = HttpUtility.HtmlDecode(Request.Params["ClientData"]);
-
-                    FISqlConnection db = null;
-                    if (SystemParams.IsDealer)
-                    {
-                        string connetionstring = SystemParams.GetDbStringByCompany(companyid);
-                        db = new FISqlConnection(connetionstring);
-                    }
-                    MachineItem[] machines = MachineManagement.GetMachines(session.User.UID, "", companyid);
-                    if (machines == null)
-                        return new MachineItem[0];
-
-                    return machines.Where(m => m.Hide == false).OrderBy(m => m.DisplayName).ToArray();
-                }
-                else
-                    return new MachineItem[0];
-            }
-            catch (Exception ex)
-            {
-                return ex.Message;
-            }
-        }
-
-
         private object GetSelectMachinesByRental()
         {
             try
@@ -1504,34 +1467,6 @@ namespace IronIntel.Contractor.Site
             }
         }
 
-        private object GetMachinesByGroup()
-        {
-            try
-            {
-                var session = GetCurrentLoginSession();
-                if (GetCurrentLoginSession() != null)
-                {
-                    var clientdata = Request.Form["ClientData"];
-                    var groupid = HttpUtility.HtmlDecode(clientdata);
-
-                    var allMachines = MachineManagement.GetMachines(session.SessionID, "", "");
-                    var machines = MachineManagement.GetMachineByGroup(groupid);
-                    MachineGroupInfoItem mgi = new MachineGroupInfoItem();
-                    mgi.AllMachines = allMachines.Where(m => m.Hide == false).OrderBy((m) => m.VIN).ToArray();
-                    mgi.Machines = machines.OrderBy((m) => m.VIN).ToArray();
-
-                    return mgi;
-                }
-                else
-                    return "";
-            }
-            catch (Exception ex)
-            {
-                AddLog("ERROR", "MachineDeviceBasePage.GetMachinesByGroup", ex.Message, ex.ToString());
-                return ex.Message;
-            }
-        }
-
         private object GetAssetsByGroup()
         {
             try
@@ -3152,7 +3087,7 @@ namespace IronIntel.Contractor.Site
 
                                         DeviceProvider deviceprovider = CreateClient<DeviceProvider>(deviceitem.ContractorID);
                                         var existeddevice = deviceprovider.GetDevicesBySN(deviceitem.ContractorID, device.Source, device.SerialNumber);
-                                        if (existeddevice != null)
+                                        if (existeddevice != null && existeddevice.Id > 0)
                                         {
                                             device.Id = existeddevice.Id;
                                             device.AlternativeSerialNumber = existeddevice.AlternativeSerialNumber;
@@ -4026,7 +3961,7 @@ namespace IronIntel.Contractor.Site
         public class AssetSummaryItem : AssetSummaryInfo
         {
             public string TimeZoneAbbreviation { get; set; }
-            public string OdometerAsofTimeLocalStr { get { return (Odometer == null || Odometer.AsofTimeLocal == null || Odometer.AsofTimeLocal == DateTime.MinValue) ? "" : Odometer.AsofTimeLocal.ToString("M/d/yyyy hh:mm:ss tt"); } }
+            public string OdometerAsofTimeLocalStr { get { return (Odometer == null || Odometer.AsofTimeLocal == null || Odometer.AsofTimeLocal == DateTime.MinValue) ? "" : Odometer.AsofTimeLocal.ToString("M/d/yyyy h:mm:ss tt"); } }
             public bool IsOdometerRed
             {
                 get
@@ -4039,7 +3974,7 @@ namespace IronIntel.Contractor.Site
                     return result;
                 }
             }
-            public string EngineHoursAsofTimeLocalStr { get { return (EngineHours == null || EngineHours.AsofTimeLocal == null || EngineHours.AsofTimeLocal == DateTime.MinValue) ? "" : EngineHours.AsofTimeLocal.ToString("M/d/yyyy hh:mm:ss tt"); } }
+            public string EngineHoursAsofTimeLocalStr { get { return (EngineHours == null || EngineHours.AsofTimeLocal == null || EngineHours.AsofTimeLocal == DateTime.MinValue) ? "" : EngineHours.AsofTimeLocal.ToString("M/d/yyyy h:mm:ss tt"); } }
             public bool IsEngineHoursRed
             {
                 get
@@ -4053,7 +3988,7 @@ namespace IronIntel.Contractor.Site
                 }
             }
 
-            public string LocationAsofTimeLocalStr { get { return (Location == null || Location.AsofTimeLocal == null || Location.AsofTimeLocal == DateTime.MinValue) ? "" : Location.AsofTimeLocal.ToString("M/d/yyyy hh:mm:ss tt"); } }
+            public string LocationAsofTimeLocalStr { get { return (Location == null || Location.AsofTimeLocal == null || Location.AsofTimeLocal == DateTime.MinValue) ? "" : Location.AsofTimeLocal.ToString("M/d/yyyy h:mm:ss tt"); } }
             public bool IsLocationRed
             {
                 get
@@ -4087,7 +4022,7 @@ namespace IronIntel.Contractor.Site
         public class AssetAlertItem : AssetAlertsInfo
         {
             public string AlertLocalDateStr { get { return (AlertLocalTime == null || AlertLocalTime == null || AlertLocalTime == DateTime.MinValue) ? "" : AlertLocalTime.ToString("M/d/yyyy"); } }
-            public string AlertLocalTimeStr { get { return (AlertLocalTime == null || AlertLocalTime == null || AlertLocalTime == DateTime.MinValue) ? "" : AlertLocalTime.ToString("hh:mm:ss tt"); } }
+            public string AlertLocalTimeStr { get { return (AlertLocalTime == null || AlertLocalTime == null || AlertLocalTime == DateTime.MinValue) ? "" : AlertLocalTime.ToString("h:mm:ss tt"); } }
         }
 
         public class AssetPMPlanItem : AssetPMPlanInfo

IronIntelContractorSiteLib/Maintenance/AlertsBasePage.cs

@@ -130,6 +130,7 @@ namespace IronIntel.Contractor.Site.Maintenance
                         if (!alertparam.AlertStatus.Contains("Completed") && alertparam.AlertStatus.Contains("Uncompleted"))
                             completed = 0;
                     }
+                    alertparam.SearchText = HttpUtility.HtmlDecode(alertparam.SearchText);
 
                     AssetAlertGridViewItem[] assetalerts = null;
                     if (alertparam.AssetID > 0)
@@ -190,6 +191,7 @@ namespace IronIntel.Contractor.Site.Maintenance
                         if (!alertparam.AlertStatus.Contains("Completed") && alertparam.AlertStatus.Contains("Uncompleted"))
                             completed = 0;
                     }
+                    alertparam.SearchText = HttpUtility.HtmlDecode(alertparam.SearchText);
 
                     AssetAlertGridViewItem[] assetalerts = null;
                     if (alertparam.AssetID > 0)
@@ -371,6 +373,7 @@ namespace IronIntel.Contractor.Site.Maintenance
                     if (!DateTime.TryParse(alertparam.EndDate, out endDate))
                         endDate = DateTime.MaxValue;
 
+                    alertparam.SearchText = HttpUtility.HtmlDecode(alertparam.SearchText);
                     alertparam.AlertStatus = new string[0];
                     AcknowledgedAlertItem[] ackalerts = CreateClient<AlertProvider>().GetAcknowledgedAlerts(SystemParams.CompanyID, beginDate, endDate, alertparam.AlertTypes, alertparam.AssetGroups, alertparam.SearchText);
                     if (ackalerts == null || ackalerts.Length == 0)
@@ -495,10 +498,18 @@ namespace IronIntel.Contractor.Site.Maintenance
                     if (items == null)
                         return new AlertItems();
 
-                    return items;
+                    return new
+                    {
+                        WorkOrderID = workorderid,
+                        Data = items
+                    };
                 }
                 else
-                    return new AlertItems();
+                    return new
+                    {
+                        WorkOrderID = -1,
+                        Data = new AlertItems()
+                    };
             }
             catch (Exception ex)
             {
@@ -576,10 +587,18 @@ namespace IronIntel.Contractor.Site.Maintenance
                                 items.AllExpectedCost += recalerts.Sum(m => m.ExpectedCost);
                         }
                     }
-                    return items;
+                    return new
+                    {
+                        MachineID = machineid,
+                        Data = items
+                    };
                 }
                 else
-                    return new AlertInfo[0];
+                    return new
+                    {
+                        MachineID = -1,
+                        Data = new AlertInfo[0]
+                    };
             }
             catch (Exception ex)
             {

IronIntelContractorSiteLib/Maintenance/PreventativeMaintenanceBasePage.cs

@@ -498,7 +498,7 @@ namespace IronIntel.Contractor.Site.Maintenance
                     if (StartDate == null)
                         return "";
                     else
-                        return StartDate.Value.ToString("MM/dd/yyyy");
+                        return StartDate.Value.ToString("M/d/yyyy");
                 }
             }
         }

IronIntelContractorSiteLib/Maintenance/WorkOrderBasePage.cs

@@ -1,4 +1,5 @@
 using FI.FIC;
+using FI.FIC.Contracts.DataObjects.BLObject;
 using Foresight.Fleet.Services;
 using Foresight.Fleet.Services.Asset;
 using Foresight.Fleet.Services.AssetHealth;
@@ -16,10 +17,12 @@ using IronIntel.Contractor.Users;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Net.Mail;
 using System.Runtime.InteropServices;
+using System.Security.Cryptography;
 using System.Text;
 using System.Web;
 
@@ -50,8 +53,8 @@ namespace IronIntel.Contractor.Site.Maintenance
                     case "RESTOREDELETEWORKORDER":
                         result = RestoreDeleteWorkOrder();
                         break;
-                    case "GETCONTACTS":
-                        result = GetContacts();
+                    case "GETASSETCONTACTS":
+                        result = GetAssetContacts();
                         break;
                     case "GETMACHINES":
                         result = GetMachines();
@@ -308,6 +311,9 @@ namespace IronIntel.Contractor.Site.Maintenance
                     case "UPDATEWORKORDERATTACHMENTCAPTION":
                         result = UpdateWorkOrderAttachmentCaption();
                         break;
+                    case "RECORDDOWNLOADLOG":
+                        result = RecordDownloadLog();
+                        break;
                     case "GETWOSERVICETIMESETTING":
                         result = GetWOServiceTimeSetting();
                         break;
@@ -383,6 +389,15 @@ namespace IronIntel.Contractor.Site.Maintenance
                     case "GETSURVEYPREVIEWURL":
                         result = GetSurveyPreviewUrl();
                         break;
+                    case "GETWORKORDERWIDGETS":
+                        result = GetWorkOrderWidgets();
+                        break;
+                    case "SAVEWORKORDERWIDGETS":
+                        result = SaveWorkOrderWidgets();
+                        break;
+                    case "SAVEWORKORDERWIDGETLAYOUT":
+                        result = SaveWorkOrderWidgetLayout();
+                        break;
                 }
             }
 
@@ -1163,7 +1178,7 @@ namespace IronIntel.Contractor.Site.Maintenance
             }
         }
 
-        private UserInfo[] GetContacts()
+        private UserInfo[] GetAssetContacts()
         {
             var session = GetCurrentLoginSession();
             UserInfo[] users = null;
@@ -1627,7 +1642,11 @@ namespace IronIntel.Contractor.Site.Maintenance
 
                     WorkOrderSegmentInfo[] segments = CreateClient<WorkOrderProvider>().GetSegments(SystemParams.CompanyID, woid);
                     if (segments == null || segments.Length == 0)
-                        return new SegmentInfo[0];
+                        return new
+                        {
+                            WorkOrderID = woid,
+                            Data = new SegmentInfo[0]
+                        };
 
                     List<SegmentInfo> list = new List<SegmentInfo>();
                     foreach (WorkOrderSegmentInfo se in segments)
@@ -1637,10 +1656,18 @@ namespace IronIntel.Contractor.Site.Maintenance
                         si.SegmentID = se.Id;
                         list.Add(si);
                     }
-                    return list.ToArray();
+                    return new
+                    {
+                        WorkOrderID = woid,
+                        Data = list.ToArray()
+                    };
                 }
                 else
-                    return new SegmentInfo[0];
+                    return new
+                    {
+                        WorkOrderID = -1,
+                        Data = new SegmentInfo[0]
+                    };
 
             }
             catch (Exception ex)
@@ -1778,7 +1805,11 @@ namespace IronIntel.Contractor.Site.Maintenance
                         list.Add(item);
                     }
                     attas.InspectionAttachments = list.OrderBy(m => m.AddedOnLocal).ToArray();
-                    return attas;
+                    return new
+                    {
+                        WorkOrderID = woid,
+                        Data = attas
+                    };
                 }
                 else
                     return null;
@@ -1869,6 +1900,30 @@ namespace IronIntel.Contractor.Site.Maintenance
             }
         }
 
+        private object RecordDownloadLog()
+        {
+            try
+            {
+                var session = GetCurrentLoginSession();
+                if (session != null)
+                {
+                    var clientdata = HttpUtility.HtmlDecode(Request.Form["ClientData"]);
+                    string[] ps = JsonConvert.DeserializeObject<string[]>(clientdata);
+                    string url = ps[0];
+
+                    FICHostEnvironment.WriteExportAuditTrail(session.User.UID, "Download", "", "Download", url, "", null);
+
+                    return "OK";
+                }
+                else
+                    return "Failed";
+            }
+            catch (Exception ex)
+            {
+                return ex.Message;
+            }
+        }
+
         private object UpdateWorkOrderAttachmentCaption()
         {
             try
@@ -2628,6 +2683,12 @@ namespace IronIntel.Contractor.Site.Maintenance
                 var user = GetCurrentUser();
                 if (user != null)
                 {
+                    bool license = SystemParams.HasLicense("CustomerRecord");
+                    bool crpermission = CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.CUSTOMER_RECORD);
+                    bool AllowCustomer = license && crpermission;
+                    bool AllowCommunicate = license && CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.COMMUNICATEWITHCUSTOMER);
+                    if (!AllowCommunicate) return "";
+
                     string clientdata = HttpUtility.HtmlDecode(Request.Params["ClientData"]);
                     string[] ps = JsonConvert.DeserializeObject<string[]>(clientdata);
                     long woid = Convert.ToInt64(ps[0]);
@@ -2682,7 +2743,11 @@ namespace IronIntel.Contractor.Site.Maintenance
                     var client = CreateClient<WorkOrderProvider>();
                     AssetInspectItem[] insplectitems = client.GetWOInspectItems(SystemParams.CompanyID, woid);
                     if (insplectitems == null || insplectitems.Length == 0)
-                        return new AssetInspectInfo[0];
+                        return new
+                        {
+                            WorkOrderID = woid,
+                            Data = new AssetInspectItem[0]
+                        };
 
                     List<AssetInspectInfo> list = new List<AssetInspectInfo>();
                     foreach (AssetInspectItem item in insplectitems)
@@ -2699,11 +2764,18 @@ namespace IronIntel.Contractor.Site.Maintenance
                         list[0].WorkOrders = wos;
                     }
 
-                    return list.ToArray();
-
+                    return new
+                    {
+                        WorkOrderID = woid,
+                        Data = list.ToArray()
+                    };
                 }
                 else
-                    return new AssetInspectItem[0];
+                    return new
+                    {
+                        WorkOrderID = -1,
+                        Data = new AssetInspectItem[0]
+                    };
             }
             catch (Exception ex)
             {
@@ -2849,7 +2921,11 @@ namespace IronIntel.Contractor.Site.Maintenance
                     var client = CreateClient<WorkOrderProvider>();
                     WorkOrderEstimateInfo[] estimates = client.GetWorkOrderEstimates(SystemParams.CompanyID, woid);
                     if (estimates == null || estimates.Length == 0)
-                        return new WorkOrderEstimateItem[0];
+                        return new
+                        {
+                            WorkOrderID = woid,
+                            Data = new WorkOrderEstimateItem[0]
+                        };
 
                     List<WorkOrderEstimateItem> list = new List<WorkOrderEstimateItem>();
                     foreach (WorkOrderEstimateInfo es in estimates)
@@ -2872,11 +2948,18 @@ namespace IronIntel.Contractor.Site.Maintenance
                         list.Add(item);
                     }
 
-                    return list.ToArray();
+                    return new
+                    {
+                        WorkOrderID = woid,
+                        Data = list.ToArray()
+                    };
                 }
                 else
-                    return new WorkOrderEstimateItem();
-
+                    return new
+                    {
+                        WorkOrderID = -1,
+                        Data = new WorkOrderEstimateItem[0]
+                    };
             }
             catch (Exception ex)
             {
@@ -3367,7 +3450,7 @@ namespace IronIntel.Contractor.Site.Maintenance
                         woendDate = DateTime.MaxValue;
 
                     var client = CreateClient<WorkOrderSurveyProvider>();
-                    WorkOrderSurveyItem[] items = client.GetWorkOrderSurveyItems(SystemParams.CompanyID, status, beginDate, endDate == DateTime.MaxValue ? (DateTime?)null : endDate, ps[3], locations, advisors, tempid, wobeginDate, woendDate == DateTime.MaxValue ? (DateTime?)null : woendDate);
+                    WorkOrderSurveyItem[] items = client.GetWorkOrderSurveyItems(SystemParams.CompanyID, status, beginDate, endDate == DateTime.MaxValue ? (DateTime?)null : endDate, HttpUtility.HtmlDecode(ps[3]), locations, advisors, tempid, wobeginDate, woendDate == DateTime.MaxValue ? (DateTime?)null : woendDate);
                     if (items == null || items.Length == 0)
                         return new WorkOrderSurveyInfo[0];
 
@@ -3651,7 +3734,11 @@ namespace IronIntel.Contractor.Site.Maintenance
                     var client = CreateClient<WorkOrderProvider>();
                     WorkOrderInvoiceInfo[] invoices = client.GetWorkOrderInvoices(SystemParams.CompanyID, woid);
                     if (invoices == null || invoices.Length == 0)
-                        return new WorkOrderInvoiceInfoItem[0];
+                        return new
+                        {
+                            WorkOrderID = woid,
+                            Data = new WorkOrderInvoiceInfoItem[0]
+                        };
 
                     List<WorkOrderInvoiceInfoItem> list = new List<WorkOrderInvoiceInfoItem>();
                     foreach (WorkOrderInvoiceInfo es in invoices)
@@ -3709,11 +3796,18 @@ namespace IronIntel.Contractor.Site.Maintenance
                         list.Add(item);
                     }
 
-                    return list.ToArray();
+                    return new
+                    {
+                        WorkOrderID = woid,
+                        Data = list.ToArray()
+                    };
                 }
                 else
-                    return new WorkOrderInvoiceInfoItem();
-
+                    return new
+                    {
+                        WorkOrderID = -1,
+                        Data = new WorkOrderInvoiceInfoItem[0]
+                    };
             }
             catch (Exception ex)
             {
@@ -4398,7 +4492,101 @@ namespace IronIntel.Contractor.Site.Maintenance
             }
         }
 
-        #endregion    
+        #endregion
+
+        #region Widgets
+
+        private object GetWorkOrderWidgets()
+        {
+            try
+            {
+                var session = GetCurrentLoginSession();
+                if (session != null)
+                {
+                    var client = CreateClient<Foresight.Fleet.Services.User.UserProfileProvider>();
+                    Foresight.Fleet.Services.User.UserWidgetInfo[] items = client.GetWidgets(SystemParams.CompanyID, session.User.UID, "WorkOrder");
+                    if (items == null || items.Length == 0)
+                        return new Foresight.Fleet.Services.User.UserWidgetInfo[0];
+
+                    bool license = SystemParams.HasLicense("CustomerRecord");
+                    bool crpermission = CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.CUSTOMER_RECORD);
+                    bool AllowCustomer = license && crpermission;
+                    bool AllowCommunicate = license && CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.COMMUNICATEWITHCUSTOMER);
+                    if (!AllowCustomer)
+                    {
+                        items = items.Where(i => !i.WidgetId.Equals("Estimates", StringComparison.OrdinalIgnoreCase)
+                        && !i.WidgetId.Equals("Invoices", StringComparison.OrdinalIgnoreCase)).ToArray();
+                    }
+                    if (!AllowCommunicate)
+                    {
+                        items = items.Where(i => !i.WidgetId.Equals("CustomerCommunication", StringComparison.OrdinalIgnoreCase)).ToArray();
+                    }
+
+                    license = SystemParams.HasLicense("Inspection");
+                    bool AllowInspection = license && CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.INSPECTION_REPORTS);
+                    if (!AllowInspection)
+                    {
+                        items = items.Where(i => !i.WidgetId.Equals("Inspections", StringComparison.OrdinalIgnoreCase)).ToArray();
+                    }
+
+                    return items;
+                }
+                else
+                    return new Foresight.Fleet.Services.User.UserWidgetInfo[0];
+            }
+            catch (Exception ex)
+            {
+                AddLog("ERROR", "WorkOrderBasePage.GetWorkOrderWidgets", ex.Message, ex.ToString());
+                return ex.Message;
+            }
+        }
+
+        private object SaveWorkOrderWidgets()
+        {
+            try
+            {
+                var session = GetCurrentLoginSession();
+                if (session != null)
+                {
+                    var clientdata = HttpUtility.HtmlDecode(Request.Form["ClientData"]);
+
+                    var widgets = JsonConvert.DeserializeObject<Foresight.Fleet.Services.User.UserWidgetInfo[]>(clientdata);
+                    CreateClient<Foresight.Fleet.Services.User.UserProfileProvider>().SaveWidgets(SystemParams.CompanyID, widgets);
+                    return "OK";
+                }
+                else
+                    return "Failed";
+            }
+            catch (Exception ex)
+            {
+                return ex.Message;
+            }
+        }
+
+        private object SaveWorkOrderWidgetLayout()
+        {
+            try
+            {
+                var session = GetCurrentLoginSession();
+                if (session != null)
+                {
+                    var clientdata = HttpUtility.HtmlDecode(Request.Form["ClientData"]);
+
+                    var widget = JsonConvert.DeserializeObject<Foresight.Fleet.Services.User.UserWidgetInfo>(clientdata);
+                    widget.UserIID = session.User.UID;
+                    widget.Category = "WorkOrder";
+                    CreateClient<Foresight.Fleet.Services.User.UserProfileProvider>().SaveWidgetLayout(SystemParams.CompanyID, widget);
+                    return "OK";
+                }
+                else
+                    return "Failed";
+            }
+            catch (Exception ex)
+            {
+                return ex.Message;
+            }
+        }
+        #endregion
 
     }
 

IronIntelContractorSiteLib/MapView/MapViewHandler.cs

@@ -37,6 +37,12 @@ namespace IronIntel.Contractor.Site.MapView
                     case "GetAssets":
                         result = GetAssets();
                         break;
+                    case "GetAssetBasicInfos":
+                        result = GetAssetBasicInfos();
+                        break;
+                    case "GetAssetBasicInfoByAssets":
+                        result = GetAssetBasicInfoByAssets();
+                        break;
                     case "GetAssetGroups":
                         result = GetAssetGroups();
                         break;
@@ -125,6 +131,7 @@ namespace IronIntel.Contractor.Site.MapView
                 throw ex;
             }
             string json = JsonConvert.SerializeObject(result, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore });
+            Context.Response.ContentType = "application/json";
             Context.Response.Write(json);
             Context.Response.End();
         }
@@ -181,6 +188,47 @@ namespace IronIntel.Contractor.Site.MapView
             //return assets;
         }
 
+        private MapViewAssetItem[] GetAssetBasicInfos()
+        {//获取用户有权的机器的基础信息，缓存在前端
+            MapViewAssetItem[] assets = null;
+            if (LoginSession != null)
+            {
+                var clientdata = Context.Request.Params["ClientData"];
+
+                clientdata = HttpUtility.HtmlDecode(clientdata);
+                string[] ps = JsonConvert.DeserializeObject<string[]>(clientdata);
+
+                if (!SystemParams.IsDealer)
+                    assets = AssetMapViewManagement.GetAssetBasicInfos(LoginSession.SessionID, ps[0], LoginSession.User.UID);
+                else
+                    assets = AssetMapViewManagement.GetDealerAssetBasicInfos(LoginSession.SessionID, ps[0], LoginSession.User.UID);
+            }
+            else
+                assets = new MapViewAssetItem[0];
+
+            return assets;
+        }
+
+        private MapViewAssetItem[] GetAssetBasicInfoByAssets()
+        {//获取用户有权的机器的基础信息，缓存在前端
+            MapViewAssetItem[] assets = null;
+            if (LoginSession != null)
+            {
+                var clientdata = Context.Request.Params["ClientData"];
+
+                clientdata = HttpUtility.HtmlDecode(clientdata);
+                string[] ps = JsonConvert.DeserializeObject<string[]>(clientdata);
+                long[] assetids = JsonConvert.DeserializeObject<long[]>(ps[1]);
+
+                if (assetids.Length > 0)
+                    assets = AssetMapViewManagement.GetAssetItemsByAssets(LoginSession.SessionID, ps[0], LoginSession.User.UID, assetids);
+            }
+            else
+                assets = new MapViewAssetItem[0];
+
+            return assets;
+        }
+
         private AssetGroupViewItem[] GetAssetGroups()
         {
             AssetGroupViewItem[] groups = null;

IronIntelContractorSiteLib/Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("23.4.26")]
+[assembly: AssemblyFileVersion("23.5.11")]

IronIntelContractorSiteLib/Security/UserToContractorPage.cs

@@ -91,7 +91,7 @@ namespace IronIntel.Contractor.Site.Security
                 contractors[i] = HttpUtility.UrlDecode(contractors[i]);
             }
             UserManagement.AddUserToContractor(iid, contractors);
-            Response.Write(JsonConvert.SerializeObject("Save contractors info successfully."));
+            Response.Write("Save contractors info successfully.");
             Response.End();
         }
     }

IronIntelContractorSiteLib/SingleAssetViewBasePage.cs

@@ -418,7 +418,7 @@ namespace IronIntel.Contractor.Site
             var session = GetCurrentLoginSession();
             if (session != null)
             {
-                return SystemParams.ConvertToUserTimeFromUtc(session.User, DateTime.UtcNow).ToString("M/d/yyyy h:m:s tt");
+                return SystemParams.ConvertToUserTimeFromUtc(session.User, DateTime.UtcNow).ToString("M/d/yyyy h:mm:ss tt");
             }
             return "";
         }

IronIntelContractorSiteLib/SystemSettings/SystemSettingsBasePage.cs

@@ -559,10 +559,14 @@ namespace IronIntel.Contractor.Site.SystemSettings
                     var client = CreateClient<Foresight.Fleet.Services.User.UserFilterProvider>();
 
                     string useriid = session.User.UID;
-                    bool accessallassets = false;
-                    Foresight.Fleet.Services.User.UserAdditionalAttribute attrs = CreateClient<Foresight.Fleet.Services.User.UserQueryClient>(SystemParams.CompanyID).GetUserAdditionalAttribute(useriid);
-                    if (attrs != null)
-                        accessallassets = attrs.AccessAllAssets;
+
+                    bool accessallassets = session.User.UserType >= Foresight.Fleet.Services.User.UserTypes.Admin;
+                    if (!accessallassets)
+                    {
+                        Foresight.Fleet.Services.User.UserAdditionalAttribute attrs = CreateClient<Foresight.Fleet.Services.User.UserQueryClient>(SystemParams.CompanyID).GetUserAdditionalAttribute(useriid);
+                        if (attrs != null)
+                            accessallassets = attrs.AccessAllAssets;
+                    }
 
                     UserFilterTemplateItem filter = new UserFilterTemplateItem();
 

IronIntelContractorSiteLib/UserManageBasePage.cs

@@ -2210,14 +2210,18 @@ namespace IronIntel.Contractor.Site
                 int filterid = Convert.ToInt32(filteridstr);
                 string useriid = HttpUtility.HtmlDecode(clientdata[1]);
 
-                if (GetCurrentLoginSession() != null)
+                var session = GetCurrentLoginSession();
+                if (session != null)
                 {
                     var client = CreateClient<Foresight.Fleet.Services.User.UserFilterProvider>();
 
-                    bool accessallassets = false;
-                    Foresight.Fleet.Services.User.UserAdditionalAttribute attrs = CreateClient<Foresight.Fleet.Services.User.UserQueryClient>(SystemParams.CompanyID).GetUserAdditionalAttribute(useriid);
-                    if (attrs != null)
-                        accessallassets = attrs.AccessAllAssets;
+                    bool accessallassets = session.User.UserType >= Foresight.Fleet.Services.User.UserTypes.Admin;
+                    if (!accessallassets)
+                    {
+                        Foresight.Fleet.Services.User.UserAdditionalAttribute attrs = CreateClient<Foresight.Fleet.Services.User.UserQueryClient>(SystemParams.CompanyID).GetUserAdditionalAttribute(useriid);
+                        if (attrs != null)
+                            accessallassets = attrs.AccessAllAssets;
+                    }
 
                     UserFilterTemplateItem filter = new UserFilterTemplateItem();
 

Site/AssetView/AssetMapView.aspx.cs

@@ -161,7 +161,7 @@ public partial class AssetMapView : ContractorBasePage
             if (SystemParams.IsDealer)
             {
                 AssetBasicInfo m = null;
-                var client = FleetServiceClientHelper.CreateClient<AssetQueryClient>();
+                var client = FleetServiceClientHelper.CreateClient<AssetQueryClient>(session.SessionID);
                 if (string.IsNullOrEmpty(machineid))
                 {
                     m = client.FromAdminAssetBasicInfoByVin(vin);
@@ -190,11 +190,14 @@ public partial class AssetMapView : ContractorBasePage
 
     private string GetCompanyID(string machineid, string vin)
     {
+        var session = GetCurrentLoginSession();
+        if (session == null)
+            return null;
         string companyid = "";
         if (SystemParams.IsDealer)
         {
             AssetBasicInfo m = null;
-            var client = FleetServiceClientHelper.CreateClient<AssetQueryClient>();
+            var client = FleetServiceClientHelper.CreateClient<AssetQueryClient>(session.SessionID);
             if (string.IsNullOrEmpty(machineid))
             {
                 m = client.FromAdminAssetBasicInfoByVin(vin);

Site/AssetView/AssetTimeline.aspx

@@ -1,47 +1,54 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/AssetView/AssetViewBase.master" AutoEventWireup="true" CodeFile="AssetTimeline.aspx.cs" Inherits="AssetView_AssetTimeline" %>
 
-<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
     <link href="<%=GetFileUrlWithVersion("../css/jquery.datetimepicker.css")%>" rel="stylesheet" />
     <script src="<%=GetFileUrlWithVersion("../js/jquery.datetimepicker.full.js")%>"></script>
     <style type="text/css">
         .table-container {
             margin: 4px 10px 0 26px;
         }
+
         .table-timeline {
             width: 100%;
             border-spacing: 0;
             table-layout: fixed;
         }
-        .table-timeline th {
-            width: 4.17%;
-            border-right: 1px solid white;
-            background: #444;
-            color: white;
-            font-weight: normal;
-            font-size: 13px;
-            height: 26px;
-        }
-        .table-timeline th,
-        .table-timeline td {
-            padding: 0;
-        }
+
+            .table-timeline th {
+                width: 4.17%;
+                border-right: 1px solid white;
+                background: #444;
+                color: white;
+                font-weight: normal;
+                font-size: 13px;
+                height: 26px;
+            }
+
+            .table-timeline th,
+            .table-timeline td {
+                padding: 0;
+            }
+
         #td-timeline {
             height: 30px;
             position: relative;
         }
-        #td-timeline div {
-            height: 26px;
-            position: absolute;
-            background: #64965a;
-            top: 2px;
-            border-radius: 6px;
-        }
-        #td-timeline div.no-start {
-            border-radius: 0 6px 6px 0;
-        }
-        #td-timeline div.no-end {
-            border-radius: 6px 0 0 6px;
-        }
+
+            #td-timeline div {
+                height: 26px;
+                position: absolute;
+                background: #64965a;
+                top: 2px;
+                border-radius: 6px;
+            }
+
+                #td-timeline div.no-start {
+                    border-radius: 0 6px 6px 0;
+                }
+
+                #td-timeline div.no-end {
+                    border-radius: 6px 0 0 6px;
+                }
     </style>
     <script type="text/javascript">
         _network.root = '<%=Page.ResolveUrl("~/")%>';
@@ -143,7 +150,7 @@
         }
 
         function OnRefresh(dt) {
-            if (dict.id != null) {
+            if (dict && dict.id != null) {
                 getAssetTimeline(dict.id, dt);
             }
         }
@@ -159,15 +166,19 @@
         }
     </script>
 </asp:Content>
-<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
     <div class="table-container">
         <div style="width: 100px; float: left">
             <table class="table-timeline">
                 <thead>
-                    <tr><th data-lgid="P_MV_TYPE">Type</th></tr>
+                    <tr>
+                        <th data-lgid="P_MV_TYPE">Type</th>
+                    </tr>
                 </thead>
                 <tbody>
-                    <tr><td style="height: 30px" data-lgid="P_MV_ONOFFEVENTS">On/Off Events</td></tr>
+                    <tr>
+                        <td style="height: 30px" data-lgid="P_MV_ONOFFEVENTS">On/Off Events</td>
+                    </tr>
                 </tbody>
             </table>
         </div>
@@ -175,12 +186,30 @@
             <table class="table-timeline">
                 <thead>
                     <tr id="tr-header">
-                        <th>0:00</th><th>1:00</th><th>2:00</th><th>3:00</th>
-                        <th>4:00</th><th>5:00</th><th>6:00</th><th>7:00</th>
-                        <th>8:00</th><th>9:00</th><th>10:00</th><th>11:00</th>
-                        <th>12:00</th><th>13:00</th><th>14:00</th><th>15:00</th>
-                        <th>16:00</th><th>17:00</th><th>18:00</th><th>19:00</th>
-                        <th>20:00</th><th>21:00</th><th>22:00</th><th>23:00</th>
+                        <th>0:00</th>
+                        <th>1:00</th>
+                        <th>2:00</th>
+                        <th>3:00</th>
+                        <th>4:00</th>
+                        <th>5:00</th>
+                        <th>6:00</th>
+                        <th>7:00</th>
+                        <th>8:00</th>
+                        <th>9:00</th>
+                        <th>10:00</th>
+                        <th>11:00</th>
+                        <th>12:00</th>
+                        <th>13:00</th>
+                        <th>14:00</th>
+                        <th>15:00</th>
+                        <th>16:00</th>
+                        <th>17:00</th>
+                        <th>18:00</th>
+                        <th>19:00</th>
+                        <th>20:00</th>
+                        <th>21:00</th>
+                        <th>22:00</th>
+                        <th>23:00</th>
                     </tr>
                 </thead>
                 <tbody>

Site/AssetView/AssetViewBase.master

@@ -86,16 +86,6 @@
                 $(document.body).click(window.parent.ondocumentclick);
             }
 
-            function resizeContent() {
-                $('#mask_bg').height($(document).outerHeight(false)).width($(document).outerWidth(false));
-            }
-
-            $(window).resize(function () {
-                resizeContent();
-            });
-            //window.onresize = resizeContent;
-            resizeContent();
-
             window.ondocumentclick = function (e) {
                 $(document.body).click();
             };

Site/AssetView/SingleAssetView.aspx

@@ -473,7 +473,7 @@
                             setTimeout(function () {
                                 timelineLoaded = true;
                                 OnRefresh();
-                            });
+                            },100);
                         });
                         $('#div_timeline').show();
                     }

Site/AssetView/js/assetpm.js

@@ -61,7 +61,7 @@ function InitPMGridData() {
         reset: GetTextByKey("P_GRID_RESET", "Reset")
     };
     var list_columns = [
-        { name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
+        { name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
         { name: 'PmScheduleName', caption: GetTextByKey("P_MV_SCHEDULENAME", "Schedule Name"), valueIndex: 'PmScheduleName', css: { 'width': 200, 'text-align': 'left' } },
         { name: 'StartValue', caption: GetTextByKey("P_MV_INITIALSERVICEVALUE", "Initial Service Value"), valueIndex: 'StartValue', css: { 'width': 120, 'text-align': 'right' } },
         { name: 'LastAlertTimeString', caption: GetTextByKey("P_MV_LASTSERVICEDATE", "Last Service Date"), valueIndex: 'LastAlertTimeString', css: { 'width': 120, 'text-align': 'left' } },
@@ -454,7 +454,7 @@ function createTBMContent(contentctrl, pmschedule) {
         item.PmScheduleID = pmschedule.PmScheduleID;
         //item.PMType = pmschedule.PmScheduleType;
         if (radio1.prop("checked")) {
-            item.StartDate = nowdate;
+            item.StartDate = currentdate;
         }
         else {
             item.StartDate = txtLastServiceDate.val();

Site/Contact/ManageContact.aspx

@@ -204,7 +204,7 @@
             $('#dialog_textaddress').val('');
 
             $('#dialog_contact .dialog-title span.title').text('Add Contact');
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_contact')
                 .attr('act', 'add')
                 .css({
@@ -233,7 +233,7 @@
             $('#dialog_textaddress').val(contact.TextAddress);
 
             $('#dialog_contact .dialog-title span.title').text('Edit Contact');
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_contact')
                 .attr('act', 'edit')
                 .css({
@@ -445,7 +445,7 @@
 
             var title = "Asset Assignment";// + "    " + jobsite.Name + "    " + "Radius_UOM: " + jobsite.Radius_UOM
             $('#dialog_managemahchine .dialog-title span.title').html(title);
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_managemahchine')
                 .css({
                     'height': 500,
@@ -766,7 +766,7 @@
 
             var title = "Jobsite Assignment";
             $('#dialog_managejobsite .dialog-title span.title').html(title);
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_managejobsite')
                 .css({
                     'height': 500,
@@ -1076,15 +1076,15 @@
 
 
             $('#dialog_contact').dialog(function () {
-                $('#mask_bg').hide();
+                showmaskbg(false);
             });
 
             $('#dialog_managemahchine').dialog(function () {
-                $('#mask_bg').hide();
+                showmaskbg(false);
             });
 
             $('#dialog_managejobsite').dialog(function () {
-                $('#mask_bg').hide();
+                showmaskbg(false);
             });
 
             $('#sel_machine_type').change(getMatchAvailableMachines);

Site/Credentials/Credentials.master

@@ -66,7 +66,6 @@
             function resizeContent() {
                 if ($('.content_main').length > 0)
                     $('.content_main').css('min-height', $(window).height() - $('.content_main').offset().top - 4);
-                $('#mask_bg').height($(document).outerHeight(false)).width($(document).outerWidth(false));
             }
 
             $(window).resize(function () {

Site/Credentials/ManageAPICredential.aspx

@@ -88,7 +88,7 @@
             $('#dialog_apitokensecret').val('');
             $('#dialog_enabled').attr('checked', false);
             $('#dialog_credential .dialog-title span.title').text(GetTextByKey("P_APICRE_ADDMANUFACTURE", 'Add Credential'));
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_credential')
                 .attr('act', 'add')
                 .css({
@@ -166,7 +166,7 @@
 
             $('#dialog_enabled').attr("checked", cre.IsEnabled);
             $('#dialog_credential .dialog-title span.title').text(GetTextByKey("P_APICRE_EDITMANUFACTURE", 'Edit Credential'));
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_credential')
                 .attr('act', 'edit')
                 .css({
@@ -381,7 +381,7 @@
                 setInput(dic);
             })
             $('#dialog_credential').dialog(function () {
-                $('#mask_bg').hide();
+                showmaskbg(false);
             });
             OnRefresh();
             $(window).resize(function () {

Site/Credentials/ManageCredential.aspx

@@ -83,7 +83,7 @@
             $('#dialog_orgid').val('');
             $('#dialog_notes').val('');
             $('#dialog_credential .dialog-title span.title').text(GetTextByKey("P_CRE_ADDMANUFACTURE", 'Add Credential'));
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_credential')
                 .attr('act', 'add')
                 .css({
@@ -111,7 +111,7 @@
             $('#dialog_orgid').val(cre.OrgnizationID);
             $('#dialog_notes').val(cre.Notes);
             $('#dialog_credential .dialog-title span.title').text(GetTextByKey("P_CRE_EDITMANUFACTURE", 'Edit Credential'));
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_credential')
                 .attr('act', 'edit')
                 .css({
@@ -277,7 +277,7 @@
             InitGridData();
 
             $('#dialog_credential').dialog(function () {
-                $('#mask_bg').hide();
+                showmaskbg(false);
             });
             OnRefresh();
             $(window).resize(function () {

Site/Credentials/ManageJDLink.aspx

@@ -355,7 +355,7 @@
 
         function OnAddNotification() {
             $('#dialog_displayname').val('');
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_credential')
                 .attr('act', 'add')
                 .css({
@@ -613,7 +613,7 @@
             OnRefreshNotification();
 
             $('#dialog_credential').dialog(function () {
-                $('#mask_bg').hide();
+                showmaskbg(false);
             });
 
             $('#dialog_myorganization').dialog(function () {

Site/Credentials/ManageJDNotifications.aspx

@@ -70,7 +70,7 @@
             $('#dialog_Verifierd').val('');
             $('#dialog_displayname').val('');
             $('#dialog_password').val('');
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_credential')
                 .attr('act', 'add')
                 .css({
@@ -232,7 +232,7 @@
             InitGridData();
 
             $('#dialog_credential').dialog(function () {
-                $('#mask_bg').hide();
+                showmaskbg(false);
             });
             OnRefresh();
             $(window).resize(function () {

Site/FITracker.aspx

@@ -306,14 +306,14 @@
 
         function OnEditAccuracy() {
             if (deviceid == undefined || deviceid <= 0) return;
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_accuracy')
                 .attr('act', 'add')
                 .css({
                     'top': (document.documentElement.clientHeight - $('#dialog_accuracy').height()) / 3,
                     'left': (document.documentElement.clientWidth - $('#dialog_accuracy').width()) / 2
                 })
-                .showDialog();
+                .showDialogfixed();
             $('#dialog_accuracyvalue').val($("#txtAccuracy").val()).select();
         }
 
@@ -340,7 +340,6 @@
                 else {
                     $("#txtAccuracy").val(accuracy);
                     deviceinfovm.device.AcceptableAccuracy = accuracy;
-                    $('#mask_bg').hide();
                     $('#dialog_accuracy').hideDialog();
                 }
             }, function (err) {
@@ -496,7 +495,7 @@
         }
 
         function sendLocation() {
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_map')
                 .attr('act', 'add')
                 .css({
@@ -516,7 +515,7 @@
                 msg += "Location";
                 postMessage(msg, 2);
                 $('#dialog_map').hideDialog();
-                $('#mask_bg').hide();
+                showmaskbg(false);
             }
             else {
                 showAlert(GetTextByKey("P_M3_PLEASESELECTALOCATIONTOSENDTO", 'Please select a location to send to.'), GetTextByKey("P_M3_SENDLOCATION", 'Send Location'));
@@ -734,11 +733,11 @@
             });
 
             $('#dialog_map').dialog(function () {
-                $('#mask_bg').hide();
+                showmaskbg(false);
             });
 
             $('#dialog_accuracy').dialog(function () {
-                $('#mask_bg').hide();
+                showmaskbg(false);
             });
 
             loadMap();
@@ -889,7 +888,7 @@
                 <tr>
                     <td class="label" style="width: 100px;" data-lgid="P_M3_NOTE_COLON">Note:</td>
                     <td>
-                        <textarea id="dialog_accuracynote" class="inputbox" maxlength="1000" tabindex="51" style="width: 240px; height: 100px; max-width: unset;"></textarea>
+                        <textarea id="dialog_accuracynote" maxlength="1000" tabindex="51" style="width: 240px; height: 100px; max-width: unset;"></textarea>
                     </td>
                 </tr>
             </table>

Site/Inspection/FuelReport.aspx

@@ -214,12 +214,12 @@
         function showRightPopup(state) {
             if (state) {
                 $('#content').css('overflow', 'hidden');
-                $("#mask_bg").show();
+                showmaskbg(true);
                 $("#right_popup").css("left", $("#set_left").width()).show();
             }
             else {
                 $('#content').css('overflow', '');
-                $("#mask_bg").hide();
+                showmaskbg(false);
                 $("#right_popup").hide();
             }
         }
@@ -355,7 +355,7 @@
                 { name: 'UID', caption: GetTextByKey("P_IPT_CONTACTNAME", "Contact Name"), valueIndex: 'UID', css: { 'width': 320, 'text-align': 'left' } },
                 //{ name: 'ContactType', caption: GetTextByKey("P_IPT_CONTACTTYPE", "Contact Type"), valueIndex: 'ContactType', css: { 'width': 148, 'text-align': 'left' } },
                 //{ name: 'Text', caption: GetTextByKey("P_MV_TEXT", "Text"), valueIndex: 'Text', type: 3, css: { 'width': 45, 'text-align': 'center' } },
-                { name: 'Selected', caption: GetTextByKey("P_IPT_EMAIL", "Email"), valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } }
+                { name: 'Selected', caption: GetTextByKey("P_IPT_EMAIL", "Email"), valueIndex: 'Selected', type: 3, css: { 'width': 60, 'text-align': 'center' } }
             ];
             var columns = [];
             // head
@@ -428,7 +428,7 @@
             GetFuelReport();
 
             $('#dialog_sendemail').dialog(function () {
-                $('#mask_bg').hide();
+                showmaskbg(false);
             });
 
             $('#sendlocation_search').bind('input propertychange', function () {
@@ -510,6 +510,7 @@
                             emails.push(m);
                     }
                 }
+                emails = emails.sort(function (a, b) { return (b.Selected ? 1 : 0) - (a.Selected ? 1 : 0) })
                 showEmailList(emails);
             }
         }
@@ -526,9 +527,8 @@
 
             $('#sendlocation_otheremailaddress').val('');
             $('#sendlocation_desc').val('');
-            $('#mask_bg').show();
             $('#dialog_sendemail .dialog-title span.title').text(GetTextByKey("P_IPT_SENDEMAIL", 'Send Email'));
-            //$('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_sendemail')
                 .attr('act', 'edit')
                 .css({
@@ -546,7 +546,7 @@
         function onSendEmail() {
             if (grid_dtemail.source.length == 0) {
                 $('#dialog_sendemail').hideDialog();
-                $('#mask_bg').hide();
+                showmaskbg(false);
                 return;
             }
 
@@ -570,7 +570,7 @@
 
             if (emailaddress.length == 0) {
                 $('#dialog_sendemail').hideDialog();
-                $('#mask_bg').hide();
+                showmaskbg(false);
                 return;
             }
 
@@ -582,7 +582,7 @@
                 else {
                     //showAlert(GetTextByKey("P_IPT_MESSAGESENT", 'Message sent.'), GetTextByKey("P_IPT_SENDEMAIL", 'Send Email'));
                     $('#dialog_sendemail').hideDialog();
-                    $('#mask_bg').hide();
+                    showmaskbg(false);
                 }
 
             }, function (err) {

Site/Inspection/Inspection.aspx

@@ -96,11 +96,11 @@
 
         function showRightPopup(state) {
             if (state) {
-                $("#mask_bg").show();
+                showmaskbg(true);
                 $("#right_popup").css("left", $("#set_left").width()).show();
             }
             else {
-                $("#mask_bg").hide();
+                showmaskbg(false);
                 $("#right_popup").hide();
             }
         }
@@ -122,6 +122,34 @@
             iframe.contentWindow.print();
         }
 
+        function openPrintFrame(rid) {
+            if (navigator.userAgent.indexOf('Firefox') >= 0 ||
+                navigator.userAgent.indexOf('Opera') >= 0) {
+                setTimeout(function () {
+                    window.open("Inspection.aspx?rt=f&t=2&id=" + rid + "&team=" + (teamintelligence ? 1 : 0), '_blank');
+                });
+            }
+            else {
+                var frame = $("<iframe style='display:none;'></iframe>");
+                $(document.body).after(frame);
+                frame.attr('src', "Inspection.aspx?rt=f&t=2&id=" + rid);
+                frame.on('load', function () {
+                    setTimeout(function () {
+                        frame[0].contentWindow.print();
+                    });
+                    setTimeout(function () {
+                        frame.remove();
+                    }, 60000);
+                });
+            }
+        }
+
+        function openDownloadFrame(rid) {
+            setTimeout(function () {
+                window.open("Inspection.aspx?rt=f&t=1&id=" + rid + "&team=" + (teamintelligence ? 1 : 0), '_blank');
+            });
+        }
+
         function createSubMenus(items) {
             var maintenancesubmenu = $("#inspectsubmenu").empty();
             var ulsubmenus = $('<ul class="lefttitlemenu_ul" style="line-height:32px;"></ul>');
@@ -145,8 +173,8 @@
                     return;
                 }
                 var items = [{ ID: 'templates/0', Title: GetTextByKey("P_DRAFT", "Draft") },
-                    { ID: 'templates/1', Title: GetTextByKey("P_PUBLISHED", "Published") },
-                    { ID: 'layouts/0', Title: GetTextByKey("P_LAYOUTS", "Layouts") }];
+                { ID: 'templates/1', Title: GetTextByKey("P_PUBLISHED", "Published") },
+                { ID: 'layouts/0', Title: GetTextByKey("P_LAYOUTS", "Layouts") }];
                 createSubMenus(items);
 
                 var left = $(this).offset().left;
@@ -172,7 +200,7 @@
                     return;
                 }
                 var items = [{ ID: 'exportpackages', Title: GetTextByKey("P_IPT_EXPORTPACKAGES", "Export Packages") },
-                    { ID: 'importpackages', Title: GetTextByKey("P_IPT_IMPORTPACKAGES", "Import Packages") }];
+                { ID: 'importpackages', Title: GetTextByKey("P_IPT_IMPORTPACKAGES", "Import Packages") }];
                 createSubMenus(items);
 
                 var left = $(this).offset().left;
@@ -190,6 +218,25 @@
                 });
                 return false;
             });
+
+            $('#nav_temparrow').click(function () {
+                var flag = !$('#nav_temparrow').prop('isexpanded');
+                var left_flag = !$('#set_left').prop('isexpanded');
+                $('#nav_temparrow').stop()
+                    .prop('isexpanded', flag);
+                if (flag)
+                    $('#set_left').find(".tempdesign").show();
+                else
+                    $('#set_left').find(".tempdesign").hide();
+
+                if (left_flag)
+                    $('#span_tempdesign').hide();
+
+                $('#nav_temparrow div').attr('class', 'icn')
+                    .addClass(flag ? 'expand' : 'collapse');
+            });
+
+            $('#nav_temparrow').click();
         });
     </script>
 </asp:Content>
@@ -199,9 +246,44 @@
             <li id="nav_arrow">
                 <div class="icn collapse"></div>
             </li>
+            <%if (ShowReport)
+                {%>
+            <li class="nav_item" data-module="inspections" data-title-lgid="P_INSPECTIONS"><a href="#inspections">
+                <div>
+                    <em class="fa icon-menu icon-report"></em>
+                </div>
+                <span data-lgid="P_INSPECTIONS">Inspections</span></a>
+            </li>
+            <%} %>
+
+            <%if (ShowFuelLog)
+                {%>
+            <li class="nav_item" data-module="fuellog" data-title-lgid="P_IPT_FUELLOG"><a href="#fuellog">
+                <div>
+                    <em class="fa icon-menu icon-fuellog"></em>
+                </div>
+                <span data-lgid="P_IPT_FUELLOG">Fuel Log</span></a>
+            </li>
+            <%} %>
+
+            <%if (ShowReport || ShowFuelLog)
+                {%>
+            <li style="height: 10px;">
+                <hr style="background-color: #d8d8d8; border: none; height: 1px;" />
+            </li>
+            <%} %>
+
+            <%if (ShowGlobalSections || ShowTemplate)
+                {%>
+            <li id="nav_temparrow">
+                <div class="icn expand"></div>
+                <span id="span_tempdesign" class="subitem" data-lgid="P_XXX" style="margin-left: 15px; font-weight: bold;">Template Design</span>
+            </li>
+            <%} %>
+
             <%if (ShowGlobalSections)
                 {%>
-            <li class="nav_item" data-module="globalsections" data-title-lgid="P_GLOBALSECTIONS"><a href="#globalsections">
+            <li class="nav_item tempdesign" data-module="globalsections" data-title-lgid="P_GLOBALSECTIONS"><a href="#globalsections" style="padding-left: 10px;">
                 <div>
                     <em class="fa icon-menu icon-sections"></em>
                 </div>
@@ -210,23 +292,23 @@
             <%} %>
             <%if (ShowTemplate)
                 {%>
-            <li class="nav_item" data-title-lgid="P_TEMPLATES"><a id="atemplates">
+            <li id="litem" class="nav_item tempdesign" data-title-lgid="P_TEMPLATES"><a id="atemplates" style="padding-left: 10px;">
                 <div>
                     <em class="fa icon-menu icon-templates"></em>
                 </div>
                 <span data-lgid="P_TEMPLATES">Templates</span></a>
             </li>
-            <li class="nav_item subitem" data-module="templates/0" data-title-lgid="P_DRAFT" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/0">
+            <li class="nav_item subitem tempdesign" data-module="templates/0" data-title-lgid="P_DRAFT" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/0">
                 <div style="width: 64px;">
                 </div>
                 <span style="color: #666;" data-lgid="P_DRAFT">Draft</span></a>
             </li>
-            <li class="nav_item subitem" data-module="templates/1" data-title-lgid="P_PUBLISHED" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/1">
+            <li class="nav_item subitem tempdesign" data-module="templates/1" data-title-lgid="P_PUBLISHED" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/1">
                 <div style="width: 64px;">
                 </div>
                 <span style="color: #666;" data-lgid="P_PUBLISHED">Published</span></a>
             </li>
-            <li class="nav_item subitem" data-module="layouts/0" data-title-lgid="P_LAYOUTS" style="height: 32px; line-height: 32px; display: none;"><a href="#layouts/0">
+            <li class="nav_item subitem tempdesign" data-module="layouts/0" data-title-lgid="P_LAYOUTS" style="height: 32px; line-height: 32px; display: none;"><a href="#layouts/0">
                 <div style="width: 64px;">
                 </div>
                 <span style="color: #666;" data-lgid="P_LAYOUTS">Layouts</span></a>
@@ -256,32 +338,6 @@
             </li>
             <%} %>
             <%} %>
-
-            <%if (ShowReport || ShowFuelLog)
-                {%>
-            <li style="height: 10px;">
-                <hr style="background-color: #d8d8d8; border: none; height: 1px;" />
-            </li>
-            <%} %>
-
-            <%if (ShowReport)
-                {%>
-            <li class="nav_item" data-module="inspections" data-title-lgid="P_INSPECTIONS"><a href="#inspections">
-                <div>
-                    <em class="fa icon-menu icon-report"></em>
-                </div>
-                <span data-lgid="P_INSPECTIONS">Inspections</span></a>
-            </li>
-            <%} %>
-            <%if (ShowFuelLog)
-                {%>
-            <li class="nav_item" data-module="fuellog" data-title-lgid="P_IPT_FUELLOG"><a href="#fuellog">
-                <div>
-                    <em class="fa icon-menu icon-fuellog"></em>
-                </div>
-                <span data-lgid="P_IPT_FUELLOG">Fuel Log</span></a>
-            </li>
-            <%} %>
         </ul>
         <div class="hostmask maskbg" style="display: none;"></div>
     </div>
@@ -297,7 +353,9 @@
         <div class="trigle white" style="left: -12px; right: auto;"></div>
     </div>
 
-    <div id="mask_bg" style="display: none;"><div class="loading c-spin"></div></div>
+    <div id="mask_bg" style="display: none;">
+        <div class="loading c-spin"></div>
+    </div>
     <div id="right_popup" style="display: none; position: absolute; left: 250px; top: 0; right: 0; bottom: 0; background-color: white; overflow: auto;">
     </div>
     <div id="right_popup1" style="display: none; position: absolute; left: 250px; top: 0; right: 0; bottom: 0; background-color: white; overflow: auto;"></div>

Site/Inspection/Report.aspx

@@ -60,7 +60,7 @@
         .page {
             /*background-color: #d3d3d3;*/
             /*height: 52px;*/
-            line-height: 52px;
+            line-height: 25px;
             margin-top: 8px;
             padding-left: 10px;
             padding-right: 10px;
@@ -72,7 +72,7 @@
         .section {
             /*background-color: #eaeaea;*/
             /*height: 40px;*/
-            line-height: 40px;
+            line-height: 20px;
             padding-left: 30px;
             padding-right: 10px;
             font-size: 20px;
@@ -81,8 +81,8 @@
         }
 
         .question {
-            min-height: 30px;
-            line-height: 30px;
+            min-height: 24px;
+            line-height: 24px;
             padding-left: 70px;
             padding-right: 10px;
             font-size: 14px;
@@ -92,12 +92,21 @@
         }
 
         .answer {
-            min-height: 30px;
-            line-height: 30px;
+            min-height: 24px;
+            line-height: 24px;
             padding-left: 90px;
             padding-right: 10px;
         }
 
+        .table_content {
+            padding-left: 3px;
+            padding-right: 3px;
+        }
+
+        .pagedoublespace {
+            line-height: 50px;
+        }
+
         .media {
             width: 120px;
             height: 120px;
@@ -176,6 +185,33 @@
                 display: block;
             }
         }
+
+        .question_line {
+            border-collapse: collapse;
+            border-top: 1px solid #dbdbdb;
+            border-bottom: 1px solid #dbdbdb;
+        }
+
+        .question_table_grid {
+            border-collapse: collapse;
+        }
+
+            .question_table_grid td {
+                border: 1px solid #dbdbdb;
+            }
+
+        .question_div_grid {
+            border: 1px solid #dbdbdb;
+        }
+
+        .mediacaption {
+            text-align: center;
+            clear: both;
+            height: 25px;
+            width: 120px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
     </style>
     <script src="<%=GetFileUrlWithVersion("../js/controls.js")%>" type="text/javascript"></script>
     <script src="<%=GetFileUrlWithVersion("../js/vue.min.js")%>"></script>
@@ -196,12 +232,12 @@
         function showRightPopup(state) {
             if (state) {
                 $('#content').css('overflow', 'hidden');
-                $("#mask_bg").show();
+                showmaskbg(true);
                 $("#right_popup").css("left", $("#set_left").width()).show();
             }
             else {
                 $('#content').css('overflow', '');
-                $("#mask_bg").hide();
+                showmaskbg(false);
                 $("#right_popup").hide();
             }
         }
@@ -249,7 +285,19 @@
         <span id="spPrint" id="button-print" class="sbutton iconprint" style="margin-right: 20px;" onclick="OnPrint();" data-lgid="P_IPT_PRINT">Print</span>
     </div>
     <div id="divreport" style="width: 1100px; margin: 0 auto;">
-        <img id="reportlayoutlogo" style="width: 100px; margin-top: 5px; display: none;" />
+        <div v-if="report.ReportLayout!=null">
+            <table class="maintable" style="width: 100%;">
+                <tr class="assettr">
+                    <td style="width: 33%; text-align: left;">
+                        <img id="reportlayoutlogo" style="width: 100px; margin-top: 5px; display: none;" /></td>
+                    <td style="width: 33%; text-align: center;">
+                        <img id="reportlayoutcenterlogo" style="width: 100px; margin-top: 5px; display: none;" /></td>
+                    <td style="width: 33%; text-align: right;">
+                        <img id="reportlayoutrightlogo" style="width: 100px; margin-top: 5px; display: none;" />
+                    </td>
+                </tr>
+            </table>
+        </div>
         <h1 style="text-align: center;" v-show="report.Template.DisplayInspectionTitle">{{report.Template.Name}}</h1>
         <div style="text-align: center; margin-bottom: 10px;"><span v-show="report.Template.DisplayCommitTime">{{report.CommitTimeLocalStr}}</span><span v-show="report.Template.DisplayCommitBy"> by {{report.CommitedByUserName}}</span></div>
         <table class="maintable">
@@ -362,7 +410,9 @@
             </tr>
         </table>
     </div>
-    <div id="mask_bg" style="display: none;"><div class="loading c-spin"></div></div>
+    <div id="mask_bg" style="display: none;">
+        <div class="loading c-spin"></div>
+    </div>
     <div id="right_popup" style="display: none; position: absolute; top: 0; right: 0; bottom: 0; background-color: white; overflow: auto;">
     </div>
     <iframe id="ifdiv" style="height: 1px; width: 1px; display: none;"></iframe>

Site/Inspection/ReportForWorkOrder.aspx

@@ -196,12 +196,12 @@
         function showRightPopup(state) {
             if (state) {
                 $('#content').css('overflow', 'hidden');
-                $("#mask_bg").show();
+                showmaskbg(true);
                 $("#right_popup").css("left", $("#set_left").width()).show();
             }
             else {
                 $('#content').css('overflow', '');
-                $("#mask_bg").hide();
+                showmaskbg(false);
                 $("#right_popup").hide();
             }
         }

Site/Inspection/TeamIntelligence.aspx

@@ -79,7 +79,7 @@
         var ShowTemplate =<%=ShowTemplate ?"true":"false"%>;
         var ShowReport =<%=ShowReport ?"true":"false"%>;
         var ReportReadonly =<%=ReportReadonly ?"true":"false"%>;
-        var IsCustomerRecord = false;        
+        var IsCustomerRecord = false;
 
         function inspectionrequest(method, param, callback, error) {
             _network.request("Inspection/Inspection.aspx", -1, method, param, callback, error || function (e) {
@@ -89,11 +89,11 @@
 
         function showRightPopup(state) {
             if (state) {
-                $("#mask_bg").show();
+                showmaskbg(true);
                 $("#right_popup").css("left", $("#set_left").width()).show();
             }
             else {
-                $("#mask_bg").hide();
+                showmaskbg(false);
                 $("#right_popup").hide();
             }
         }
@@ -115,6 +115,34 @@
             iframe.contentWindow.print();
         }
 
+        function openPrintFrame(rid) {
+            if (navigator.userAgent.indexOf('Firefox') >= 0 ||
+                navigator.userAgent.indexOf('Opera') >= 0) {
+                setTimeout(function () {
+                    window.open("Inspection.aspx?rt=f&t=2&id=" + rid + "&team=" + (teamintelligence ? 1 : 0), '_blank');
+                });
+            }
+            else {
+                var frame = $("<iframe style='display:none;'></iframe>");
+                $(document.body).after(frame);
+                frame.attr('src', "Inspection.aspx?rt=f&t=2&id=" + rid);
+                frame.on('load', function () {
+                    setTimeout(function () {
+                        frame[0].contentWindow.print();
+                    });
+                    setTimeout(function () {
+                        frame.remove();
+                    }, 60000);
+                });
+            }
+        }
+
+        function openDownloadFrame(rid) {
+            setTimeout(function () {
+                window.open("Inspection.aspx?rt=f&t=1&id=" + rid + "&team=" + (teamintelligence ? 1 : 0), '_blank');
+            });
+        }
+
         function createSubMenus(items) {
             var maintenancesubmenu = $("#inspectsubmenu").empty();
             var ulsubmenus = $('<ul class="lefttitlemenu_ul" style="line-height:32px;"></ul>');
@@ -183,6 +211,26 @@
                 });
                 return false;
             });
+
+            $('#nav_temparrow').click(function () {
+                var flag = !$('#nav_temparrow').prop('isexpanded');
+                var left_flag = !$('#set_left').prop('isexpanded');
+                $('#nav_temparrow').stop()
+                    .prop('isexpanded', flag);
+                if (flag)
+                    $('#set_left').find(".tempdesign").show();
+                else
+                    $('#set_left').find(".tempdesign").hide();
+
+                if (left_flag)
+                    $('#span_tempdesign').hide();
+
+                $('#nav_temparrow div').attr('class', 'icn')
+                    .addClass(flag ? 'expand' : 'collapse');
+            });
+
+            $('#nav_temparrow').click();
+
         });
     </script>
 </asp:Content>
@@ -192,9 +240,35 @@
             <li id="nav_arrow">
                 <div class="icn collapse"></div>
             </li>
+
+            <%if (ShowReport)
+                {%>
+            <li class="nav_item" data-module="inspections" data-title-lgid="P_INSPECTIONS"><a href="#inspections">
+                <div>
+                    <em class="fa icon-menu icon-report"></em>
+                </div>
+                <span data-lgid="P_INSPECTIONS">Inspections</span></a>
+            </li>
+            <%} %>
+
+            <%if (ShowReport)
+                {%>
+            <li style="height: 10px;">
+                <hr style="background-color: #d8d8d8; border: none; height: 1px;" />
+            </li>
+            <%} %>
+
+            <%if (IsSupperAdmin || ShowTemplate)
+                {%>
+            <li id="nav_temparrow">
+                <div class="icn expand"></div>
+                <span id="span_tempdesign" class="subitem"  data-lgid="P_XXX" style="margin-left: 15px; font-weight: bold;">Template Design</span>
+            </li>
+            <%} %>
+
             <%if (IsSupperAdmin)
                 {%>
-            <li class="nav_item" data-module="globalsections" data-title-lgid="P_GLOBALSECTIONS"><a href="#globalsections">
+            <li class="nav_item tempdesign" data-module="globalsections" data-title-lgid="P_GLOBALSECTIONS"><a href="#globalsections" style="padding-left: 10px;">
                 <div>
                     <em class="fa icon-menu icon-sections"></em>
                 </div>
@@ -203,23 +277,23 @@
             <%} %>
             <%if (ShowTemplate)
                 {%>
-            <li class="nav_item" data-title-lgid="P_TEMPLATES"><a id="atemplates">
+            <li class="nav_item tempdesign" data-title-lgid="P_TEMPLATES"><a id="atemplates" style="padding-left: 10px;">
                 <div>
                     <em class="fa icon-menu icon-templates"></em>
                 </div>
                 <span data-lgid="P_TEMPLATES">Templates</span></a>
             </li>
-            <li class="nav_item subitem" data-module="templates/0" data-title-lgid="P_DRAFT" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/0">
+            <li class="nav_item subitem tempdesign" data-module="templates/0" data-title-lgid="P_DRAFT" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/0">
                 <div style="width: 64px;">
                 </div>
                 <span style="color: #666;" data-lgid="P_DRAFT">Draft</span></a>
             </li>
-            <li class="nav_item subitem" data-module="templates/1" data-title-lgid="Published" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/1">
+            <li class="nav_item subitem tempdesign" data-module="templates/1" data-title-lgid="Published" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/1">
                 <div style="width: 64px;">
                 </div>
                 <span style="color: #666;" data-lgid="P_PUBLISHED">Published</span></a>
             </li>
-            <li class="nav_item subitem" data-module="layouts/1" data-title-lgid="P_LAYOUTS" style="height: 32px; line-height: 32px; display: none;"><a href="#layouts/1">
+            <li class="nav_item subitem tempdesign" data-module="layouts/1" data-title-lgid="P_LAYOUTS" style="height: 32px; line-height: 32px; display: none;"><a href="#layouts/1">
                 <div style="width: 64px;">
                 </div>
                 <span style="color: #666;" data-lgid="P_LAYOUTS">Layouts</span></a>
@@ -249,16 +323,6 @@
             </li>
             <%} %>
             <%} %>
-
-            <%if (ShowReport)
-                {%>
-            <li class="nav_item" data-module="inspections" data-title-lgid="P_INSPECTIONS"><a href="#inspections">
-                <div>
-                    <em class="fa icon-menu icon-report"></em>
-                </div>
-                <span data-lgid="P_INSPECTIONS">Inspections</span></a>
-            </li>
-            <%} %>
         </ul>
         <div class="hostmask maskbg" style="display: none;"></div>
     </div>

Site/Inspection/css/sections.css

@@ -14,11 +14,13 @@
 .section-holder {
     background: #e9e9e9;
     font-size: 16px;
-    margin-bottom:2px;
-}
-.section-holder:hover {
-    background-color: #d9d9d9;
+    margin-bottom: 2px;
 }
+
+    .section-holder:hover {
+        background-color: #d9d9d9;
+    }
+
 .section-input {
     padding: 2px 6px;
     min-height: 20px;
@@ -27,30 +29,36 @@
     border: 1px solid #e9e9e9;
     border-radius: 4px;
 }
-.section-input:hover{    
-    border: 1px solid #666;
-}
-.section-input:disabled{    
-    background: rgba(255,255,255,0);
-    border-color: rgba(255,255,255,0);
-}
+
+    .section-input:hover {
+        border: 1px solid #666;
+    }
+
+    .section-input:disabled {
+        background: rgba(255,255,255,0);
+        border-color: rgba(255,255,255,0);
+    }
 
 
 .question-holder .question-icon,
 .section-holder .section-icon {
     flex-shrink: 0;
 }
-.question-holder .question-icon em {
-    /*cursor: row-resize;*/
-    /*margin-left: 6px;*/
-    color: #666;
-}
+
+    .question-holder .question-icon em {
+        /*cursor: row-resize;*/
+        /*margin-left: 6px;*/
+        color: #666;
+    }
+
 .holder-even {
     background: #f9f9f9;
 }
+
 .question-holder:hover {
     background-color: #d9d9d9;
 }
+
 .question-input {
     padding: 2px 6px;
     min-height: 20px;
@@ -58,17 +66,21 @@
     border: 1px solid #fff;
     border-radius: 4px;
 }
-.question-input:hover {
-    border: 1px solid #666;
-}
-.question-input:disabled {
-    background: rgba(255,255,255,0);
-    border-color: rgba(255,255,255,0);
-}
+
+    .question-input:hover {
+        border: 1px solid #666;
+    }
+
+    .question-input:disabled {
+        background: rgba(255,255,255,0);
+        border-color: rgba(255,255,255,0);
+    }
+
 .question-holder .question-notes {
     flex-grow: 1;
     line-height: 24px;
 }
+
 .question-holder .question-name span:hover,
 .question-holder .template-name span:hover,
 .question-holder .question-display span:hover,
@@ -77,6 +89,7 @@
     text-decoration: underline;
     cursor: pointer;
 }
+
 .question-holder .question-cell,
 .section-holder .section-cell {
     display: inline-block;
@@ -84,23 +97,29 @@
     text-overflow: ellipsis;
     overflow: hidden;
 }
-.question-holder .question-cell.fa,
-.section-holder .section-cell .fa {
-    line-height: 40px;
-}
-.question-holder .question-cell.value-true::before {
-    content: '\f00c';
-}
-.section-holder .section-cell .add {
-    cursor: pointer;
-}
-.section-holder .section-cell .add::before {
-    content: '\f0fe';
-}
+
+    .question-holder .question-cell.fa,
+    .section-holder .section-cell .fa {
+        line-height: 40px;
+    }
+
+    .question-holder .question-cell.value-true::before {
+        content: '\f00c';
+    }
+
+    .section-holder .section-cell .add {
+        cursor: pointer;
+    }
+
+        .section-holder .section-cell .add::before {
+            content: '\f0fe';
+        }
+
 .rowdrag {
     font-size: 14px;
-    cursor:move;
+    cursor: move;
 }
+
 .form-control {
     /*display: block;
     width: 100%;*/
@@ -137,6 +156,7 @@
     flex-direction: row;
     padding: 4px 0;
 }
+
     .editor-top > span {
         flex: 1 1 auto;
     }
@@ -146,14 +166,14 @@
         margin-left: 4px;
     }
 
-    .editor-toolbar a[data-edit],
-    .svg-button {
-        display: inline-block;
-        width: 22px;
-        height: 22px;
-        cursor: pointer;
-        user-select: none;
-    }
+.editor-toolbar a[data-edit],
+.svg-button {
+    display: inline-block;
+    width: 22px;
+    height: 22px;
+    cursor: pointer;
+    user-select: none;
+}
 
     .editor-toolbar a[data-edit] > svg,
     .svg-button > svg {
@@ -206,4 +226,26 @@
 .img-icon-filename {
     max-width: 100px;
     margin-left: 6px;
-}
+}
+
+.img-icon-centerfilename {
+    max-width: 100px;
+    margin-left: 6px;
+}
+
+.img-icon-rightfilename {
+    max-width: 100px;
+    margin-left: 6px;
+}
+
+
+.select-layout-name {
+    margin-left: 20px;
+}
+
+.select-layout {
+    border: 1px solid #a9a9a9;
+    margin-left: 4px;
+    width: 100px;
+    height: 18px;
+}

Site/Inspection/js/common.js

@@ -81,7 +81,6 @@ define(function () {
         };
 
         $.fn.showDialog = function (selfmask) {
-            //$('#mask_bg').height($(document).outerHeight(false)).width($(document).outerWidth(false));
             if (this.attr("init") !== "1") {
                 this.attr("init", "1");
                 var _this = this;
@@ -92,7 +91,6 @@ define(function () {
                     this.before(mask);
                 }
                 $(window).resize(function () {
-                    //_this.height(_this.parent().outerHeight(false) - 64).width(_this.parent().outerWidth(false) - left - 2);
                     if (_this.mask)
                         _this.mask.height($(document).outerHeight(false) - 64).width($(document).outerWidth(false));
                 });

Site/Inspection/js/main.js

@@ -5,7 +5,7 @@ require.config({
         //spectrum: "../../js/spectrum"
     },
     waitSeconds: 0,
-    urlArgs: "v=437" //+ Math.random()
+    urlArgs: "v=455" //+ Math.random()
 })
 
 requirejs(['modules/pageloader'], function (loader) {
@@ -25,8 +25,9 @@ requirejs(['modules/pageloader'], function (loader) {
             .animate({ 'width': flag ? 250 : 50 }, ANIMATION_DURATION)
             //.find('li a').css('display', flag ? 'none' : '')
             ;
-        if (flag)
+        if (flag) {
             $('#set_left').find(".subitem").show();
+        }
         else
             $('#set_left').find(".subitem").hide();
 

Site/Inspection/js/modules/fuellog.js

@@ -188,16 +188,15 @@ define([], function () {
             };
             var p = [false, htmlencode(JSON.stringify(item))];
             inspectionrequest('UpdateFuelReportHeaderFooter', JSON.stringify(p), function (r) {
+                loading.hide();
                 if (r == 'OK') {
                     showAlert(GetTextByKey("P_MV_SAVSUCCESSFULLY", 'Saved successfully.'), alerttitle, null, function () {
-                        loading.fadeOut(100);
                         if (exit) {
                             showRightPopup(false);
                         }
                     });
                 } else {
                     showAlert(GetTextByKey("P_IPT_FUELRPT_SAVEERROR", 'Failed to save fuel report page settings.'), alerttitle, null, function () {
-                        loading.fadeOut(100);
                     });
                 }
             }, 1000);

Site/Inspection/js/modules/globalsections.js

@@ -46,12 +46,12 @@ define(['modules/sections/section', 'modules/sections/addsection'], function (Se
         dataheader.append('<div style="width:60px; flex-shrink: 0"></div>');
         dataheader.append('<div class="question-cell" style="width: 200px">' + GetTextByKey("P_IPT_NAME", "Name") + '</div>');
         dataheader.append('<div class="question-cell" style="width: 310px">' + GetTextByKey("P_IPT_DISPLAYTEXT", "Display Text") + '</div>');
-        dataheader.append('<div class="question-cell" style="width: 420px">' + GetTextByKey("P_IPT_TYPE", "Type") + '</div>');
+        dataheader.append('<div class="question-cell" style="width: 400px">' + GetTextByKey("P_IPT_TYPE", "Type") + '</div>');
         dataheader.append('<div class="question-cell" style="width: 80px; text-align: center">' + GetTextByKey("P_IPT_REQUIRED", "Required") + '</div>');
-        dataheader.append('<div class="question-cell" style="width: 100px; text-align: center">' + GetTextByKey("P_IPT_CANCOMMENT", "Can Comment") + '</div>');
-        dataheader.append('<div class="question-cell" style="width: 100px; text-align: center">' + GetTextByKey("P_IPT_ISIMPORTANT", "Is Important") + '</div>');
-        dataheader.append('<div class="question-cell" style="width: 140px">' + GetTextByKey("P_IPT_CUSTOMERVISIBLE", "Customer Visible") + '</div>');
-        dataheader.append('<div class="question-cell" style="width: 140px">' + GetTextByKey("P_IPT_SEVERITYLEVEL", "Severity Level") + '</div>');
+        dataheader.append('<div class="question-cell" style="width: 65px; text-align: center;white-space:normal;line-height:20px;">' + GetTextByKey("P_IPT_XXX", "Include Comment") + '</div>');
+        dataheader.append('<div class="question-cell" style="width: 70px; text-align: center;white-space:normal;line-height:20px;">' + GetTextByKey("P_IPT_ISIMPORTANT", "Is Important") + '</div>');
+        dataheader.append('<div class="question-cell" style="width: 70px; text-align: center;white-space:normal;line-height:20px;">' + GetTextByKey("P_IPT_CUSTOMERVISIBLE", "Customer Visible") + '</div>');
+        dataheader.append('<div class="question-cell" style="width: 80px; text-align: center;white-space:normal;line-height:20px;">' + GetTextByKey("P_IPT_SEVERITYLEVEL", "Severity Level") + '</div>');
         dataheader.append('<div style="flex-grow: 1" style="width: 160px">' + GetTextByKey("P_IPT_NOTES", "Notes") + '</div>');
         if (sectiontype === 0)
             dataheader.append('<div class="question-cell" style="width: 120px;">' + GetTextByKey("P_IPT_CREATEDBY", "Created By") + '</div>');

Site/Inspection/js/modules/importpackages.js

@@ -27,7 +27,7 @@
             reset: GetTextByKey("P_GRID_RESET", "Reset")
         };
         var list_columns = [
-            { name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
+            { name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
             { name: 'TemplateName', caption: GetTextByKey("P_TEMPLATE", "Template"), valueIndex: 'Name', css: { 'width': 320, 'text-align': 'left' } },
             { name: 'AssetName', caption: GetTextByKey("P_IPT_NOTES", "Notes"), valueIndex: 'Notes', css: { 'width': 400, 'text-align': 'left' } }
         ];
@@ -84,7 +84,7 @@
             reset: GetTextByKey("P_GRID_RESET", "Reset")
         };
         var list_columns = [
-            { name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
+            { name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
             { name: 'SectionName', caption: GetTextByKey("P_IPT_SECTION", "Section"), valueIndex: 'ItemName', css: { 'width': 320, 'text-align': 'left' } },
             { name: 'AssetName', caption: GetTextByKey("P_IPT_NOTES", "Notes"), valueIndex: 'Notes', css: { 'width': 400, 'text-align': 'left' } }
         ];
@@ -247,10 +247,12 @@
         this.content = content;
         var funcs = $('<div class="function_title"></div>');
         var btn = $('<span class="sbutton iconsave">' + GetTextByKey('P_IPT_IMPORT', 'Import') + '</span>').click(function () {
-            showConfirm(GetTextByKey("P_IPT_DOYOUWANTTOOVERWRITETHEITEMSWHICHHAVEANEWERVERSION", 'Do you want to overwrite the items which have a higher version?'), GetTextByKey("P_IPT_IMPORTPACKAGE", 'Import Package'), function () {
+            showConfirmYesNoCancel(GetTextByKey("P_IPT_DOYOUWANTTOOVERWRITETHEITEMSWHICHHAVEANEWERVERSION", 'Do you want to overwrite the items which have a higher version?'), GetTextByKey("P_IPT_IMPORTPACKAGE", 'Import Package'), function () {
                 onImport(_this, 1);
             }, function () {
                 onImport(_this, 0);
+            }, function () {
+                return;
             });
         });
         funcs.append(btn);

Site/Inspection/js/modules/inspections.js

@@ -85,6 +85,33 @@ define(['modules/inspects/inspect', 'modules/inspects/editinspection'], function
                 }
             });
             func.append(iconResetPivots);
+
+            var iconprints = $('<span class="sbutton iconprint">' + GetTextByKey("P_IPT_XXXXXX", "Print") + '</span>').click(function () {
+                for (var i = 0; i < grid_dt.source.length; i++) {
+                    var inspect = grid_dt.source[i].Values;
+                    if (inspect.Selected) {
+                        if (navigator.userAgent.indexOf('Firefox') >= 0 ||
+                            navigator.userAgent.indexOf('Opera') >= 0) {
+                            window.open("Inspection.aspx?rt=f&t=2&id=" + inspect.Id + "&team=" + (teamintelligence ? 1 : 0), '_blank');
+                        }
+                        else
+                            openPrintFrame(inspect.Id);
+                    }
+                }
+            });
+            func.append(iconprints);
+
+            var icondownloads = $('<span class="sbutton icondownload">' + GetTextByKey("P_IPT_XXXXXX", "Download") + '</span>').click(function () {
+                for (var i = 0; i < grid_dt.source.length; i++) {
+                    var inspect = grid_dt.source[i].Values;
+                    if (inspect.Selected) {
+                        openDownloadFrame(inspect.Id);
+                    }
+                }
+            });
+            func.append(icondownloads);
+
+
             header.append(func)
 
             return header;
@@ -121,7 +148,18 @@ define(['modules/inspects/inspect', 'modules/inspects/editinspection'], function
                 { name: 'Print', caption: "", css: { 'width': 30, 'text-align': 'center' } },
                 { name: 'ViewChangeHistory', caption: "", css: { 'width': 30, 'text-align': 'center' } }
             ];
-            var columns = [];
+            var columns = [
+                {
+                    // checkbox
+                    name: 'check',
+                    key: 'Selected',
+                    width: 45,
+                    align: 'center',
+                    sortable: false,
+                    allcheck: true,
+                    type: 3
+                }
+            ];
             // head
             for (var hd in list_columns) {
                 var col = {};
@@ -246,7 +284,7 @@ define(['modules/inspects/inspect', 'modules/inspects/editinspection'], function
                         if (item.Id === "")
                             return htmldecode(item.WorkOrderNumber);
 
-                        var div = $('<div class="dropdown" style="width: 200px;"></div>');
+                        var div = $('<div class="dropdown" style="width: 185px;"></div>');
                         div.dropdown(item.WorkOrders || [{ Id: -1, WorkOrderNumber: "Not Assigned" }], {
                             search: false,
                             textKey: 'WorkOrderNumber',

Site/Inspection/js/modules/layouts.js

@@ -273,7 +273,7 @@
                 $('<option value="[Model]">Model</option>'),
                 $('<option value="[VIN]">VIN/SN</option>'),
                 $('<option value="[Work_Order_Number]">Work Order Number</option>'),
-                $('<option value="[Work_Order_Type]">Work Order Type</option>'), 
+                $('<option value="[Work_Order_Type]">Work Order Type</option>'),
                 $('<option value="[Parts_Order_Number]">Parts Order Number</option>'),
                 $('<option value="[Year]">Year</option>')
             );
@@ -318,9 +318,12 @@
     }
 
     function editLayout(info) {
-        $('#right_popup').load('js/modules/layouts/addlayout.html?v=2', function () {
+        $('#right_popup').load('js/modules/layouts/addlayout.html?v=5', function () {
             var modified = false;
             var deleteIcon = false;
+            var deleteCenterIcon = false;
+            var deleteRightIcon = false;
+            initColorCtrl();
             var content = $(this).applyFleetLanguageText(true);
             content.find('.button-exit').on('click', function () {
                 if (modified) {
@@ -342,7 +345,7 @@
                 }
             });
             content.find('.button-icon-upload').on('click', function () {
-                content.find('.icon-file file').remove();
+                content.find('.icon-file input[type="file"]').remove();
                 $('<input type="file" accept="image/png,image/jpeg" />')
                     .hide().appendTo(content.find('.icon-file'))
                     .on('change', function () {
@@ -365,7 +368,78 @@
             content.find('.button-icon-delete').on('click', function () {
                 deleteIcon = true;
                 content.find('.img-icon-filename').remove();
+                content.find('.icon-file input[type="file"]').remove();
             });
+
+            content.find('.button-icon-centerupload').on('click', function () {
+                content.find('.icon-centerfile input[type="file"]').remove();
+                $('<input type="file" accept="image/png,image/jpeg" />')
+                    .hide().appendTo(content.find('.icon-centerfile'))
+                    .on('change', function () {
+                        if (!/image\/\w+/.test(this.files[0].type)) {
+                            showAlert(GetTextByKey("P_LAYOUT_UPLOADICONTIPS", 'The file type for the logo is invalid. The file must be JPG or PNG.'), GetTextByKey('P_LAYOUT_SAVEINSPECTLAYOUT', 'Save Inspection Layout'));
+                            $(this).remove();
+                            return;
+                        }
+                        var file = this.files[0];
+                        var reader = new FileReader();
+                        reader.readAsDataURL(file);
+                        reader.onload = function (e) {
+                            setTimeout(function () {
+                                content.find('.img-icon-centerfilename').remove();
+                                $('<img class="img-icon-centerfilename" />').attr('src', e.target.result).insertAfter(content.find('.icon-centerfile-title'));
+                            });
+                        };
+                    }).click();
+            });
+            content.find('.button-icon-centerdelete').on('click', function () {
+                deleteCenterIcon = true;
+                content.find('.img-icon-centerfilename').remove();
+                content.find('.icon-centerfile input[type="file"]').remove();
+            });
+
+            content.find('.button-icon-rightupload').on('click', function () {
+                content.find('.icon-rightfile input[type="file"]').remove();
+                $('<input type="file" accept="image/png,image/jpeg" />')
+                    .hide().appendTo(content.find('.icon-rightfile'))
+                    .on('change', function () {
+                        if (!/image\/\w+/.test(this.files[0].type)) {
+                            showAlert(GetTextByKey("P_LAYOUT_UPLOADICONTIPS", 'The file type for the logo is invalid. The file must be JPG or PNG.'), GetTextByKey('P_LAYOUT_SAVEINSPECTLAYOUT', 'Save Inspection Layout'));
+                            $(this).remove();
+                            return;
+                        }
+                        var file = this.files[0];
+                        var reader = new FileReader();
+                        reader.readAsDataURL(file);
+                        reader.onload = function (e) {
+                            setTimeout(function () {
+                                content.find('.img-icon-rightfilename').remove();
+                                $('<img class="img-icon-rightfilename" />').attr('src', e.target.result).insertAfter(content.find('.icon-rightfile-title'));
+                            });
+                        };
+                    }).click();
+            });
+            content.find('.button-icon-rightdelete').on('click', function () {
+                deleteRightIcon = true;
+                content.find('.img-icon-rightfilename').remove();
+                content.find('.icon-rightfile input[type="file"]').remove();
+            });
+
+            content.find('#layout-style').on('change', function () {
+                var style = $('#layout-style').val();
+                if (parseInt(style) === 2) {
+                    $('#layout-picturesdisplay').val(1);
+                    $('#layout-picturesdisplay').prop('disabled', true);
+                }
+                else {
+                    $('#layout-picturesdisplay').prop('disabled', false);
+                }
+            });
+            content.find('#layout-highlightcolor-input').keyup(null, function () {
+                $("#layout-highlightcolor-selector").spectrum("set", $('#layout-highlightcolor-input').val());
+            })
+
+
             var save = function (exit) {
                 return function () {
                     var title = GetTextByKey('P_LAYOUT_SAVEINSPECTLAYOUT', 'Save Inspection Layout');
@@ -379,20 +453,26 @@
                         );
                         return;
                     }
-
                     var layout = {
                         Id: info && info.Id,
                         Target: layouts.isteam ? 1 : 0,
                         Name: name,
-                        IncludeLOGO: content.find('#layout-include-logo').prop('checked'),
                         Notes: content.find('.text-layout-notes').val(),
                         PageHeaderLeft: content.find('.layout-headers-left .editor-content').val(),
                         PageHeaderCenter: content.find('.layout-headers-middle .editor-content').val(),
                         PageHeaderRight: content.find('.layout-headers-right .editor-content').val(),
                         PageFooterLeft: content.find('.layout-footers-left .editor-content').val(),
                         PageFooterCenter: content.find('.layout-footers-middle .editor-content').val(),
-                        PageFooterRight: content.find('.layout-footers-right .editor-content').val()
+                        PageFooterRight: content.find('.layout-footers-right .editor-content').val(),
+                        Style: content.find('#layout-style').val(),
+                        Spacing: content.find('#layout-spacing').val(),
+                        PicturesDisplay: content.find('#layout-picturesdisplay').val(),
+                        CaptionImages: content.find('#layout-captionimages').prop('checked'),
+                        Divider: content.find('#layout-divider').val(),
+                        HighlightColor: content.find('#layout-highlightcolor-input').val()
                     };
+                    if (layout.Style === "")
+                        layout.Style = -1;
                     var data = new FormData();
                     var files = content.find('.icon-file input[type="file"]').prop('files');
                     if (files && files[0]) {
@@ -401,6 +481,23 @@
                         var logo = content.find('.img-icon-filename').prop('src');
                         layout.LOGO = logo.substr(logo.indexOf(';base64,') + 8);
                     }
+
+                    var centerfiles = content.find('.icon-centerfile input[type="file"]').prop('files');
+                    if (centerfiles && centerfiles[0]) {
+                        data.append('iconCenterFile', centerfiles && centerfiles[0]);
+                    } else if (!deleteCenterIcon) {
+                        var logo = content.find('.img-icon-centerfilename').prop('src');
+                        layout.CenterLOGO = logo.substr(logo.indexOf(';base64,') + 8);
+                    }
+
+                    var rightfiles = content.find('.icon-rightfile input[type="file"]').prop('files');
+                    if (rightfiles && rightfiles[0]) {
+                        data.append('iconRightFile', rightfiles && rightfiles[0]);
+                    } else if (!deleteRightIcon) {
+                        var logo = content.find('.img-icon-rightfilename').prop('src');
+                        layout.RightLOGO = logo.substr(logo.indexOf(';base64,') + 8);
+                    }
+
                     data.append('MethodName', 'SaveInspectLayout');
                     data.append('ClientData', encodeURIComponent(JSON.stringify(layout)));
                     $.ajax({
@@ -459,10 +556,15 @@
             var onchange = function () { modified = true };
             if (info != null) {
                 content.find('.text-layout-name').val(info.Name);
-                content.find('#layout-include-logo').prop('checked', info.IncludeLOGO);
                 if (info.LOGO != null) {
                     content.find('.img-icon-filename').attr('src', 'data:image/png;base64,' + info.LOGO);
                 }
+                if (info.CenterLOGO != null) {
+                    content.find('.img-icon-centerfilename').attr('src', 'data:image/png;base64,' + info.CenterLOGO);
+                }
+                if (info.RightLOGO != null) {
+                    content.find('.img-icon-rightfilename').attr('src', 'data:image/png;base64,' + info.RightLOGO);
+                }
                 content.find('.text-layout-notes').val(info.Notes);
                 content.find('.layout-headers-left .editor-content').val(info.PageHeaderLeft);
                 content.find('.layout-headers-middle .editor-content').val(info.PageHeaderCenter);
@@ -470,9 +572,17 @@
                 content.find('.layout-footers-left .editor-content').val(info.PageFooterLeft);
                 content.find('.layout-footers-middle .editor-content').val(info.PageFooterCenter);
                 content.find('.layout-footers-right .editor-content').val(info.PageFooterRight);
+
+                content.find('#layout-style').val(info.Style);
+                content.find('#layout-spacing').val(info.Spacing);
+                content.find('#layout-picturesdisplay').val(info.PicturesDisplay);
+                content.find('#layout-captionimages').prop('checked', info.CaptionImages);
+                content.find('#layout-divider').val(info.Divider);
+                content.find('#layout-highlightcolor-input').val(info.HighlightColor);
+                content.find('#layout-highlightcolor-selector').spectrum("set", info.HighlightColor);
             }
             content.find('.text-layout-name').on('change', onchange);
-            content.find('#layout-include-logo').on('change', onchange);
+            //content.find('#layout-style').on('change', onchange);
             content.find('.text-layout-notes').on('change', onchange);
             content.find('.layout-headers-left .editor-content').on('change', onchange);
             content.find('.layout-headers-middle .editor-content').on('change', onchange);
@@ -480,6 +590,12 @@
             content.find('.layout-footers-left .editor-content').on('change', onchange);
             content.find('.layout-footers-middle .editor-content').on('change', onchange);
             content.find('.layout-footers-right .editor-content').on('change', onchange);
+            content.find('#layout-style').on('change', onchange);
+            content.find('#layout-spacing').on('change', onchange);
+            content.find('#layout-picturesdisplay').on('change', onchange);
+            content.find('#layout-captionimages').on('change', onchange);
+            content.find('#layout-divider').on('change', onchange);
+            content.find('#layout-highlightcolor-input').on('change', onchange);
 
             content.find('.text-layout-name').focus();
         });
@@ -509,5 +625,59 @@
         }
     });
 
+    function initColorCtrl() {
+        $('#layout-highlightcolor-selector').spectrum({
+            allowEmpty: true,
+            color: "#FFF",
+            showInput: true,
+            containerClassName: "full-spectrum",
+            showInitial: true,
+            showPalette: true,
+            showSelectionPalette: true,
+            showAlpha: true,
+            maxPaletteSize: 10,
+            preferredFormat: "hex",
+            localStorageKey: "spectrum.demo",
+            chooseText: GetTextByKey("P_IPT_OK", "OK"),
+            cancelText: GetTextByKey("P_IPT_CANCEL", "Cancel"),
+            clearText: GetTextByKey("P_SPECTRUM_CLEARCOLORSELECTION", "Clear Color Selection"),
+            noColorSelectedText: GetTextByKey("P_SPECTRUM_NOCOLORSELECTED", "No Color Selected"),
+            move: function (color) {
+                if (color)
+                    $('#layout-highlightcolor-input').val(color.toHexString().toUpperCase()); // #ff0000
+            },
+            show: function () {
+
+            },
+            beforeShow: function () {
+
+            },
+            hide: function (color) {
+                if (color) {
+                    $('#layout-highlightcolor-input').val(color.toHexString().toUpperCase()); // #ff0000
+                }
+            },
+
+            palette: [
+                ["rgb(0, 0, 0)", "rgb(67, 67, 67)", "rgb(102, 102, 102)", /*"rgb(153, 153, 153)","rgb(183, 183, 183)",*/
+                    "rgb(204, 204, 204)", "rgb(217, 217, 217)", /*"rgb(239, 239, 239)", "rgb(243, 243, 243)",*/ "rgb(255, 255, 255)"],
+                ["rgb(152, 0, 0)", "rgb(255, 0, 0)", "rgb(255, 153, 0)", "rgb(255, 255, 0)", "rgb(0, 255, 0)",
+                    "rgb(0, 255, 255)", "rgb(74, 134, 232)", "rgb(0, 0, 255)", "rgb(153, 0, 255)", "rgb(255, 0, 255)"],
+                ["rgb(230, 184, 175)", "rgb(244, 204, 204)", "rgb(252, 229, 205)", "rgb(255, 242, 204)", "rgb(217, 234, 211)",
+                    "rgb(208, 224, 227)", "rgb(201, 218, 248)", "rgb(207, 226, 243)", "rgb(217, 210, 233)", "rgb(234, 209, 220)",
+                    "rgb(221, 126, 107)", "rgb(234, 153, 153)", "rgb(249, 203, 156)", "rgb(255, 229, 153)", "rgb(182, 215, 168)",
+                    "rgb(162, 196, 201)", "rgb(164, 194, 244)", "rgb(159, 197, 232)", "rgb(180, 167, 214)", "rgb(213, 166, 189)",
+                    "rgb(204, 65, 37)", "rgb(224, 102, 102)", "rgb(246, 178, 107)", "rgb(255, 217, 102)", "rgb(147, 196, 125)",
+                    "rgb(118, 165, 175)", "rgb(109, 158, 235)", "rgb(111, 168, 220)", "rgb(142, 124, 195)", "rgb(194, 123, 160)",
+                    "rgb(166, 28, 0)", "rgb(204, 0, 0)", "rgb(230, 145, 56)", "rgb(241, 194, 50)", "rgb(106, 168, 79)",
+                    "rgb(69, 129, 142)", "rgb(60, 120, 216)", "rgb(61, 133, 198)", "rgb(103, 78, 167)", "rgb(166, 77, 121)",
+                    /*"rgb(133, 32, 12)", "rgb(153, 0, 0)", "rgb(180, 95, 6)", "rgb(191, 144, 0)", "rgb(56, 118, 29)",
+                    "rgb(19, 79, 92)", "rgb(17, 85, 204)", "rgb(11, 83, 148)", "rgb(53, 28, 117)", "rgb(116, 27, 71)",*/
+                    "rgb(91, 15, 0)", "rgb(102, 0, 0)", "rgb(120, 63, 4)", "rgb(127, 96, 0)", "rgb(39, 78, 19)",
+                    "rgb(12, 52, 61)", "rgb(28, 69, 135)", "rgb(7, 55, 99)", "rgb(32, 18, 77)", "rgb(76, 17, 48)"]
+            ]
+        });
+    }
+
     return layouts;
 });

Site/Inspection/js/modules/layouts/addlayout.html

@@ -8,30 +8,74 @@
             <span class="sbutton iconexit button-exit" data-lgid="P_IPT_SAVE2">Exit Without Saving</span>
         </div>
         <div class="page_title" data-lgid="P_LAYOUT_GENERAL">General</div>
-        <div style="display: flex">
-            <div class="settings-line">
-                <span>
-                    <span data-lgid="P_LAYOUT_NAMECOLON">Layout Name:</span>
-                    <b style="color: red">*</b>
-                    <input type="text" class="text-layout-name" maxlength="200" />
-                </span>
-                <span>
-                    <label for="layout-include-logo" data-lgid="P_LAYOUT_INCLUDELOGO">Include Logo:</label>
-                    <input type="checkbox" id="layout-include-logo" />
-                </span>
+        <div class="settings-line">
+            <span>
+                <span data-lgid="P_LAYOUT_NAMECOLON">Layout Name:</span>
+                <b style="color: red">*</b>
+                <input type="text" class="text-layout-name" maxlength="200" />
+
+                <label data-lgid="P_LAYOUT_XXX" class="select-layout-name">Style:</label>
+                <select id="layout-style" class="select-layout">
+                    <option value="0">Standard</option>
+                    <option value="1">Compressed</option>
+                    <option value="2">Split</option>
+                </select>
+            </span>
+            <span>
                 <span class="icon-file">
-                    <span class="icon-file-title" data-lgid="P_LAYOUT_ICONFILENAME">Logo file:</span>
+                    <span class="icon-file-title" data-lgid="P_LAYOUT_XX">Left Logo file:</span>
                     <img class="img-icon-filename" />
                     <span class="svg-button button-icon-upload"><svg><use href="#symbol-upload"></use></svg></span>
                     <span class="svg-button button-icon-delete"><svg><use href="#symbol-close"></use></svg></span>
                 </span>
-            </div>
-            <div class="settings-line" style="flex: 1 1 auto">
-                <span style="display: flex">
-                    <span data-lgid="P_LAYOUT_NOTESCOLON" style="vertical-align:top; white-space:nowrap">Notes:</span>
-                    <textarea class="text-layout-notes" style="height:100px; width:100%; box-sizing:border-box; margin-left:8px"></textarea>
+                <span class="icon-centerfile" style="margin-left:30px;">
+                    <span class="icon-centerfile-title" data-lgid="P_LAYOUT_XXX">Center Logo file:</span>
+                    <img class="img-icon-centerfilename" />
+                    <span class="svg-button button-icon-centerupload"><svg><use href="#symbol-upload"></use></svg></span>
+                    <span class="svg-button button-icon-centerdelete"><svg><use href="#symbol-close"></use></svg></span>
                 </span>
-            </div>
+                <span class="icon-rightfile" style="margin-left:30px;">
+                    <span class="icon-rightfile-title" data-lgid="P_LAYOUT_XXX">Right Logo file:</span>
+                    <img class="img-icon-rightfilename" />
+                    <span class="svg-button button-icon-rightupload"><svg><use href="#symbol-upload"></use></svg></span>
+                    <span class="svg-button button-icon-rightdelete"><svg><use href="#symbol-close"></use></svg></span>
+                </span>
+            </span>
+
+            <span style="display: flex">
+                <span data-lgid="P_LAYOUT_NOTESCOLON" style="vertical-align:top; white-space:nowrap">Notes:</span>
+                <textarea class="text-layout-notes" style="height:100px; width:100%; box-sizing:border-box; margin-left:8px"></textarea>
+            </span>
+        </div>
+        <div class="page_title" data-lgid="P_LAYOUT_XXX">Options</div>
+        <div class="settings-line">
+            <span>
+                <span data-lgid="P_LAYOUT_XXX">Spacing:</span>
+                <select id="layout-spacing" class="select-layout">
+                    <option value="0" data-lgid="P_XXX">Single Space</option>
+                    <option value="1" data-lgid="P_XXX">Double Space</option>
+                </select>
+
+                <span data-lgid="P_LAYOUT_XXX" class="select-layout-name">Pictures:</span>
+                <select id="layout-picturesdisplay" class="select-layout" style="width:140px;">
+                    <option value="0" data-lgid="P_XXX">Displayed As Taken</option>
+                    <option value="1" data-lgid="P_XXX">Displayed At Bottom</option>
+                </select>
+
+                <span data-lgid="P_LAYOUT_XXX" class="select-layout-name">Caption Images:</span>
+                <input type="checkbox" id="layout-captionimages" />
+
+                <span data-lgid="P_LAYOUT_XXX" class="select-layout-name">Divider:</span>
+                <select id="layout-divider" class="select-layout" style="width:80px;">
+                    <option value="0" data-lgid="P_XXX">None</option>
+                    <option value="1" data-lgid="P_XXX">Line</option>
+                    <option value="2" data-lgid="P_XXX">Grid</option>
+                </select>
+
+                <span data-lgid="P_LAYOUT_XXX" class="select-layout-name">VIP Questions/Section Highlight Color:</span>
+                <input id="layout-highlightcolor-input" style="width:60px;" maxlength="7" />
+                <input id="layout-highlightcolor-selector" />
+            </span>
         </div>
 
         <div class="page_title" data-lgid="P_IPT_FUELRPT_HEADER">Page Headers</div>

Site/Inspection/js/modules/sections/addquestion.js

@@ -83,7 +83,7 @@ define(['common'], function (Common) {
             tb.append(tr);
             tr.append('<td class="label">' + GetTextByKey("P_IPT_NAME_COLON", "Name:") + '<span class="redasterisk">*</span></td>');
             namecontrol = $('<input type="text" maxlength="100"/>');
-            var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
+            var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
             addiText.click(function () {
                 Common.createMultiTextDialog(namecontrol, _this.question);
             });
@@ -93,7 +93,7 @@ define(['common'], function (Common) {
             tb.append(tr);
             tr.append('<td class="label">' + GetTextByKey("P_IPT_DISPLAYTEXT_COLON", "Display Text:") + '<span  class="redasterisk">*</span></td>');
             displaytextcontrol = $('<input type="text" maxlength="1000" />');
-            addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
+            addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
             addiText.click(function () {
                 Common.createMultiTextDialog(displaytextcontrol, _this.question);
             });
@@ -141,7 +141,7 @@ define(['common'], function (Common) {
             tr = $('<tr></tr>');
             tb.append(tr);
             tr.append('<td class="label">Notes:</td>');
-            notescontrol = $('<textarea id="dialog_notes" class="inputbox" maxlength="1000" style="width: 400px; margin-top: 6px;"></textarea>');
+            notescontrol = $('<textarea id="dialog_notes" maxlength="1000" style="width: 400px; margin-top: 6px;"></textarea>');
             tr.append($('<td></td>').append(notescontrol));
 
             return div_main;
@@ -187,7 +187,7 @@ define(['common'], function (Common) {
             tb.append(tr);
             var optext = $('<input type="text" style="width:240px;margin-left:5px;"/>');
             this.dialog_text = optext;
-            var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
+            var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
             addiText.click(function () {
                 Common.createMultiTextDialog(optext, _this.question);
             });

Site/Inspection/js/modules/sections/addsection.js

@@ -82,7 +82,7 @@ define(['common'], function (Common) {
             tb.append(tr);
             tr.append('<td class="label" style="vertical-align:middle;">' + GetTextByKey("P_IPT_DISPLAYTEXT_COLON", "Display Text:") + '<span class="redasterisk">*</span></td>');
             displaytextcontrol = $('<input type="text" maxlength="200"  autocomplete="off"/>');
-            addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
+            addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
             addiText.click(function () {
                 Common.createMultiTextDialog(displaytextcontrol, _this.section);
             });
@@ -91,7 +91,7 @@ define(['common'], function (Common) {
             tr = $('<tr></tr>');
             tb.append(tr);
             tr.append('<td class="label">' + GetTextByKey("P_IPT_NOTES_COLON", "Notes:") + '</td>');
-            notescontrol = $('<textarea id="dialog_notes" class="inputbox" maxlength="500" autocomplete="off" style="width: 400px; margin-top: 6px;"></textarea>');
+            notescontrol = $('<textarea id="dialog_notes" maxlength="500" autocomplete="off" style="width: 400px; margin-top: 6px;"></textarea>');
             tr.append($('<td></td>').append(notescontrol));
 
             return div_main;

Site/Inspection/js/modules/sections/option.js

@@ -48,7 +48,7 @@
         tb.append(tr);
         var optext = $('<input type="text" class="form-control" style="width:226px;margin-left:5px;"/>');
         this.dialog_text = optext;
-        var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
+        var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
         addiText.click(function () {
             Common.createMultiTextDialog(optext);
         });

Site/Inspection/js/modules/sections/question.js

@@ -64,7 +64,7 @@ define(['modules/sections/addquestion', 'modules/sections/option', 'common', 'mo
 
         if (this.index % 2 == 1)
             qholder.addClass('holder-even');
-        var drag = $('<div class="question-icon" style="width:30px;"><em class="spanbtn iconmove rowdrag"></em></div>');
+        var drag = $('<div class="question-icon" style="width:30px;"  title="' + GetTextByKey("P_IPT_XXX", "Move Question") + '"><em class="spanbtn iconmove rowdrag"></em></div>');
         qholder.append(drag);
         if (!_this.section.IsLink && sectiontype == 1) {
             drag.attr('draggable', true);
@@ -108,14 +108,14 @@ define(['modules/sections/addquestion', 'modules/sections/option', 'common', 'mo
 
         qholder.append('<div class="question-icon" style="width:30px;"><em class="fa"></em></div>');
         _this.txtName = $('<input type="text" class="question-input"  maxlength="100" autocomplete="off" style="width:146px;" />');
-        var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
+        var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
         addiText.click(function () {
             Common.createMultiTextDialog(_this.txtName, _this.question);
         });
         qholder.append($('<div class="question-cell question-name" style="width: 190px;padding-left:10px;"></div>').append(this.txtName).append(addiText));
 
         _this.txtDisplayText = $('<input type="text" class="question-input"  maxlength="200" autocomplete="off" style="width:236px;" />');
-        addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
+        addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
         addiText.click(function () {
             Common.createMultiTextDialog(_this.txtDisplayText, _this.question);
         });
@@ -137,16 +137,16 @@ define(['modules/sections/addquestion', 'modules/sections/option', 'common', 'mo
         qholder.append($('<div class="question-cell question-required" style="width: 80px; text-align: center"></div>').append(this.chkIsRequired));
 
         _this.chkCanComment = $('<input type="checkbox" />');
-        qholder.append($('<div class="question-cell question-comment" style="width: 100px; text-align: center"></div>').append(this.chkCanComment));
+        qholder.append($('<div class="question-cell question-comment" style="width: 65px; text-align: center"></div>').append(this.chkCanComment));
 
         _this.chkIsImportant = $('<input type="checkbox" />');
-        qholder.append($('<div class="question-cell question-important" style="width: 100px; text-align: center"></div>').append(this.chkIsImportant));
+        qholder.append($('<div class="question-cell question-important" style="width: 70px; text-align: center"></div>').append(this.chkIsImportant));
 
         _this.chkCustomerVisible = $('<input type="checkbox" />');
-        qholder.append($('<div class="question-cell question-important" style="width: 140px; text-align: center"></div>').append(this.chkCustomerVisible));
+        qholder.append($('<div class="question-cell question-important" style="width: 70px; text-align: center"></div>').append(this.chkCustomerVisible));
 
-        _this.selSeverityLevel = createSeverityLevel().addClass('question-input').css('width', 130);
-        qholder.append($('<div class="question-cell question-security" style="width: 140px"></div>').append(this.selSeverityLevel));
+        _this.selSeverityLevel = createSeverityLevel().addClass('question-input').css('width', 70);
+        qholder.append($('<div class="question-cell question-security" style="width: 80px"></div>').append(this.selSeverityLevel));
 
         _this.txtNotes = $('<textarea class="question-input"  maxlength="500" autocomplete="off" style="width:95%;margin-top:5px;"></textarea>');
         qholder.append($('<div class="question-cell question-notes" style="width: 160px;white-space:normal;"></div>').append(this.txtNotes));
@@ -214,7 +214,7 @@ define(['modules/sections/addquestion', 'modules/sections/option', 'common', 'mo
 
             td = $('<td></td>');
             tr.append(td);
-            _this.btnoption = $('<span class="spanbtn iconangleleft" style="font-size:18px;"></span>');
+            _this.btnoption = $('<span class="spanbtn iconangleleft" style="font-size:18px;" title="' + GetTextByKey("P_IPT_XXX","Display Options") + '"></span>');
             td.append(_this.btnoption);
             _this.btnoption.click(function () {
                 var icon = $(this);

Site/Inspection/js/modules/sections/section.js

@@ -38,7 +38,7 @@ define(['modules/sections/question', 'modules/sections/addsection', 'modules/sec
             }
 
             if (sectiontype == 1) {
-                var drag = $('<div class="question-icon" style="width:30px;"><em class="spanbtn iconmove rowdrag"></em></div>');
+                var drag = $('<div class="question-icon" style="width:30px;" title="' + GetTextByKey("P_IPT_XXX","Move Section") + '"><em class="spanbtn iconmove rowdrag"></em></div>');
                 holder.append(drag);
                 if (sectiontype == 1) {
                     drag.attr('draggable', true);
@@ -106,7 +106,7 @@ define(['modules/sections/question', 'modules/sections/addsection', 'modules/sec
             this.txtName.change(function () {
                 _this.onsave();
             });
-            var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
+            var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
             addiText.click(function () {
                 Common.createMultiTextDialog(_this.txtName, _this.section);
             });
@@ -116,7 +116,7 @@ define(['modules/sections/question', 'modules/sections/addsection', 'modules/sec
             this.txtDisplayText.change(function () {
                 _this.onsave();
             });
-            addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
+            addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
             addiText.click(function () {
                 Common.createMultiTextDialog(_this.txtDisplayText, _this.section);
             });

Site/Inspection/js/modules/templates/addtemplate.js

@@ -174,7 +174,7 @@ define(['modules/templates/pages', 'modules/templates/filters', 'modules/templat
             tr = $('<tr class="templatetr"></tr>');
             tb.append(tr);
             tr.append('<td class="label" style="width:160px;">' + GetTextByKey("P_IPT_NOTES_COLON", "Notes:") + '</td>');
-            notescontrol = $('<textarea id="dialog_notes" class="inputbox form-control" maxlength="500" autocomplete="off" style="width: 540px; margin-top: 6px;height:80px;"></textarea>');
+            notescontrol = $('<textarea id="dialog_notes" class="form-control" maxlength="500" autocomplete="off" style="width: 540px; margin-top: 6px;height:80px;"></textarea>');
             tr.append($('<td></td>').append(notescontrol));
 
             //Email 
@@ -240,7 +240,7 @@ define(['modules/templates/pages', 'modules/templates/filters', 'modules/templat
                 { name: 'UserName', caption: GetTextByKey("P_IPT_CONTACTNAME", "Contact Name"), valueIndex: 'UserName', css: { 'width': 180, 'text-align': 'left' } },
                 { name: 'ContactType', caption: GetTextByKey("P_IPT_CONTACTTYPE", "Contact Type"), valueIndex: 'ContactType', css: { 'width': 180, 'text-align': 'left' } },
                 //{ name: 'Text', caption: "Text", valueIndex: 'Text', type: 3, css: { 'width': 45, 'text-align': 'center' } },
-                { name: 'Selected', caption: GetTextByKey("P_IPT_EMAIL", "Email"), valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } }
+                { name: 'Selected', caption: GetTextByKey("P_IPT_EMAIL", "Email"), valueIndex: 'Selected', type: 3, css: { 'width': 60, 'text-align': 'center' } }
             ];
             var columns = [];
             // head

Site/Inspection/js/modules/templates/linksection.js

@@ -28,7 +28,7 @@ define(['common'], function (Common) {
                 // checkbox
                 name: 'check',
                 key: 'Selected',
-                width: 30,
+                width: 45,
                 align: 'center',
                 sortable: false,
                 allcheck: true,

Site/Inspection/js/modules/templates/page.js

@@ -28,7 +28,7 @@ define(['modules/sections/section', 'modules/sections/addsection', 'common', 'mo
             tb.append(tr);
             tr.append('<td class="label" style="width:154px;">' + GetTextByKey("P_IPT_NAME_COLON", "Name:") + '<span class="redasterisk">*</span></td>');
             _this.namecontrol = $('<input type="text" class="form-control" maxlength="100" autocomplete="off"/>');
-            var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
+            var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
             addiText.click(function () {
                 Common.createMultiTextDialog(_this.namecontrol);
             });
@@ -40,14 +40,14 @@ define(['modules/sections/section', 'modules/sections/addsection', 'common', 'mo
 
             tb.append(tr);
             tr.append('<td class="label" style="width:154px;">' + GetTextByKey("P_IPT_NOTES_COLON", "Notes:") + '</td>');
-            _this.notescontrol = $('<textarea id="dialog_notes" class="inputbox form-control" maxlength="500" autocomplete="off" style="width: 540px; margin-top:6px;height:55px;"></textarea>');
+            _this.notescontrol = $('<textarea id="dialog_notes" class="form-control" maxlength="500" autocomplete="off" style="width: 540px; margin-top:6px;height:55px;"></textarea>');
             tr.append($('<td rowspan="2"></td>').append(_this.notescontrol));
 
             tr = $('<tr></tr>');
             tb.append(tr);
             tr.append('<td class="label" style="width:154px;">' + GetTextByKey("P_IPT_DISPLAYTEXT_COLON", "Display Text:") + '<span class="redasterisk">*</span></td>');
             _this.displaytextcontrol = $('<input type="text" class="form-control" maxlength="200" autocomplete="off"/>');
-            addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
+            addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
             addiText.click(function () {
                 Common.createMultiTextDialog(_this.displaytextcontrol);
             });
@@ -65,7 +65,7 @@ define(['modules/sections/section', 'modules/sections/addsection', 'common', 'mo
                 var header = $('<div></div>');
                 //header.append($('<div class="page_title"></div>').text(gs.title));
                 var func = $('<div class="function_title"></div>');
-                var iconAdd = $('<span class="sbutton iconadd">' + GetTextByKey("P_IPT_ADD", "Add") + '</span>').click(function () {
+                var iconAdd = $('<span class="sbutton iconadd">' + GetTextByKey("P_IPT_ADDSECTION", "Add Section") + '</span>').click(function () {
                     //var s = new AddSection();
                     //s.onsave = function (section) {
                     //    _this.page.Sections.push(section);
@@ -95,10 +95,10 @@ define(['modules/sections/section', 'modules/sections/addsection', 'common', 'mo
             dataheader.append('<div class="question-cell" style="width: 310px">' + GetTextByKey("P_IPT_DISPLAYTEXT", "Display Text") + '</div>');
             dataheader.append('<div class="question-cell" style="width: 400px">' + GetTextByKey("P_IPT_TYPE", "Type") + '</div>');
             dataheader.append('<div class="question-cell" style="width: 80px; text-align: center">' + GetTextByKey("P_IPT_REQUIRED", "Required") + '</div>');
-            dataheader.append('<div class="question-cell" style="width: 100px; text-align: center">' + GetTextByKey("P_IPT_CANCOMMENT", "Can Comment") + '</div>');
-            dataheader.append('<div class="question-cell" style="width: 100px; text-align: center">' + GetTextByKey("P_IPT_ISIMPORTANT", "Is Important") + '</div>');
-            dataheader.append('<div class="question-cell" style="width: 140px">' + GetTextByKey("P_IPT_CUSTOMERVISIBLE", "Customer Visible") + '</div>');
-            dataheader.append('<div class="question-cell" style="width: 140px">' + GetTextByKey("P_IPT_SEVERITYLEVEL", "Severity Level") + '</div>');
+            dataheader.append('<div class="question-cell" style="width: 65px; text-align: center;white-space:normal;line-height:20px;">' + GetTextByKey("P_IPT_XXX", "Include Comment") + '</div>');
+            dataheader.append('<div class="question-cell" style="width: 70px; text-align: center;white-space:normal;line-height:20px;">' + GetTextByKey("P_IPT_ISIMPORTANT", "Is Important") + '</div>');
+            dataheader.append('<div class="question-cell" style="width: 70px; text-align: center;white-space:normal;line-height:20px;"">' + GetTextByKey("P_IPT_CUSTOMERVISIBLE", "Customer Visible") + '</div>');
+            dataheader.append('<div class="question-cell" style="width: 80px; text-align: center;white-space:normal;line-height:20px;">' + GetTextByKey("P_IPT_SEVERITYLEVEL", "Severity Level") + '</div>');
             dataheader.append('<div style="flex-grow: 1" style="width: 160px">' + GetTextByKey("P_IPT_ST_NOTES", "Notes") + '</div>');
             dataheader.append('<div class="question-cell" style="width: 90px;padding-right:20px;"></div>');
             content.append(dataheader);

Site/Inspection/js/modules/templates/templatepicture.js

@@ -28,7 +28,7 @@ define(['common'], function (Common) {
                 // checkbox
                 name: 'check',
                 key: 'Selected',
-                width: 30,
+                width: 45,
                 align: 'center',
                 sortable: false,
                 allcheck: true,

Site/Inspection/js/report.js

@@ -1,6 +1,14 @@
 
 var vm;
 var reportdata;
+var reportlayout;
+var layoutStyle = 0;
+var layoutDivider = 0;
+var layoutSpacing = 0;
+var layoutPicturesDisplay = 0;
+var layoutCaptionImages = false;
+var layoutHighlightColor = "";
+var mediasdata = [];
 $(function () {
     $("#host_header").find(".button").remove();
     $("#spanUserName").remove();
@@ -62,11 +70,25 @@ function GetInspectionReport() {
         }
         else {
             reportdata = data;
+            reportlayout = data.ReportLayout;
+            if (reportlayout) {
+                layoutStyle = parseInt(reportlayout.Style);
+                layoutDivider = parseInt(reportlayout.Divider);
+                layoutSpacing = parseInt(reportlayout.Spacing);
+                layoutPicturesDisplay = parseInt(reportlayout.PicturesDisplay);
+                layoutCaptionImages = reportlayout.CaptionImages;
+                layoutHighlightColor = reportlayout.HighlightColor;
+                if (layoutStyle == 2)
+                    layoutPicturesDisplay = 1;
+            };
             vm.reload(data);
             showReportLayout(data.ReportLayout);
             showIdentifiedQuestions(data.IdentifiedQuestions);
             showPages(data);
             showSignature(data);
+            if (layoutPicturesDisplay == 1 && mediasdata && mediasdata.length > 0) {
+                showMedias();
+            }
         }
 
         showmaskbg(false);
@@ -77,6 +99,8 @@ function GetInspectionReport() {
 
 function showReportLayout(layout) {
     $('#reportlayoutlogo').hide();
+    $('#reportlayoutcenterlogo').hide();
+    $('#reportlayoutrightlogo').hide();
     $('.td_pageheaderleft').html('');
     $('.td_pageheadercenter').html('');
     $('.td_pageheaderright').html('');
@@ -92,13 +116,29 @@ function showReportLayout(layout) {
         $('.td_pagefooterright').html(layout.PageFooterRight);
 
         $('#reportlayoutlogo').show();
-        if (layout.IncludeLOGO && layout.LOGO && layout.LOGO.length > 0) {
+        $('#reportlayoutcenterlogo').show();
+        $('#reportlayoutrightlogo').show();
+        if (layout.LOGO && layout.LOGO.length > 0) {
             var jpeg = layout.LOGO;
             if (typeof (layout.LOGO) !== "string") {
                 jpeg = arrayBufferToBase64(layout.LOGO);
             }
             $('#reportlayoutlogo').attr('src', 'data:image/png;base64,' + jpeg);
         }
+        if (layout.CenterLOGO && layout.CenterLOGO.length > 0) {
+            var jpeg = layout.CenterLOGO;
+            if (typeof (layout.CenterLOGO) !== "string") {
+                jpeg = arrayBufferToBase64(layout.CenterLOGO);
+            }
+            $('#reportlayoutcenterlogo').attr('src', 'data:image/png;base64,' + jpeg);
+        }
+        if (layout.RightLOGO && layout.RightLOGO.length > 0) {
+            var jpeg = layout.RightLOGO;
+            if (typeof (layout.RightLOGO) !== "string") {
+                jpeg = arrayBufferToBase64(layout.RightLOGO);
+            }
+            $('#reportlayoutrightlogo').attr('src', 'data:image/png;base64,' + jpeg);
+        }
     }
 }
 
@@ -118,19 +158,7 @@ function showIdentifiedQuestions(questions) {
     var content = $('<div></div>');
     content.append($('<div class="catelog">IDENTIFIED ISSUES</div>'));
     if (questions && questions.length > 0) {
-        for (var i = 0; i < questions.length; i++) {
-            var q = questions[i];
-            var div_question = $('<div class="question"></div>');
-            content.append(div_question);
-            div_question.append($('<div style="width:320px;flex-grow:1;"></div>').text(q.DisplayText))
-            if (q.StaticPictures && q.StaticPictures.length > 0) {
-                var div_pic = $('<div style=""></div>');
-                div_pic = createPictures(q.StaticPictures, div_pic);
-                div_question.append(div_pic)
-            }
-
-            createAnswerContent(content, q);
-        }
+        createQuestionContent1(content, questions);
     }
     else
         content.append($('<div class="question"></div>').text(GetTextByKey("P_IPT_NOQUESTIONS", 'No Questions')));
@@ -138,7 +166,11 @@ function showIdentifiedQuestions(questions) {
     $('#divquestions').append(content);
 }
 
+
 function showSeverityLevel(level) {
+    if (layoutStyle == 1 || layoutStyle == 2)
+        return "";
+
     var levertext = GetTextByKey("P_IPT_SEVERITYLEVEL_COLON", "Severity Level: ");
     if (level === 0)
         levertext = "";
@@ -166,32 +198,185 @@ function showPages(report) {
 
 function showSignature(report) {
     if (report && report.SignatureUrl && report.SignatureUrl != "") {
-        $('#divsign').append($('<div style="border-bottom:1px solid #dbdbdb;"></div>'));
-        $('#divsign').append($('<div class="catelog" style="margin-top:20px;">' + GetTextByKey("P_IPT_SIGNATURE", "Signature") + '</div>'));
+        var divsign = $('#divsign');
+        divsign.append($('<div class="catelog" style="margin-top:20px;">' + GetTextByKey("P_IPT_SIGNATURE", "Signature") + '</div>'));
+        var div_pic = $('<div></div>');
+        divsign.append(div_pic);
         var pic = $('<img style="height:320px; margin-left:70px;margin-right:10px;margin-bottom:10px;"></img>').attr('src', report.SignatureUrl);
-        $('#divsign').append(pic);
+
+        div_pic.append(pic);
+        if (layoutDivider == 1)//Line
+            div_pic.addClass('question_line');
+        else if (layoutDivider == 2)//Grid
+            div_pic.addClass('question_div_grid');
+
+        if (layoutSpacing == 1)//Double Space
+            div_pic.css('line-height', '30px');
     }
 }
 
+function showMedias() {
+    var content = $('<div></div>');
+    content.append($('<div class="catelog">Required	Images</div>'));
+    if (layoutStyle == 1) {//Compressed
+        var div_question = $('<table style="width:100%;" class="question_table"></table>');
+        content.append(div_question);
+        var tr_question = "";
+        for (var i = 0; i < mediasdata.length; i++) {
+            var m = mediasdata[i];
+            if (i % 3 == 0) {
+                tr_question = $('<tr style="width:100%;"></tr>');
+                div_question.append(tr_question);
+            }
+
+            var td_pic = $('<td style="width:33%;"></td>');
+            tr_question.append(td_pic);
+            var piccontent = createMedias(m);
+            td_pic.append(piccontent);
+        }
+
+        var m_count = mediasdata.length % 3;
+        if (m_count != 0) {
+            for (var i = 0; i < 3 - m_count; i++) {
+                tr_question.append($('<td style="width:33%;"></td>'));
+            }
+        }
+
+        if (layoutDivider == 1)//Line
+            div_question.addClass('question_line');
+        else if (layoutDivider == 2)//Grid
+            div_question.addClass('question_table_grid');
+
+        if (layoutSpacing == 1)//Double Space
+            div_question.css('line-height', '30px');
+    }
+    else if (layoutStyle == 2) {//Split
+        var div_question = $('<table style="width:100%;" class="question_table"></table>');
+        content.append(div_question);
+        var tr_question = "";
+        for (var i = 0; i < mediasdata.length; i++) {
+            var m = mediasdata[i];
+            if (i % 4 == 0) {
+                tr_question = $('<tr style="width:100%;"></tr>');
+                div_question.append(tr_question);
+            }
+
+            var td_pic = $('<td style="width:25%;"></td>');
+            tr_question.append(td_pic);
+            var piccontent = createMedias(m);
+            td_pic.append(piccontent);
+        }
+
+        var m_count = mediasdata.length % 4;
+        if (m_count != 0) {
+            for (var i = 0; i < 4 - m_count; i++) {
+                tr_question.append($('<td style="width:25%;"></td>'));
+            }
+        }
+
+        if (layoutDivider == 1)//Line
+            div_question.addClass('question_line');
+        else if (layoutDivider == 2)//Grid
+            div_question.addClass('question_table_grid');
+
+        if (layoutSpacing == 1)//Double Space
+            div_question.css('line-height', '30px');
+    }
+    else {
+        var div_question = $('<table style="width:100%;" class="question_table"></table>');
+        content.append(div_question);
+        for (var i = 0; i < mediasdata.length; i++) {
+            var m = mediasdata[i];
+            var tr_question = $('<tr style="width:100%;"></tr>');
+            div_question.append(tr_question);
+
+            var td_pic = $('<td style="width:100%;"></td>');
+            tr_question.append(td_pic);
+            var piccontent = createMedias(m);
+            td_pic.append(piccontent);
+        }
+
+        if (layoutDivider == 1)//Line
+            div_question.addClass('question_line');
+        else if (layoutDivider == 2)//Grid
+            div_question.addClass('question_table_grid');
+
+        if (layoutSpacing == 1)//Double Space
+            div_question.css('line-height', '30px');
+    }
+
+    $('#divpages').append(content);
+}
+
+function createMedias(m) {
+    var piccontent = $('<div style="float:left;"></div>');
+    if (['.mp4', '.mov'].indexOf(m.FileType.toLowerCase()) >= 0) {
+        var v = $('<div class="media"><span class="video"></span></div>');
+        v.click(m.Url, function (e) {
+            window.open(e.data, "_blank")
+        });
+        piccontent.append(v);
+        if (layoutCaptionImages) {
+            var div_caption = $('<div class="mediacaption"></div>').attr('title', m.FileName);
+            piccontent.append(div_caption);
+            var span_caption = $('<span></span>').text(m.FileName);
+            div_caption.append(span_caption);
+        }
+    }
+    else {
+        var pic = $('<img class="media"></img>').attr('src', m.ThumbnailUrl);
+        pic.click(m.Url, function (e) {
+            window.open(e.data, "_blank")
+        });
+        piccontent.append(pic);
+        if (layoutCaptionImages) {
+            var div_caption = $('<div class="mediacaption"></div>').attr('title', m.FileName);;
+            piccontent.append(div_caption);
+            var span_caption = $('<span></span>').text(m.FileName);
+            div_caption.append(span_caption);
+        }
+    }
+    return piccontent;
+}
+
 function createPage(page) {
     var content = $('<div style="padding:0px;"></div>');
-    var divpage = $('<div class="page"></div>');
-    content.append(divpage);
+    if (layoutStyle == 1 || layoutStyle == 2) {
+        var tabpage = $('<table class="question_table"style="width:100%;background-color:#a9a9a9" ></table>');
+        content.append(tabpage);
+        var trpage = $('<tr style="width:100%;text-align:center;" ></tr>');
+        tabpage.append(trpage);
+        var tdpage = $('<td style="width:100%;" ></td>');
+        trpage.append(tdpage);
+        tdpage.append($('<span></span>').text(page.DisplayText));
 
-    var btnpage = $('<em class="spanbtn iconangledown" style="font-size:22px;width:24px;"></em>');
-    btnpage.click(function () {
-        var icon = $(this);
-        if (icon.hasClass('iconangleright')) {
-            icon.removeClass('iconangleright').addClass('iconangledown');
-            icon.parent().next().show();
-        }
-        else {
-            icon.removeClass('iconangledown').addClass('iconangleright');
-            icon.parent().next().hide();
-        }
-    });
-    divpage.append(btnpage);
-    divpage.append($('<span></span>').text(page.DisplayText));
+        if (layoutDivider == 1)//Line
+            tabpage.addClass('question_line');
+        else if (layoutDivider == 2)//Grid
+            tabpage.addClass('question_table_grid');
+
+        if (layoutSpacing == 1)//Double Space
+            tabpage.css('line-height', '30px');
+    }
+    else {
+        var divpage = $('<div class="page"></div>');
+        content.append(divpage);
+
+        var btnpage = $('<em class="spanbtn iconangledown" style="font-size:22px;width:24px;"></em>');
+        btnpage.click(function () {
+            var icon = $(this);
+            if (icon.hasClass('iconangleright')) {
+                icon.removeClass('iconangleright').addClass('iconangledown');
+                icon.parent().next().show();
+            }
+            else {
+                icon.removeClass('iconangledown').addClass('iconangleright');
+                icon.parent().next().hide();
+            }
+        });
+        divpage.append(btnpage);
+        divpage.append($('<span></span>').text(page.DisplayText));
+    }
 
     var sectioncontent = createSectionContent(page);
     content.append(sectioncontent);
@@ -201,78 +386,225 @@ function createPage(page) {
 
 function createSectionContent(page) {
     var content = $('<div style="margin-bottom:30px;"></div>');
-    if (page.Sections && page.Sections.length > 0) {
-        for (var i = 0; i < page.Sections.length; i++) {
-            var s = page.Sections[i];
-            var divsection = $('<div class="section"></div>');
-            content.append(divsection);
+    if (layoutStyle == 1 || layoutStyle == 2) {
+        if (page.Sections && page.Sections.length > 0) {
+            for (var i = 0; i < page.Sections.length; i++) {
+                var s = page.Sections[i];
 
-            var btnsection = $('<em class="spanbtn iconangledown" style="font-size:18px;display:inline-block;"></em>');
-            btnsection.click(function () {
-                var icon = $(this);
-                if (icon.hasClass('iconangleright')) {
-                    icon.removeClass('iconangleright').addClass('iconangledown');
-                    icon.parent().next().show();
-                }
-                else {
-                    icon.removeClass('iconangledown').addClass('iconangleright');
-                    icon.parent().next().hide();
-                }
-            });
-            divsection.append(btnsection);
-            var ispic = false;
-            if (s.StaticPictures && s.StaticPictures.length > 0) {
-                ispic = true;
-                var div_pic = $('<span></span>');
-                createPictures(s.StaticPictures, div_pic);
-                divsection.append(div_pic);
-                divsection.append('<br/>');
+                var tabsection = $('<table class="question_table"style="width:100%;background-color:#cbcbcb;" ></table>');
+                content.append(tabsection);
+                var trsection = $('<tr style="width:100%;text-align:center;" ></tr>');
+                tabsection.append(trsection);
+                var tdsection = $('<td style="width:100%;" ></td>');
+                trsection.append(tdsection);
+                tdsection.append($('<span></span>').text(s.DisplayText));
+
+                if (layoutDivider == 1)//Line
+                    tabsection.addClass('question_line');
+                else if (layoutDivider == 2)//Grid
+                    tabsection.addClass('question_table_grid');
+
+                if (layoutSpacing == 1)//Double Space
+                    tabsection.css('line-height', '30px');
+
+                var qc = createQuestionContent(s);
+                content.append(qc);
             }
-            var span_title = $('<span></span>').text(s.DisplayText);
-            if (ispic)
-                span_title.css('margin-left', 24);
-            divsection.append(span_title);
-
-            var qc = createQuestionContent(s, i);
-            content.append(qc);
         }
     }
-    else
-        content.append($('<div class="question"></div>').text('No Sections'));
+    else {
+        if (page.Sections && page.Sections.length > 0) {
+            for (var i = 0; i < page.Sections.length; i++) {
+                var s = page.Sections[i];
+                var divsection = $('<div class="section"></div>');
+                content.append(divsection);
+
+                var btnsection = $('<em class="spanbtn iconangledown" style="font-size:18px;display:inline-block;"></em>');
+                btnsection.click(function () {
+                    var icon = $(this);
+                    if (icon.hasClass('iconangleright')) {
+                        icon.removeClass('iconangleright').addClass('iconangledown');
+                        icon.parent().next().show();
+                    }
+                    else {
+                        icon.removeClass('iconangledown').addClass('iconangleright');
+                        icon.parent().next().hide();
+                    }
+                });
+                divsection.append(btnsection);
+                var ispic = false;
+                if (s.StaticPictures && s.StaticPictures.length > 0) {
+                    ispic = true;
+                    var div_pic = $('<span></span>');
+                    createPictures(s.StaticPictures, div_pic);
+                    divsection.append(div_pic);
+                    divsection.append('<br/>');
+                }
+                var span_title = $('<span></span>').text(s.DisplayText);
+                if (ispic)
+                    span_title.css('margin-left', 24);
+                divsection.append(span_title);
+
+                var qc = createQuestionContent(s);
+
+                content.append(qc);
+            }
+        }
+        else
+            content.append($('<div class="question"></div>').text('No Sections'));
+    }
     return content;
 }
 
 function createQuestionContent(section) {
     var content = $('<div style="margin-bottom:30px;"></div>');
     if (section.Questions && section.Questions.length > 0) {
-        for (var i = 0; i < section.Questions.length; i++) {
-            var q = section.Questions[i];
-            var div_question = $('<div class="question"></div>');
-            content.append(div_question);
-
-            var div_title = $('<div style="width:320px;flex-grow:1;"></div>').text(q.DisplayText);
-            div_question.append(div_title);
-            if (q.StaticPictures && q.StaticPictures.length > 0) {
-                var div_pic = $('<div style=""></div>');
-                div_pic = createPictures(q.StaticPictures, div_pic);
-                div_question.append(div_pic)
-            }
-
-            createAnswerContent(content, q);
-
-            if (i != section.Questions.length - 1)
-                content.append($('<div style="border-bottom:1px solid #dbdbdb;"></div>'));
-        }
+        createQuestionContent1(content, section.Questions);
     }
     else
         content.append($('<div class="question"></div>').text(GetTextByKey("P_IPT_NOQUESTIONS", 'No Questions')));
     return content;
 }
 
+function createQuestionContent1(content, questions) {
+    if (questions && questions.length > 0) {
+        if (layoutStyle == 1) {//Compressed
+            var div_question = $('<table style="width:100%;" class="question_table"></table>');
+            content.append(div_question);
+            for (var i = 0; i < questions.length; i++) {
+                var q = questions[i];
+                var tr_question = $('<tr style="width:100%;"></tr>');
+                div_question.append(tr_question);
+                tr_question.append($('<td style="width:33%;"></td>').text(q.DisplayText));
+                var td_answer = $('<td style="width:33%;"></td>');
+                tr_question.append(td_answer);
+                createAnswerContent(td_answer, q);
+                var td_comment = $('<td style="width:33%;"></td>');
+                tr_question.append(td_comment);
+                var comment = td_answer.data('comment');
+                if (comment && comment != "") {
+                    td_comment.append($('<div class="answer"></div>').html(replaceHtmlText(comment)));
+                }
+
+                if (q.IsImportant && layoutHighlightColor)
+                    tr_question.css('background-color', layoutHighlightColor);
+            }
+
+            if (layoutDivider == 1)//Line
+                div_question.addClass('question_line');
+            else if (layoutDivider == 2)//Grid
+                div_question.addClass('question_table_grid');
+
+            if (layoutSpacing == 1)//Double Space
+                div_question.css('line-height', '30px');
+        }
+        else if (layoutStyle == 2) {//Split
+            var div_question = $('<table style="width:100%;" class="question_table"></table>');
+            content.append(div_question);
+            var tr_question = "";
+            for (var i = 0; i < questions.length; i++) {
+                var q = questions[i];
+                if (i % 2 == 0) {
+                    tr_question = $('<tr style="width:100%;"></tr>');
+                    div_question.append(tr_question);
+                }
+                var td_question = $('<td style="width:25%;"></td>').text(q.DisplayText);
+                tr_question.append(td_question);
+                var td_answer = $('<td style="width:25%;"></td>');
+                tr_question.append(td_answer);
+                createAnswerContent(td_answer, q);
+                if (q.IsImportant && layoutHighlightColor) {
+                    td_question.css('background-color', layoutHighlightColor);
+                    td_answer.css('background-color', layoutHighlightColor);
+                }
+            }
+            if (questions.length % 2 != 0) {
+                tr_question.append($('<td style="width:25%;"></td><td style="width:25%;"></td>'));
+            }
+            if (layoutDivider == 1)//Line
+                div_question.addClass('question_line');
+            else if (layoutDivider == 2)//Grid
+                div_question.addClass('question_table_grid');
+
+            if (layoutSpacing == 1)//Double Space
+                div_question.css('line-height', '30px');
+
+        }
+        else {
+            for (var i = 0; i < questions.length; i++) {
+                var q = questions[i];
+                var div_question = $('<div class="question"></div>');
+                content.append(div_question);
+
+                var div_title = $('<div style="width:320px;flex-grow:1;"></div>').text(q.DisplayText);
+                div_question.append(div_title);
+                if (q.StaticPictures && q.StaticPictures.length > 0) {
+                    var div_pic = $('<div style=""></div>');
+                    div_pic = createPictures(q.StaticPictures, div_pic);
+                    div_question.append(div_pic)
+                }
+
+                createAnswerContent(content, q);
+
+                if (layoutDivider == 1)//Line
+                    div_question.addClass('question_line');
+                else if (layoutDivider == 2)//Grid
+                    div_question.addClass('question_div_grid');
+
+                if (layoutSpacing == 1)//Double Space
+                    div_question.css('line-height', '30px');
+
+                if (q.IsImportant && layoutHighlightColor)
+                    div_question.css('background-color', layoutHighlightColor);
+            }
+        }
+
+        content.find('.answer').each(function () {
+            var div_answer = $(this);
+            if (layoutStyle == 1 || layoutStyle == 2) {
+                div_answer.addClass('table_content');
+            }
+            else {
+                var isimportant = div_answer.data('isimportant');
+                if (isimportant && layoutHighlightColor)
+                    div_answer.css('background-color', layoutHighlightColor);
+
+                if (layoutDivider == 1)//Line
+                    div_answer.addClass('question_line');
+                else if (layoutDivider == 2)//Grid
+                    div_answer.addClass('question_div_grid');
+
+                if (layoutSpacing == 1)//Double Space
+                    div_answer.css('line-height', '30px');
+            }
+        });
+        content.find('.div_media').each(function () {
+            var div_media = $(this);
+            if (layoutStyle == 1 || layoutStyle == 2) {
+                div_media.css('padding-left', '3px');
+            }
+            else {
+                var isimportant = div_media.data('isimportant');
+                if (isimportant && layoutHighlightColor)
+                    div_media.css('background-color', layoutHighlightColor);
+
+                if (layoutDivider == 1)//Line
+                    div_media.addClass('question_line');
+                else if (layoutDivider == 2)//Grid
+                    div_media.addClass('question_div_grid');
+
+                if (layoutSpacing == 1)//Double Space
+                    div_media.css('line-height', '30px');
+            }
+        });
+    }
+    return content;
+}
+
 function createPictures(pictures, p) {
     for (var i = 0; i < pictures.length; i++) {
         var pic = pictures[i];
-        var img = $('<img style="width:40px;height:40px;margin-left:5px;"/>').attr('src', pic.Url).attr('title', pic.Name);
+        var img = $('<img style="height:30px;margin-left:5px;"/>').attr('src', pic.Url).attr('title', pic.Name);
         img.click(pic.Url, function (e) {
             window.open(e.data, "_blank")
         });
@@ -288,6 +620,7 @@ function createAnswerContent(p, q) {
         for (var i = 0; i < reportdata.Answers.length; i++) {
             var a = reportdata.Answers[i];
             if (a.QuestionId.toLowerCase() == q.Id.toLowerCase()) {
+                p.data('comment', a.Comment);
                 if ([5, 8, 9, 10, 14, 15, 19].indexOf(q.QuestionType) < 0
                     || (q.QuestionType == 15 && q.SubType != 15)) {//except YesOrNo/DropDown/MultipleChoice/Picture/FuelRecords
                     var result = a.Result;
@@ -302,7 +635,7 @@ function createAnswerContent(p, q) {
                         || (q.QuestionType == 15 && q.SubType == 10))//FuelRecords Quantity
                         result += " " + convertUnits(a.Units);
 
-                    var div_answer = $('<div class="answer"></div>');
+                    var div_answer = $('<div class="answer"></div>').data('isimportant', q.IsImportant);
                     if (q.QuestionType == 1
                         || (q.QuestionType == 15 && q.SubType == 14))
                         p.append(div_answer.html(replaceHtmlText(result))).append("<div style='clear:both;'></div>");
@@ -318,7 +651,7 @@ function createAnswerContent(p, q) {
                 }
                 else if (q.QuestionType == 5) {//YesOrNo
                     if (a.SelectedItems && a.SelectedItems.length > 0) {
-                        var item = $('<div class="answer" ></div>');
+                        var item = $('<div class="answer" ></div>').data('isimportant', q.IsImportant);
                         var div_bg = $('<div class="circle"></div>');
                         var label = $('<label style="margin-left:5px;"></lable>').text(a.SelectedItems[0].Text);
                         item.append(div_bg);
@@ -338,7 +671,7 @@ function createAnswerContent(p, q) {
                     if (q.MultipleSelect) {
                         if (a.SelectedItems && a.SelectedItems.length > 0) {
                             for (var j = 0; j < a.SelectedItems.length; j++) {
-                                var item = $('<div class="answer"></div>');
+                                var item = $('<div class="answer"></div>').data('isimportant', q.IsImportant);
                                 var div_bg = $('<div class="circle"></div>');
                                 var label = $('<label style="margin-left:5px;"></lable>').text("" + (j + 1) + ". " + a.SelectedItems[j].Text);
                                 item.append(div_bg);
@@ -355,7 +688,7 @@ function createAnswerContent(p, q) {
                     }
                     else {
                         if (a.SelectedItems && a.SelectedItems.length > 0) {
-                            var item = $('<div class="answer" ></div>');
+                            var item = $('<div class="answer"></div>').data('isimportant', q.IsImportant);
                             var div_bg = $('<div class="circle"></div>');
                             var label = $('<label style="margin-left:5px;"></lable>').text(a.SelectedItems[0].Text);
                             item.append(div_bg);
@@ -373,7 +706,7 @@ function createAnswerContent(p, q) {
                 else if (q.QuestionType == 14) {//Email (Drop Down)
                     if (a.SelectedItems && a.SelectedItems.length > 0) {
                         for (var j = 0; j < a.SelectedItems.length; j++) {
-                            var item = $('<div class="answer"></div>');
+                            var item = $('<div class="answer"></div>').data('isimportant', q.IsImportant);
                             var label = $('<label style="margin-left:5px;"></lable>').text("" + (j + 1) + ". " + a.SelectedItems[j].Text + "<" + a.SelectedItems[j].Value + ">");
                             item.append(label);
                             item.append(label_level);
@@ -383,33 +716,27 @@ function createAnswerContent(p, q) {
                 }
                 else if (q.QuestionType == 10
                     || (q.QuestionType == 15 && q.SubType == 15)) {//Picture
-                    var pics = $('<div style="min-height:80px;overflow:auto;padding-left:90px;"></div>');
-                    p.append(pics);
+                    if (layoutPicturesDisplay != 1) {//Displayed At Bottom
+                        var pics = $('<div class="div_media" style="min-height:80px;overflow:auto;padding-left:90px;"></div>').data('isimportant', q.IsImportant);
+                        p.append(pics);
+                    }
                     //pics.append(label_level);
                     if (reportdata.Medias && reportdata.Medias.length > 0) {
                         for (var j = 0; j < reportdata.Medias.length; j++) {
                             var m = reportdata.Medias[j];
                             if (m.AnswerId.toLowerCase() == a.Id.toLowerCase()) {
-                                if (['.mp4', '.mov'].indexOf(m.FileType.toLowerCase()) >= 0) {
-                                    var v = $('<div class="media"><span class="video"></span></div>');
-                                    v.click(m.Url, function (e) {
-                                        window.open(e.data, "_blank")
-                                    });
-                                    pics.append(v);
-                                }
-                                else {
-                                    var pic = $('<img class="media"></img>').attr('src', m.ThumbnailUrl);
-                                    pic.click(m.Url, function (e) {
-                                        window.open(e.data, "_blank")
-                                    });
-                                    pics.append(pic);
+                                if (layoutPicturesDisplay == 1)//Displayed At Bottom
+                                    mediasdata.push(m);
+                                else {//Displayed As Taken
+                                    var media = createMedias(m);
+                                    pics.append(media);
                                 }
                             }
                         }
                     }
                 }
                 else if (q.QuestionType == 19) {//Asset Status
-                    var divanswer = $('<div class="answer" ></div>');
+                    var divanswer = $('<div class="answer" ></div>').data('isimportant', q.IsImportant);
                     if (a.SelectedItems && a.SelectedItems.length > 0) {
                         var div_bg = $('<div class="circle"></div>');
                         var label = $('<label style="margin-left:5px;"></lable>').text(a.SelectedItems[0].Text);
@@ -422,36 +749,29 @@ function createAnswerContent(p, q) {
 
                     }
                     divanswer.append(label_level);
-
-                    var pics = $('<div style="min-height:80px;overflow:auto;padding-left:90px;"></div>');
-                    p.append(pics);
+                    if (layoutPicturesDisplay != 1) {//Displayed At Bottom
+                        var pics = $('<div class="div_media" style="min-height:80px;overflow:auto;padding-left:90px;"></div>').data('isimportant', q.IsImportant);
+                        p.append(pics);
+                    }
                     if (reportdata.Medias && reportdata.Medias.length > 0) {
                         for (var j = 0; j < reportdata.Medias.length; j++) {
                             var m = reportdata.Medias[j];
                             if (m.AnswerId.toLowerCase() == a.Id.toLowerCase()) {
-                                if (['.mp4', '.mov'].indexOf(m.FileType.toLowerCase()) >= 0) {
-                                    var v = $('<div class="media"><span class="video"></span></div>');
-                                    v.click(m.Url, function (e) {
-                                        window.open(e.data, "_blank")
-                                    });
-                                    pics.append(v);
-                                }
-                                else {
-                                    var pic = $('<img class="media"></img>').attr('src', m.ThumbnailUrl);
-                                    pic.click(m.Url, function (e) {
-                                        window.open(e.data, "_blank")
-                                    });
-                                    pics.append(pic);
+                                if (layoutPicturesDisplay == 1)//Displayed At Bottom
+                                    mediasdata.push(m);
+                                else {//Displayed As Taken
+                                    var media = createMedias(m);
+                                    pics.append(media);
                                 }
                             }
                         }
                     }
                     if (a.Result && a.Result != "") {
-                        p.append($('<div class="answer" style="color:#808080"></div>').html(replaceHtmlText(a.Result)));
+                        p.append($('<div class="answer" style="color:#808080"></div>').data('isimportant', q.IsImportant).html(replaceHtmlText(a.Result)));
                     }
                 }
-                if (a.Comment && a.Comment != "") {
-                    p.append($('<div class="answer" style="color:#808080"></div>').html(replaceHtmlText(a.Comment)));
+                if (layoutStyle != 1 && layoutStyle != 2 && a.Comment && a.Comment != "") {
+                    p.append($('<div class="answer" style="color:#808080"></div>').data('isimportant', q.IsImportant).html(replaceHtmlText(a.Comment)));
                 }
                 return;
             }

Site/IronIntelMasterPage.master

@@ -570,7 +570,7 @@
                 $('#mask_bg').hide();
             });
             $('#dialog_dashboards').dialog(function () {
-                $('#mask_bg').hide();
+                showmaskbg(false);
             });
             $('#dialog_chartnotes').dialog(function () {
                 $('#mask_bgcn').hide();
@@ -1160,7 +1160,7 @@
             </div>
         </div>
         <div class="dialog-func">
-            <input type="button" value="Cancel" data-lgid="P_MV_CANCEL" class="dialog-close" tabindex="12" />
+            <input type="button" value="Cancel" data-lgid="P_MV_CANCEL" class="dialog-close" tabindex="12" style="height:unset;" />
             <input type="button" value="OK" data-lgid="P_CP_OK" onclick="openDashboard();" tabindex="11" />
             <div class="clear"></div>
         </div>

Site/JobSite/AddJobSite.aspx

@@ -580,10 +580,13 @@
             if (!sel || sel == "")
                 exists = true;
 
+            showloading(true);
+
             var selector = $('#dialog_region');
             var selCurrent = selector.val();
             selector.empty();
             _network.jobsitequery('GetRegions', '', function (data) {
+                showloading(false);
                 if (typeof (data) === "string") {
                     showAlert(data, GetTextByKey("P_AM_ERROR", 'Error'));
                     return;
@@ -606,6 +609,8 @@
                     selector.val(sel);
                 else if (selCurrent)
                     selector.val(selCurrent);
+            }, function () {
+                showloading(false);
             });
         }
 
@@ -1730,6 +1735,7 @@
 
             var dialogAssets = new $assetselector('dialog_machines');
             dialogAssets.jobsiteId = jobsiteid;
+            dialogAssets.allowotherfilter = false;
             dialogAssets.onDialogClosed = function () {
                 $('#dialogmask').hide();
                 $('#dialog_machines').remove();
@@ -1761,7 +1767,7 @@
         function OnMachineDeleteSingle(item) {
             $("#dialogmask").show();
             var alerttitle = GetTextByKey("P_JS_ASSETASSIGNMENT", "Asset Assignment");
-            showConfirm(GetTextByKey("P_JS_DELETEASSIGNEDASSET", 'Are you sure you want to delete the assigned asset:{0}?').replace('{0}', item.Name), alerttitle, function () {
+            showConfirm1(GetTextByKey("P_JS_DELETEASSIGNEDASSET", 'Are you sure you want to delete the assigned asset:{0}?').replace('{0}', item.Name), alerttitle, function () {
                 var params = [
                     '', jobsiteid,
                     JSON.stringify([item.AssetId])
@@ -1794,7 +1800,9 @@
 
         function OnSiteChanging(item, input) {
             var input_chk = $(input).closest('td').find('input');
-            var checked = $(input_chk).prop('checked');
+            var checked = !$(input_chk).prop('checked');
+            if (navigator.userAgent.toUpperCase().indexOf("FIREFOX") >= 0)
+                checked = !checked;
             var text = GetTextByKey("P_JS_ONSITETIPS", "You have manually assigned a jobsite. This action will disable geofence alerts and jobsite auto-assignment. Do you want to proceed? ");
             if (!checked)
                 text = GetTextByKey("P_JS_ONSITETIPS1", "Are you sure you want to change the on-site of the asset:{0}?").replace('{0}', item.Name);
@@ -1830,7 +1838,7 @@
                 return;
             }
 
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#machine-name').text(jobsiteitem.Name);
             _selectedMachines = jobsiteitem.Machines == null ? [] : jobsiteitem.Machines;
             _showSelectedMachines = jobsiteitem.Machines == null ? [] : jobsiteitem.Machines;
@@ -1843,7 +1851,7 @@
                 .css({
                     'top': (document.documentElement.clientHeight - $('#dialog_managemahchine').height()) / 3,
                     'left': (document.documentElement.clientWidth - $('#dialog_managemahchine').width()) / 2
-                }).showDialog();
+                }).showDialogfixed();
 
             grid_dtsm.setData([]);
             $('#selectedmachinelist input[type="checkbox"]').prop('checked', false);

Site/JobSite/AddRequirements.aspx

@@ -327,24 +327,24 @@
         };
 
         function showRequirementConfirm(msg, title, fprint, femai, fsave, fclose) {
-            $("#mask_bg").show();
+            showmaskbg(true);
             _dialog.showRequirementConfirm(msg, title, function (e) {
-                $("#mask_bg").hide();
+                showmaskbg(false);
                 if (typeof fprint === 'function') {
                     fprint(e);
                 }
             }, function (e) {
-                $("#mask_bg").hide();
+                showmaskbg(false);
                 if (typeof femai === 'function') {
                     femai(e);
                 }
             }, function (e) {
-                $("#mask_bg").hide();
+                showmaskbg(false);
                 if (typeof fsave === 'function') {
                     fsave(e);
                 }
             }, function (e) {
-                $("#mask_bg").hide();
+                showmaskbg(false);
                 if (typeof fclose === 'function') {
                     fclose(e);
                 }
@@ -686,12 +686,12 @@
             })
 
             $('#dialog_sendmail').dialog(function () {
-                $('#mask_bg').hide();
+                showmaskbg(false);
                 OnExit();
             });
 
             $('#dialog_assignment').dialog(function () {
-                $('#mask_bg').hide();
+                showmaskbg(false);
             });
 
             $('#sendmail_othertextaddress').focus(function (e) {

Site/JobSite/AddScheduler.aspx

@@ -249,7 +249,7 @@
         var alljobsites;
         var addrequirement = true;
         var _sendType = 0;
-        var currentdate = "<%=CurrentDate %>";   
+        var currentdate = "<%=CurrentDate %>";
 
 
         jobsitequery = function (method, param, callback, error, nolog) {
@@ -269,19 +269,19 @@
         };
 
         function showAssetConfirm(msg, title, fcancel, fedit, fclose) {
-            $("#mask_bg").show();
+            showmaskbg(true);
             _dialog.showAssetConfirm(msg, title, function (e) {
-                $("#mask_bg").hide();
+                showmaskbg(false);
                 if (typeof fedit === 'function') {
                     fedit(e);
                 }
             }, function (e) {
-                $("#mask_bg").hide();
+                showmaskbg(false);
                 if (typeof fcancel === 'function') {
                     fcancel(e);
                 }
             }, function (e) {
-                $("#mask_bg").hide();
+                showmaskbg(false);
                 if (typeof fclose === 'function') {
                     fclose(e);
                 }
@@ -568,7 +568,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="label" data-lgid="P_JS_POINTOFCONTACT">Point Of Contact</td>
+                                <td class="label" data-lgid="P_JS_POINTOFCONTACT_COLON">Point Of Contact</td>
                                 <td>
                                     <input type="text" id="dialog_pointofcontact" maxlength="100" tabindex="1" autocomplete="off" />
                                 </td>

Site/JobSite/DispatchRequests.aspx

@@ -272,7 +272,7 @@
                 reset: GetTextByKey("P_GRID_RESET", "Reset")
             };
             var list_columns = [
-                //{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
+                //{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
                 { name: 'BeginDate', caption: GetTextByKey("P_JS_MOVEDATE", "Move Date"), valueIndex: 'BeginDate', css: { 'width': 100, 'text-align': 'left' } },
                 //{ name: 'BeginDate', caption: GetTextByKey("P_JS_BEGINDATE", "Begin Date"), valueIndex: 'BeginDate', css: { 'width': 100, 'text-align': 'left' } },
                 //{ name: 'EndDate', caption: GetTextByKey("P_JS_ENDDATE", "End Date"), valueIndex: 'EndDate', css: { 'width': 100, 'text-align': 'left' } },
@@ -294,7 +294,7 @@
                     // checkbox
                     name: 'check',
                     key: 'Selected',
-                    width: 30,
+                    width: 45,
                     align: 'center',
                     sortable: false,
                     allcheck: true,

Site/JobSite/JobSiteManage.aspx

@@ -453,6 +453,7 @@
 
             var dialogAssets = new $assetselector('dialog_machines');
             dialogAssets.jobsiteId = jobsiteid;
+            dialogAssets.allowotherfilter = false;
             dialogAssets.onDialogClosed = function () {
                 $("#dialogmask").hide();
                 $('#dialog_machines').remove();
@@ -531,7 +532,9 @@
 
         function OnSiteChanging(item, input) {
             var input_chk = $(input).closest('td').find('input');
-            var checked = $(input_chk).prop('checked');
+            var checked = !$(input_chk).prop('checked');
+            if (navigator.userAgent.toUpperCase().indexOf("FIREFOX") >= 0)
+                checked = !checked;
             var text = GetTextByKey("P_JS_ONSITETIPS", "You have manually assigned a jobsite. This action will disable geofence alerts and jobsite auto-assignment. Do you want to proceed? ");
             if (!checked)
                 text = GetTextByKey("P_JS_ONSITETIPS1", "Are you sure you want to change the on-site of the asset:{0}?").replace('{0}', item.Name);

Site/JobSite/JobSiteMasterPage.master

@@ -86,7 +86,6 @@
             function resizeContent() {
                 if ($('.content_main').length > 0)
                     $('.content_main').css('min-height', $(window).height() - $('.content_main').offset().top - 4);
-                $('#mask_bg').height($(document).outerHeight(false)).width($(document).outerWidth(false));
             }
 
             $(window).resize(function () {

Site/JobSite/JobsiteAutoCreateConfig.aspx

@@ -86,7 +86,7 @@
                 }
                 grid_dtassets.setData(grid_dtassets.innerSource.concat(items));
                 doSave(0, itemids);
-                $('#mask_bg').hide();
+                showmaskbg(false);
             };
 
             $('#dialog_assettype').prop('iframe', true).dialog(function () {
@@ -148,7 +148,7 @@
                     // checkbox
                     name: 'check',
                     key: 'selected',
-                    width: 30,
+                    width: 45,
                     align: 'center',
                     sortable: false,
                     allcheck: true,
@@ -225,7 +225,6 @@
                 return s.Values.AssetId;
             });
             dialogAUAssets.showSelector();
-            $('#mask_bg').css('height', '100%');
         }
 
         function OnMachineDelete() {
@@ -270,7 +269,7 @@
                     // checkbox
                     name: 'check',
                     key: 'selected',
-                    width: 30,
+                    width: 45,
                     align: 'center',
                     sortable: false,
                     allcheck: true,
@@ -322,7 +321,7 @@
                     // checkbox
                     name: 'check',
                     key: 'selected',
-                    width: 30,
+                    width: 45,
                     align: 'center',
                     sortable: false,
                     allcheck: true,
@@ -420,7 +419,7 @@
         function OnAssetTypeAdd() {
             $('#txt_assettype_key').val('');
             $('#dialog_assettype .dialog-title span.title').text(GetTextByKey("P_JS_SELECTASSETTYPES", 'Select Asset Types'));
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_assettype')
                 .attr('act', 'edit')
                 .css({
@@ -446,7 +445,6 @@
             doSave(1, itemids);
 
             $('#dialog_assettype').hideDialog();
-            //$('#mask_bg').hide();
         }
 
         function OnAssetTypeDelete() {

Site/JobSite/JobsiteLimitManagement.aspx

@@ -73,18 +73,6 @@
             padding: 0;
         }
 
-        #dialog_machinegroup {
-            z-index: 500;
-            width: 870px;
-            top: 60px;
-            left: 150px;
-        }
-
-        .inputbox {
-            width: 500px;
-            padding: 1px;
-        }
-
         .group_table .main_table {
             table-layout: fixed;
         }
@@ -244,7 +232,7 @@
         }
 
         function ShowDialog(type) {
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_jobsitelimit')
                 .attr('act', type)
                 .showDialogRight1(450);
@@ -488,7 +476,7 @@
             });
 
             $('#dialog_subscribecontacts').dialog(function () {
-                $('#mask_bg').hide();
+                showmaskbg(false);
             });
             $('#btnsubscribefilter').click(getMatchAvailableContacts);
             $('#chk_showallassignedcontacts').click(getMatchSelectedContacts);
@@ -523,12 +511,12 @@
 
             var title = GetTextByKey("P_M3_SUBSCRIBECONTACTS", "Subscribe Contacts");
             $('#dialog_subscribecontacts .dialog-title span.title').html(title);
-            $('#mask_bg').show();
+            showmaskbg(true);
             $('#dialog_subscribecontacts')
                 .css({
                     'top': (document.documentElement.clientHeight - $('#dialog_subscribecontacts').height()) / 5,
                     'left': (document.documentElement.clientWidth - $('#dialog_subscribecontacts').width()) / 2
-                }).showDialog();
+                }).showDialogfixed();
 
             GetSelectedContacts();
         }
@@ -841,9 +829,6 @@
         </div>
 
         <div class="dialog" id="dialog_subscribecontacts" style="display: none;">
-            <div id="subscribedialogmask" class="maskbg" style="display: none; z-index: 1;">
-                <div class="loading_icon icon c-spin"></div>
-            </div>
             <div class="dialog-title"><span class="title" data-lgid="P_M3_SUBSCRIBECONTACTS">Subscribe Contacts</span><em class="dialog-close"></em></div>
 
             <div class="machine_filter">
@@ -886,6 +871,9 @@
                 <input type="button" onclick="OnSaveSubscribeContacts();" value="OK" data-lgid="P_M3_OK" tabindex="46" />
                 <div class="clear"></div>
             </div>
+            <div id="subscribedialogmask" class="maskbg" style="display: none; ">
+                <div class="loading_icon icon c-spin"></div>
+            </div>
         </div>
     </div>
 </asp:Content>

Site/JobSite/js/dispatchassign.js

@@ -41,7 +41,6 @@ function openAssignDispatch(seltype,) {
     editableSelectAssignAsset.val('');
     showmaskbg(true);
     $('#dialog_assignment .dialog-title span.title').text(GetTextByKey('P_JS_DISPATCHASSIGNMENT', 'Dispatch Assignment'));
-    //$('#mask_bg').show();
     $('#dialog_assignment')
         .attr('act', 'edit')
         .css({

Site/JobSite/js/email.js

@@ -34,7 +34,7 @@ function InitEmailGridData() {
         { name: 'DisplayName', caption: GetTextByKey("P_MV_CONTACTNAME", "Contact Name"), valueIndex: 'DisplayName', css: { 'width': 148, 'text-align': 'left' } },
         { name: 'ContactTypeName', caption: GetTextByKey("P_MV_CONTACTTYPE", "Contact Type"), valueIndex: 'ContactTypeName', css: { 'width': 148, 'text-align': 'left' } },
         //{ name: 'Text', caption: GetTextByKey("P_MV_TEXT", "Text"), valueIndex: 'Text', type: 3, css: { 'width': 45, 'text-align': 'center' } },
-        { name: 'Email', caption: GetTextByKey("P_MV_EMAIL", "Email"), valueIndex: 'Email', type: 3, css: { 'width': 45, 'text-align': 'center' } }
+        { name: 'Email', caption: GetTextByKey("P_MV_EMAIL", "Email"), valueIndex: 'Email', type: 3, css: { 'width': 60, 'text-align': 'center' } }
     ];
     var columns = [];
     // head
@@ -189,7 +189,7 @@ function onSendEmails() {
 
     if (emailaddress.length == 0 && textaddress.length == 0) {
         $('#dialog_sendmail').hideDialog();
-        $('#mask_bg').hide();
+        showmaskbg(false);
         return;
     }
     var item = {
@@ -204,7 +204,7 @@ function onSendEmails() {
     jobsitequery('SendEmails', htmlencode(JSON.stringify(item)), function (data) {
         if (_sendType == 0) {
             $('#dialog_sendmail').hideDialog();
-            $('#mask_bg').hide();
+            showmaskbg(false);
             OnExit(data);
         }
         else {
@@ -214,7 +214,7 @@ function onSendEmails() {
                 showAlert(GetTextByKey("P_WO_MESSAGESENT", 'Message sent'), alerttitle);
 
             $('#dialog_sendmail').hideDialog();
-            $('#mask_bg').hide();
+            showmaskbg(false);
         }
 
         if (aftersend)

Site/JobSite/js/jobsiterequirement.js

@@ -416,7 +416,7 @@ function InitAssetGridData() {
         reset: GetTextByKey("P_GRID_RESET", "Reset")
     };
     var list_columns = [
-        { name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, allcheck: true, css: { 'width': 30, 'text-align': 'center' } },
+        { name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, allcheck: true, css: { 'width': 45, 'text-align': 'center' } },
         { name: 'MakeName', caption: GetTextByKey("P_PM_MAKE", "Make"), valueIndex: 'MakeName', css: { 'width': 100, 'text-align': 'left' } },
         { name: 'ModelName', caption: GetTextByKey("P_PM_MODEL", "Model"), valueIndex: 'ModelName', css: { 'width': 100, 'text-align': 'left' } },
         { name: 'AssetName', caption: GetTextByKey("P_JS_ASSETNAME", "Asset Name"), valueIndex: 'AssetName', css: { 'width': 150, 'text-align': 'left' } },
@@ -598,7 +598,7 @@ function InitAllAssetGridData() {
         reset: GetTextByKey("P_GRID_RESET", "Reset")
     };
     var list_columns = [
-        { name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
+        { name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
         { name: 'MakeName', caption: GetTextByKey("P_PM_MAKE", "Make"), valueIndex: 'MakeName', css: { 'width': 100, 'text-align': 'left' } },
         { name: 'ModelName', caption: GetTextByKey("P_PM_MODEL", "Model"), valueIndex: 'ModelName', css: { 'width': 100, 'text-align': 'left' } },
         { name: 'AssetName', caption: GetTextByKey("P_JS_ASSETNAME", "Asset Name"), valueIndex: 'AssetName', css: { 'width': 150, 'text-align': 'left' } },
@@ -874,7 +874,7 @@ function OnSetMachine() {
     currentRequirement.Assets = assets;
     currentRequirement.ScheduledQuantity = assets.length;
     $('#dialog_managemahchine').hide();
-    $("#mask_bg").hide();
+    showmaskbg(false);
 }
 
 function checkQuantity() {

Site/JobSite/js/scheduler.js

@@ -490,7 +490,7 @@ function checkSchedulerItems(alerttitle) {
 function onUpdateScheduler() {
     if (jobsiteschedulerCtrl.vue.source.length == 0) {
         $('#dialog_managescheduler').hide();
-        $('#mask_bg').hide();
+        showmaskbg(false);
         OnRefresh();
         return;
     }

Site/Languages/en-au/textres.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<root lgid="en-us" ver="2021-03-18 11:06">
+<root lgid="en-us" ver="2023-05-19 09:13">
   <CLEAR_LOCAL_STORAGE>Clear Local Storage</CLEAR_LOCAL_STORAGE>
   <CONFIRM_LOCAL_STORAGE>Are you sure to clear the local storage?</CONFIRM_LOCAL_STORAGE>
   <ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>Please check whether the user ID already exists in another FI product.</ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>
@@ -455,6 +455,8 @@
   <FI_FRS_BCL097>YTD Static</FI_FRS_BCL097>
   <FI_FRS_BCL098>R12 Static</FI_FRS_BCL098>
   <FI_FRS_BCL099>Set Value</FI_FRS_BCL099>
+  <FI_FRS_BCL100>Set Department And Location Region Percentages </FI_FRS_BCL100>
+  <FI_FRS_BCL101>The department/region allocation percentage is not set.</FI_FRS_BCL101>
   <FI_FRS_BGT001>The Budget Name or Ledger ID already exists.</FI_FRS_BGT001>
   <FI_FRS_BGT002>This Budget Version already exists.</FI_FRS_BGT002>
   <FI_FRS_BGT003>This data source is in use and cannot be deleted.</FI_FRS_BGT003>
@@ -674,6 +676,8 @@
   <FI_FRS_C0054>Connector Settings</FI_FRS_C0054>
   <FI_FRS_C0055>Connection</FI_FRS_C0055>
   <FI_FRS_C0056>Use Excel Connector</FI_FRS_C0056>
+  <FI_FRS_C0057>Export Budget Package</FI_FRS_C0057>
+  <FI_FRS_C0058>Import Budget Package</FI_FRS_C0058>
   <FI_FRS_CC001>Manage Constants</FI_FRS_CC001>
   <FI_FRS_CC002>Name</FI_FRS_CC002>
   <FI_FRS_CC003>Description</FI_FRS_CC003>
@@ -803,6 +807,10 @@
   <FI_FRS_IMPKG024>Lock password:</FI_FRS_IMPKG024>
   <FI_FRS_IMPKG025>Confirm lock password:</FI_FRS_IMPKG025>
   <FI_FRS_IMPKG026>Passwords do not match.</FI_FRS_IMPKG026>
+  <FI_FRS_IMPKG027>Available Budgets</FI_FRS_IMPKG027>
+  <FI_FRS_IMPKG028>Please select budgets to export.</FI_FRS_IMPKG028>
+  <FI_FRS_IMPKG029>Replace the budget.</FI_FRS_IMPKG029>
+  <FI_FRS_IMPKG030>Options for locking budgets</FI_FRS_IMPKG030>
   <FI_FRS_LD001>Default Row Level Definitions</FI_FRS_LD001>
   <FI_FRS_LD002>Level Description</FI_FRS_LD002>
   <FI_FRS_LD003>Level</FI_FRS_LD003>
@@ -918,6 +926,7 @@
   <FI_FRS_MPG035>New Budget</FI_FRS_MPG035>
   <FI_FRS_MPG036>Dashboard</FI_FRS_MPG036>
   <FI_FRS_MPG037>FI Common</FI_FRS_MPG037>
+  <FI_FRS_MPG038>Enter Region Data</FI_FRS_MPG038>
   <FI_FRS_PG0001>Login failed. Please retry.</FI_FRS_PG0001>
   <FI_FRS_PG0002>Please Login</FI_FRS_PG0002>
   <FI_FRS_PG0003>User ID:</FI_FRS_PG0003>
@@ -1300,6 +1309,7 @@
   <FI_HOST_EXT_A011>Import Application File</FI_HOST_EXT_A011>
   <FI_HOST_MANAGEMENT_USER_A002>Save Permissions</FI_HOST_MANAGEMENT_USER_A002>
   <FI_HOST_MANAGEMENT_USER_A005>Define Style</FI_HOST_MANAGEMENT_USER_A005>
+  <FI_HOST_MANAGEMENT_USER_A006>Email Verification</FI_HOST_MANAGEMENT_USER_A006>
   <FI_HOST_MANAGEMENT_USER_A008>Saved permissions successfully.</FI_HOST_MANAGEMENT_USER_A008>
   <FI_HOST_MANAGEMENT_USER_A009>Failed to save the user operation.</FI_HOST_MANAGEMENT_USER_A009>
   <FI_HOST_MANAGEMENT_USER_A043>User Management</FI_HOST_MANAGEMENT_USER_A043>
@@ -1312,6 +1322,7 @@
   <FI_HOST_MANAGEMENT_USER_A113>One or more user(s) will be deleted from FRS, Do you want to continue?</FI_HOST_MANAGEMENT_USER_A113>
   <FI_HOST_MANAGEMENT_USER_A114>Maintenance of Application Plug In</FI_HOST_MANAGEMENT_USER_A114>
   <FI_HOST_MANAGEMENT_USER_A115>Use of Application Plug In</FI_HOST_MANAGEMENT_USER_A115>
+  <FI_HOST_MANAGEMENT_USER_A116>Copy User</FI_HOST_MANAGEMENT_USER_A116>
   <FICTIP>Foresight Intelligence Center: Full Version</FICTIP>
   <FULL_SCREEN>Full Screen</FULL_SCREEN>
   <G5_FORGOTPWD>Forgot your password? Click &lt;a href="{0}"&gt;here&lt;/a&gt; to send a reminder email.</G5_FORGOTPWD>
@@ -1543,7 +1554,7 @@
   <LHBIS_EXCEPTION_E0X6502701B>An error occurred while searching for users in the system.</LHBIS_EXCEPTION_E0X6502701B>
   <LHBIS_EXCEPTION_E0X6502701C>Failed to get the authenticated user list.</LHBIS_EXCEPTION_E0X6502701C>
   <LHBIS_EXCEPTION_E0X6502701D>Failed to get the users list.</LHBIS_EXCEPTION_E0X6502701D>
-  <LHBIS_EXCEPTION_E0X6502701E>The user ID has been used by another user.</LHBIS_EXCEPTION_E0X6502701E>
+  <LHBIS_EXCEPTION_E0X6502701E>The user ID or email address has been used by another user.</LHBIS_EXCEPTION_E0X6502701E>
   <LHBIS_EXCEPTION_E0X6502701F>Failed to add the user.</LHBIS_EXCEPTION_E0X6502701F>
   <LHBIS_EXCEPTION_E0X65027020>Failed to save the user.</LHBIS_EXCEPTION_E0X65027020>
   <LHBIS_EXCEPTION_E0X65027021>Failed to delete the user.</LHBIS_EXCEPTION_E0X65027021>
@@ -2077,6 +2088,8 @@
   <LHBIS_FIC_CLIENT_FICCONTROLS_CHARTINFORMATIONCTRL_A012>The Refresh Time(s)'s value must be between 30 and 100,000 seconds.</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTINFORMATIONCTRL_A012>
   <LHBIS_FIC_CLIENT_FICCONTROLS_CHARTINFORMATIONCTRL_A013>Display Create Time</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTINFORMATIONCTRL_A013>
   <LHBIS_FIC_CLIENT_FICCONTROLS_CHARTNOTECTRL_A001>Chart Notes:</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTNOTECTRL_A001>
+  <LHBIS_FIC_CLIENT_FICCONTROLS_CHARTNOTECTRL_A002>Internal Chart Notes:</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTNOTECTRL_A002>
+  <LHBIS_FIC_CLIENT_FICCONTROLS_CHARTNOTECTRL_A003>Internal Chart Notes</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTNOTECTRL_A003>
   <LHBIS_FIC_CLIENT_FICCONTROLS_CHARTSELECTCTRL_A001>Type</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTSELECTCTRL_A001>
   <LHBIS_FIC_CLIENT_FICCONTROLS_CHARTSELECTCTRL_A002>Group</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTSELECTCTRL_A002>
   <LHBIS_FIC_CLIENT_FICCONTROLS_CHARTSELECTCTRL_A003>Level</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTSELECTCTRL_A003>
@@ -2457,6 +2470,10 @@
   <LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A118>My Database Detail</LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A118>
   <LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A119>Tables</LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A119>
   <LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A120>Views</LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A120>
+  <LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A121>Data Table Cache</LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A121>
+  <LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A122>Data replication</LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A122>
+  <LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A123>SQL Queries</LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A123>
+  <LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A124>Schedules</LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A124>
   <LHBIS_FIC_CLIENT_MODULES_A001>User Management</LHBIS_FIC_CLIENT_MODULES_A001>
   <LHBIS_FIC_CLIENT_MODULES_A002>Add User</LHBIS_FIC_CLIENT_MODULES_A002>
   <LHBIS_FIC_CLIENT_MODULES_A003>Import User</LHBIS_FIC_CLIENT_MODULES_A003>
@@ -3012,6 +3029,17 @@
   <LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A140>Please input the excel file name.</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A140>
   <LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A141>Execution Timeout Expired. Would you like to retry it?</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A141>
   <LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A142>File extension required.</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A142>
+  <LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A143>Please enter a Cache Data Table Name.</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A143>
+  <LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A144>Index Name</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A144>
+  <LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A145>Fields</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A145>
+  <LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A146>Use Local Cache:</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A146>
+  <LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A147>Cache Data Table Name:</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A147>
+  <LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A148>Indexes</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A148>
+  <LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A149>Index names cannot be duplicate.</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A149>
+  <LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A150>Data Table Cache</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A150>
+  <LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A151>The Cache Data Table name {0} already exists.</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A151>
+  <LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A152>Cache Name</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A152>
+  <LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A153>Please name the filter.</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A153>
   <LHBIS_FIC_CLIENT_MODULES_DRILLDOWNURLPROVIDER_A001>Add</LHBIS_FIC_CLIENT_MODULES_DRILLDOWNURLPROVIDER_A001>
   <LHBIS_FIC_CLIENT_MODULES_DRILLDOWNURLPROVIDER_A002>Delete</LHBIS_FIC_CLIENT_MODULES_DRILLDOWNURLPROVIDER_A002>
   <LHBIS_FIC_CLIENT_MODULES_DRILLDOWNURLPROVIDER_A003>Refresh</LHBIS_FIC_CLIENT_MODULES_DRILLDOWNURLPROVIDER_A003>
@@ -3253,6 +3281,8 @@
   <LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A016>Saturday</LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A016>
   <LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A017>Sunday</LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A017>
   <LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A018>End of Month</LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A018>
+  <LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A019>Annually</LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A019>
+  <LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A020>Month</LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A020>
   <LHBIS_FIC_CLIENT_MODULES_JOBDETAILMODULE_A001>Job Detail</LHBIS_FIC_CLIENT_MODULES_JOBDETAILMODULE_A001>
   <LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A001>Job List</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A001>
   <LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A002>Add</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A002>
@@ -3266,6 +3296,9 @@
   <LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A010>Execute failed.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A010>
   <LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A011>Save</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A011>
   <LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A012>Jobs executed successfully.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A012>
+  <LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A013>Execute</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A013>
+  <LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A014>Are you sure want to execute the sql queries?</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A014>
+  <LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A015>Sql Query executed successfully.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A015>
   <LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_EXCEPTION_A001>An error occurred while getting the Job Schedule list.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_EXCEPTION_A001>
   <LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_EXCEPTION_A002>An error occurred while getting the Job Schedule information.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_EXCEPTION_A002>
   <LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_EXCEPTION_A003>An error occurred while modifying the Job Schedule information.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_EXCEPTION_A003>
@@ -3282,6 +3315,24 @@
   <LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_NOTICE_A007>The daily frequency's "ending time" value is invalid. This can be left empty.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_NOTICE_A007>
   <LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_NOTICE_A008>The Job Name cannot be empty.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_NOTICE_A008>
   <LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_NOTICE_A009>Monthly Everyday Count is out of range. (1-31)</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_NOTICE_A009>
+  <LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A001>&lt;!DOCTYPE html&gt;&lt;html&gt;&lt;head&gt;&lt;meta content=""text/html; charset=UTF-8"" http-equiv=""content-type""&gt;
+&lt;style type=""text/css""&gt;p{{font-family:Calibri,Tahoma,Verdana;color:black;}}&lt;/style&gt;&lt;/head&gt;
+&lt;body&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;p&gt;An account has been established for you by {0}.  Your password is &lt;b&gt;{1}&lt;/b&gt;&lt;/p&gt;
+&lt;p&gt;This password is a temporary password, please log on &lt;a href='{2}'&gt;Here&lt;/a&gt;&amp;nbsp;to change your password.  If you have any questions, please contact us.&lt;/p&gt;
+&lt;p&gt;Regards,&lt;br /&gt;
+{0}&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A001>
+  <LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A002>&lt;!DOCTYPE html&gt;&lt;html&gt;&lt;head&gt;&lt;meta content=""text/html; charset=UTF-8"" http-equiv=""content-type""&gt;
+&lt;style type=""text/css""&gt;p{{font-family:Calibri,Tahoma,Verdana;color:black;}}&lt;/style&gt;&lt;/head&gt;
+&lt;body&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;p&gt;An account has been established for you by {0}.  Your ID is &lt;b&gt;{1}&lt;/b&gt;&lt;/p&gt;
+&lt;p&gt;Another email with your temporary password will be sent under separate email.  If you have any questions, please contact us.&lt;/p&gt;
+&lt;p&gt;Regards,&lt;br /&gt;
+{0}&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A002>
+  <LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A003>New Alert:</LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A003>
+  <LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A004>Alert Name: </LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A004>
+  <LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A005>Create Time: </LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A005>
+  <LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A006>Alert Content:</LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A006>
+  <LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A007>{0} User ID</LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A007>
+  <LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A008>{0} Password</LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A008>
   <LHBIS_FIC_CLIENT_MODULES_NAVIGATION_A001>Navigation Definitions</LHBIS_FIC_CLIENT_MODULES_NAVIGATION_A001>
   <LHBIS_FIC_CLIENT_MODULES_NAVIGATION_A002>Navigation Name</LHBIS_FIC_CLIENT_MODULES_NAVIGATION_A002>
   <LHBIS_FIC_CLIENT_MODULES_NAVIGATION_A003>Single window mode</LHBIS_FIC_CLIENT_MODULES_NAVIGATION_A003>
@@ -3345,6 +3396,9 @@
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A016>Schedule</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A016>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>Note: Labels of values where the percentage is less than 1 may not be shown.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>Attachments</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>
+  <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>Resend</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>
+  <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>The execute starting time must be early than the ending time.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>
+  <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>Resend Email Subscription</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>Group:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>Level:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A003>Email:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A003>
@@ -3367,6 +3421,8 @@
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A020>The text message address is invalid.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A020>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A021>Do you still want to save?</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A021>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A022>The email is blank.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A022>
+  <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A023>This user does not have Data Table Access Rights to view this chart. Would you like to continue?</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A023>
+  <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A024>Only send if Chart has data</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A024>
   <LHBIS_FIC_CLIENT_MODULES_RWORKSPACEEDITDIALOG_A001>Workspace Name</LHBIS_FIC_CLIENT_MODULES_RWORKSPACEEDITDIALOG_A001>
   <LHBIS_FIC_CLIENT_MODULES_RWORKSPACEEDITDIALOG_A002>Description</LHBIS_FIC_CLIENT_MODULES_RWORKSPACEEDITDIALOG_A002>
   <LHBIS_FIC_CLIENT_MODULES_RWORKSPACEEDITDIALOG_A003>Group Name</LHBIS_FIC_CLIENT_MODULES_RWORKSPACEEDITDIALOG_A003>
@@ -3663,6 +3719,7 @@
   <LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A073>Tonne</LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A073>
   <LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A074>Pound</LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A074>
   <LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A075>Ton (U.S.)</LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A075>
+  <LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A076>Always prompt</LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A076>
   <LHBIS_FIC_CLIENT_MODULES_TASKLOG_A001>Task schedule logs</LHBIS_FIC_CLIENT_MODULES_TASKLOG_A001>
   <LHBIS_FIC_CLIENT_MODULES_TASKLOG_A002>Delete</LHBIS_FIC_CLIENT_MODULES_TASKLOG_A002>
   <LHBIS_FIC_CLIENT_MODULES_TASKLOG_A003>Delete All</LHBIS_FIC_CLIENT_MODULES_TASKLOG_A003>
@@ -3816,6 +3873,9 @@
   <LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A072>Linked To Azure</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A072>
   <LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A073>Are you sure you want to Clear this?</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A073>
   <LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A074>Link To Local User</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A074>
+  <LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A075>Language</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A075>
+  <LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A076>Email Verification</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A076>
+  <LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A077>Azure user</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A077>
   <LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_B007>User ID</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_B007>
   <LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_B008>User Name</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_B008>
   <LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_B009>User Level</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_B009>
@@ -4097,6 +4157,7 @@
   <LHBIS_FIC_CLIENT_PACKAGE_CREATE_A094>Overwrite Top Records</LHBIS_FIC_CLIENT_PACKAGE_CREATE_A094>
   <LHBIS_FIC_CLIENT_PACKAGE_CREATE_A095>Chart Color Scheme Name</LHBIS_FIC_CLIENT_PACKAGE_CREATE_A095>
   <LHBIS_FIC_CLIENT_PACKAGE_CREATE_A096>Chart Color Scheme</LHBIS_FIC_CLIENT_PACKAGE_CREATE_A096>
+  <LHBIS_FIC_CLIENT_PACKAGE_CREATE_A097>SQL Query</LHBIS_FIC_CLIENT_PACKAGE_CREATE_A097>
   <LHBIS_FIC_CLIENT_PACKAGE_EXPORTDATACONNECTIONS_A001>Please enter the Publisher.</LHBIS_FIC_CLIENT_PACKAGE_EXPORTDATACONNECTIONS_A001>
   <LHBIS_FIC_CLIENT_PACKAGE_EXPORTDATACONNECTIONS_A002>Please enter the Name.</LHBIS_FIC_CLIENT_PACKAGE_EXPORTDATACONNECTIONS_A002>
   <LHBIS_FIC_CLIENT_PACKAGE_EXPORTDATACONNECTIONS_A003>Please enter the Password.</LHBIS_FIC_CLIENT_PACKAGE_EXPORTDATACONNECTIONS_A003>
@@ -4673,6 +4734,9 @@
   <LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A410>Pound</LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A410>
   <LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A411>Ton (U.S.)</LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A411>
   <LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A412>Pivot Enabled</LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A412>
+  <LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A413>Count Distinct</LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A413>
+  <LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A414>Chart Title:</LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A414>
+  <LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A415>Filter And DataSources</LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A415>
   <LHBIS_FIC_CLIENT_WSP_A001>Each of the parameters, @cy and @cm, can only be used once in a chart.</LHBIS_FIC_CLIENT_WSP_A001>
   <LHBIS_FIC_DATAMODEL_COMMON_A001>Language resource 1</LHBIS_FIC_DATAMODEL_COMMON_A001>
   <LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A001>Please install Silverlight 5.0</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A001>
@@ -4737,6 +4801,12 @@
   <LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A16>The SilverLight Isolated Storage space is not large enough.</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A16>
   <LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A17>You are currently logged in on another computer.  If you log in here, the other session will be disconnected.  Would you like to proceed?</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A17>
   <LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A18>Forgot Password</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A18>
+  <LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A19>Two-Factor Authentication:</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A19>
+  <LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A20>An Email with a verification code has been sent to: {0}.  Please enter the code to continue.</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A20>
+  <LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A22>An incorrect verification code has been entered.  Please try again.</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A22>
+  <LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A23>Below is the one-time code for logging into your account.</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A23>
+  <LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A24>Your one-time code: {0}</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A24>
+  <LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A25>Valid for : 10 min</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A25>
   <LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_B001>Language:</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_B001>
   <LHBIS_FIC_SILVERLIGHT_WSP_ERROR_A001>Get the list of data table errors.</LHBIS_FIC_SILVERLIGHT_WSP_ERROR_A001>
   <LHBIS_FIC_SILVERLIGHT_WSP_INOTIFYCHANGED_A001>At least one chart has been changed in the current board.</LHBIS_FIC_SILVERLIGHT_WSP_INOTIFYCHANGED_A001>
@@ -4774,6 +4844,7 @@
   <LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A027>Language</LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A027>
   <LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A028>Copy Cell</LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A028>
   <LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A029>Copy Row</LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A029>
+  <LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A030>Refresh Board Cached Data</LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A030>
   <LHBIS_FIC_SILVERLIGHT_WSP_WORKSPACEPAGE_A001>Logout</LHBIS_FIC_SILVERLIGHT_WSP_WORKSPACEPAGE_A001>
   <LHBIS_FIC_SILVERLIGHT_WSP_WORKSPACEPAGE_A002>Add Board</LHBIS_FIC_SILVERLIGHT_WSP_WORKSPACEPAGE_A002>
   <LHBIS_FIC_SILVERLIGHT_WSP_WORKSPACEPAGE_A003>Board</LHBIS_FIC_SILVERLIGHT_WSP_WORKSPACEPAGE_A003>

Site/Languages/en-us/textres.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<root lgid="en-us" ver="2022-10-21 09:56">
+<root lgid="en-us" ver="2023-05-19 09:13">
   <CLEAR_LOCAL_STORAGE>Clear Local Storage</CLEAR_LOCAL_STORAGE>
   <CONFIRM_LOCAL_STORAGE>Are you sure to clear the local storage?</CONFIRM_LOCAL_STORAGE>
   <ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>Please check whether the user ID already exists in another FI product.</ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>
@@ -3397,6 +3397,7 @@
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>Note: Labels of values where the percentage is less than 1 may not be shown.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>Attachments</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>Resend</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>
+  <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>The execute starting time must be early than the ending time.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>Resend Email Subscription</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>Group:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>Level:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>

Site/Languages/fr-fr/textres.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<root lgid="fr-fr" ver="2022-10-21 09:56">
+<root lgid="fr-fr" ver="2023-05-19 09:13">
   <CLEAR_LOCAL_STORAGE>Effacer le stockage local</CLEAR_LOCAL_STORAGE>
   <CONFIRM_LOCAL_STORAGE>Etes-vous sûr d'effacer le stockage local?</CONFIRM_LOCAL_STORAGE>
   <ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>Veuillez s'il vous plaît vérifier si l'identifiant d'utilisateur existe déjà dans un autre produit FI.</ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>
@@ -3397,6 +3397,7 @@
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>Remarque: Les étiquettes de valeurs où le pourcentage est inférieur à 1 peuvent ne pas être affichées.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>Pièces jointes</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>Rediffusion</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>
+  <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>L’heure de début d’exécution doit être antérieure à l’heure de fin.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>Revendre les abonnements par courriel</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>Groupe:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>Niveau:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>

Site/Languages/zh-chs/textres.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<root lgid="zh-chs" ver="2022-10-21 09:56">
+<root lgid="zh-chs" ver="2023-05-19 09:13">
   <CLEAR_LOCAL_STORAGE>清除本地存储</CLEAR_LOCAL_STORAGE>
   <CONFIRM_LOCAL_STORAGE>您确定要清除本地存储吗？</CONFIRM_LOCAL_STORAGE>
   <ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>请检查该用户是否已经存在于FI其它系统中。</ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>
@@ -3398,6 +3398,7 @@
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>注意：百分比小于1的值的标签将不会显示。</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>附件</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>重发</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>
+  <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>执行开始时间必须早于结束时间。</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>重发邮件订阅</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>分类:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>
   <LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>级别:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>

Site/MachineDeviceManagement/AddDevice.aspx

@@ -302,7 +302,6 @@
         function devicerequest(method, param, callback, error) {
             _network.request("MachineDeviceManagement/ManageMachines.aspx", -1, method, param, callback, error || function (e) {
                 console.log(e);
-                showmaskbg(false, true);
                 showAlert('An unknown error occurred.  Please refresh page.', 'Query');
             });
         }
@@ -622,9 +621,9 @@
 
         function getDeviceComments() {
             var cid = $('#sel_contractor').val();
-            $('#mask_bg').show();
+            showloading(true);
             devicerequest("GetDeviceComments", JSON.stringify([cid, deviceid]), function (data) {
-                $('#mask_bg').hide();
+                showloading(false);
                 if (typeof (data) === "string") {
                     return;
                 }
@@ -637,7 +636,7 @@
                     }
                 }
             }, function (err) {
-                $('#mask_bg').hide();
+                showloading(false);
             });
         }
 
@@ -663,9 +662,9 @@
             var cid = $('#sel_contractor').val();
             var param = JSON.stringify([cid, deviceid, comment]);
             param = htmlencode(param);
-            $('#mask_bg').show();
+            showloading(true);
             devicerequest("AddDeviceComment", param, function (data) {
-                $('#mask_bg').hide();
+                showloading(false);
                 if (data !== "") {
                     showAlert(data, GetTextByKey("P_MD_ERROR", 'Error'));
                     return;
@@ -673,7 +672,7 @@
                 $('#dialog_comments').val("");
                 getDeviceComments();
             }, function (err) {
-                $('#mask_bg').hide();
+                showloading(false);
             });
         }
 
@@ -683,9 +682,9 @@
 
         function getDeviceInstallationNotes() {
             var cid = $('#sel_contractor').val();
-            $('#mask_bg').show();
+            showloading(true);
             devicerequest("GetDeviceInstallationNotes", JSON.stringify([cid, deviceid]), function (data) {
-                $('#mask_bg').hide();
+                showloading(false);
                 if (typeof (data) === "string") {
                     return;
                 }
@@ -698,7 +697,7 @@
                     }
                 }
             }, function (err) {
-                $('#mask_bg').hide();
+                showloading(false);
             });
         }
 
@@ -739,7 +738,7 @@
 
             var cid = $('#sel_contractor').val();
             var param = JSON.stringify([cid, deviceid, inotes]);
-            $('#mask_bg').show();
+            showloading(true);
 
             var formData = new FormData();
             if (inImages && inImages.length > 0) {
@@ -762,14 +761,14 @@
                         showAlert(data, alerttitle);
                         return;
                     }
-                    $('#mask_bg').hide();
+                    showloading(false);
                     $('#dialog_installationnotes').val("");
                     inImages = [];
                     $("#divINImages").empty();
                     getDeviceInstallationNotes();
                 },
                 error: function (err) {
-                    $('#mask_bg').hide();
+                    showloading(false);
                 }
             });
         }

Site/MachineDeviceManagement/AddMachine.aspx

@@ -444,6 +444,17 @@
         var rentalChanged = false;//编辑机器时是否有修改，只用于Attributes和Rental
         var jobsiteinputChanged = false;//编辑机器时是否有修改，只用于JobSite
 
+        function showConfirm1(msg, title, fok, fcancel) {
+            _dialog.showConfirm(msg, title, function (e) {
+                if (typeof fok === 'function') {
+                    fok(e);
+                }
+            }, function () {
+                if (fcancel)
+                    fcancel();
+            });
+        }
+
         function devicerequest(method, param, callback, error) {
             _network.request("MachineDeviceManagement/ManageMachines.aspx", -1, method, param, callback, error || function (e) {
                 showmaskbg(false, true);
@@ -1554,7 +1565,7 @@
             if (!IsSupperAdmin) {
                 $('#dialog_preloaded').hide();
                 $('#dialog_preloaded_text').hide();
-                
+
             }
 
             window.onresize = resizeContent;
@@ -1615,6 +1626,34 @@
                 $("#dialogmask").hide();
         }
 
+        function showsubloading(id, flag, noanimation) {
+            var mask = $("#" + id);
+            mask.children().show();
+            if (noanimation) {
+                mask.css('display', flag ? '' : 'none');
+            } else {
+                if (flag) {
+                    mask.fadeIn(100);
+                } else {
+                    mask.fadeOut(100);
+                }
+            }
+        }
+
+        function showsubmask(id, flag, noanimation) {
+            var mask = $("#" + id);
+            mask.children().hide();
+            if (noanimation) {
+                mask.css('display', flag ? '' : 'none');
+            } else {
+                if (flag) {
+                    mask.fadeIn(100);
+                } else {
+                    mask.fadeOut(100);
+                }
+            }
+        }
+
         function OnNext() {
             OnSave(0, 0, gotoNext);
         }
@@ -1642,9 +1681,6 @@
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
     <div id="div_content" style="min-width: 1024px;">
-        <div id="dialogmask" class="maskbg" style="display: none; z-index: 500;">
-            <div class="loading_icon icon c-spin"></div>
-        </div>
         <div class="function_title">
             <span class="sbutton iconsave" onclick="OnSave(0,0);" data-lgid="P_MA_SAVE">Save</span>
             <span class="sbutton iconsave" onclick="OnSave(1,0);" data-lgid="P_MA_SAVE1">Save and Exit</span>
@@ -1723,7 +1759,7 @@
                     <tr>
                         <td class="label" data-lgid="P_MA_DESCRIPTION_COLON">Description:</td>
                         <td>
-                            <textarea id="dialog_description" class="inputbox" style="height: 60px;" maxlength="1000" tabindex="15"></textarea>
+                            <textarea id="dialog_description" style="height: 60px;" maxlength="1000" tabindex="15"></textarea>
                         </td>
                     </tr>
                     <tr>
@@ -1983,7 +2019,7 @@
                             <tr>
                                 <td class="label" data-lgid="P_MA_COMMENTS_COLON">Comments:</td>
                                 <td colspan="3">
-                                    <textarea id="dialog_comments" class="inputbox" maxlength="1000" tabindex="68" style="width: 454px; margin-top: 2px;"></textarea>
+                                    <textarea id="dialog_comments" maxlength="1000" tabindex="68" style="width: 454px; margin-top: 2px;"></textarea>
                                 </td>
                             </tr>
                             <tr>
@@ -2158,13 +2194,16 @@
                 </div>
             </div>
         </div>
+
+        <div id="dialogmask" class="maskbg" style="display: none;">
+            <div class="loading_icon icon c-spin"></div>
+        </div>
     </div>
 
     <div id="mask_bg" style="display: none;">
         <div class="loading c-spin"></div>
     </div>
     <div class="dialog" id="dialog_adjustodometer" style="display: none; width: 960px;">
-        <div id="adjustodomask" class="maskbg" style="display: none; z-index: 1;"></div>
         <div class="dialog-title"><span class="title" data-lgid="P_MA_ADJUSTODOMETER">Adjust Odometer</span><em class="dialog-close"></em></div>
         <div class="dialog-content adjust-content">
             <table style="line-height: 25px; width: 100%;">
@@ -2210,7 +2249,7 @@
                 </tr>
                 <tr>
                     <td class="label" colspan="2">
-                        <div id="odometermostrecent" style="height: 90px; width:920px;"></div>
+                        <div id="odometermostrecent" style="height: 90px; width: 920px;"></div>
                     </td>
                 </tr>
                 <tr>
@@ -2218,7 +2257,7 @@
                 </tr>
                 <tr>
                     <td class="label" colspan="2">
-                        <div id="odometerhislist" style="height: 300px; width:920px;"></div>
+                        <div id="odometerhislist" style="height: 300px; width: 920px;"></div>
                     </td>
                 </tr>
             </table>
@@ -2229,10 +2268,10 @@
             <input type="button" onclick="OnPreviewOdometer();" value="Preview" data-lgid="P_MA_PREVIEW" tabindex="108" />
             <div class="clear"></div>
         </div>
+        <div id="adjustodomask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
     </div>
 
     <div class="dialog" id="dialog_adjustenginehours" style="display: none; width: 940px;">
-        <div id="adjustenginehoursmask" class="maskbg" style="display: none; z-index: 1;"></div>
         <div class="dialog-title"><span class="title" data-lgid="P_MA_ADJUSTENGINEHOURS">Adjust EngineHours</span><em class="dialog-close"></em></div>
         <div class="dialog-content adjust-content">
             <table style="line-height: 25px; width: 100%;">
@@ -2270,7 +2309,7 @@
                 </tr>
                 <tr>
                     <td class="label" colspan="2">
-                        <div id="enginehoursmostrecent" style="height: 90px;width:920px;"></div>
+                        <div id="enginehoursmostrecent" style="height: 90px; width: 920px;"></div>
                     </td>
                 </tr>
                 <tr>
@@ -2278,7 +2317,7 @@
                 </tr>
                 <tr>
                     <td class="label" colspan="2">
-                        <div id="enginehourshislist" style="height: 300px;width:920px;"></div>
+                        <div id="enginehourshislist" style="height: 300px; width: 920px;"></div>
                     </td>
                 </tr>
             </table>
@@ -2289,6 +2328,7 @@
             <input type="button" onclick="OnPreviewEngineHours();" value="Preview" data-lgid="P_MA_PREVIEW" tabindex="127" />
             <div class="clear"></div>
         </div>
+        <div id="adjustenginehoursmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
     </div>
 
 
@@ -2312,7 +2352,6 @@
 
 
     <div class="dialog" id="dialog_addodometer" style="display: none; width: 600px;">
-        <div id="addodomask" class="maskbg" style="display: none; z-index: 1;"></div>
         <div class="dialog-title"><span class="title" data-lgid="P_MA_ADDODOMETER">Add Odometer</span><em class="dialog-close"></em></div>
         <div class="dialog-content adjust-content">
             <table style="line-height: 25px; width: 100%;">
@@ -2360,11 +2399,11 @@
             <input type="button" onclick="OnAddOdometer();" value="Submit" data-lgid="P_MA_SUBMIT" tabindex="158" />
             <div class="clear"></div>
         </div>
+        <div id="addodomask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
     </div>
 
 
     <div class="dialog" id="dialog_addenginehours" style="display: none; width: 600px;">
-        <div id="addenginehoursmask" class="maskbg" style="display: none; z-index: 1;"></div>
         <div class="dialog-title"><span class="title" data-lgid="P_MA_ADDOENGINEHOURS">Add Engine Hours</span><em class="dialog-close"></em></div>
         <div class="dialog-content adjust-content">
             <table style="line-height: 28px; width: 100%;">
@@ -2404,6 +2443,7 @@
             <input type="button" onclick="OnAddEngineHours();" value="Submit" data-lgid="P_MA_SUBMIT" tabindex="177" />
             <div class="clear"></div>
         </div>
+        <div id="addenginehoursmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
     </div>
 
 
@@ -2419,7 +2459,6 @@
     </div>
 
     <div class="dialog" id="dialog_addmake" style="display: none; width: 360px;">
-        <div id="addmakemask" class="maskbg" style="display: none; z-index: 1;"></div>
         <div class="dialog-title"><span class="title" data-lgid="P_MA_ADDMAKE">Add Make</span><em class="dialog-close"></em></div>
         <div class="dialog-content assetcontent">
             <table>
@@ -2435,10 +2474,10 @@
             <input type="button" onclick="OnSaveMake();" value="OK" data-lgid="P_MA_OK" tabindex="301" />
             <div class="clear"></div>
         </div>
+        <div id="addmakemask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
     </div>
 
     <div class="dialog" id="dialog_addmodel" style="display: none; width: 360px;">
-        <div id="addmodelmask" class="maskbg" style="display: none; z-index: 1;"></div>
         <div class="dialog-title"><span class="title" data-lgid="P_MA_ADDMODEL">Add Model</span><em class="dialog-close"></em></div>
         <div class="dialog-content assetcontent">
             <table>
@@ -2467,10 +2506,10 @@
             <input type="button" onclick="OnSaveModel();" value="OK" data-lgid="P_MA_OK" tabindex="404" />
             <div class="clear"></div>
         </div>
+        <div id="addmodelmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
     </div>
 
     <div class="dialog" id="dialog_assetduplicates" style="display: none; min-width: 540px;">
-        <div id="assetdupmask" class="maskbg" style="display: none; z-index: 1;"></div>
         <div class="dialog-title">
             <span class="title" style="float: left;" data-lgid="P_MA_POSSIBLEDUPLICATES_COLON">Possible Duplicates:&nbsp;<span id="spnumberinfo"></span></span>
             <div class="function_title" id="divDupFun" style="float: left; margin-left: 230px; display: none; line-height: 28px;">
@@ -2658,10 +2697,10 @@
             <input type="button" value="Ignore and Create Asset" data-lgid="P_MA_IGNOREANDCREATEASSET" onclick="OnIgnoreDuplicate();" style="width: 150px;" tabindex="500" />
             <div class="clear"></div>
         </div>
+        <div id="assetdupmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
     </div>
 
     <div class="dialog" id="dialog_mergeasset" style="display: none; min-width: 540px;">
-        <div id="mergeassetmask" class="maskbg" style="display: none; z-index: 1;"></div>
         <div class="dialog-title">
             <span class="title" style="float: left;" data-lgid="P_MA_XXX">Merge Asset</span>
             <em class="dialog-close"></em>
@@ -2857,11 +2896,11 @@
             <input type="button" value="Cancel" data-lgid="P_MA_CANCEL" class="dialog-close" tabindex="501" />
             <div class="clear"></div>
         </div>
+        <div id="mergeassetmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
     </div>
 
 
     <div class="dialog" id="dialog_adddocument" style="display: none; width: 500px;">
-        <div id="adddocumentmask" class="maskbg" style="display: none; z-index: 1;"></div>
         <div class="dialog-title"><span class="title" data-lgid="P_MA_ADDITIONALDOCUMENTATION">Additional Documentation</span><em class="dialog-close"></em></div>
         <div class="dialog-content adjust-content">
             <table style="line-height: 30px; width: 100%;">
@@ -2923,5 +2962,6 @@
             <input type="button" onclick="OnSaveDocument();" value="Save" data-lgid="P_MA_SAVE" tabindex="400" />
             <div class="clear"></div>
         </div>
+        <div id="adddocumentmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
     </div>
 </asp:Content>

Site/MachineDeviceManagement/AddMachineGroup.aspx

@@ -493,7 +493,6 @@
                 return s.Values.ID;
             });
             dialogAssets.showSelector();
-            $('#mask_bg').css('height', '100%');
         }
 
         var grid_dtsm;
@@ -514,7 +513,7 @@
                     // checkbox
                     name: 'check',
                     key: 'selected',
-                    width: 30,
+                    width: 45,
                     align: 'center',
                     sortable: false,
                     allcheck: true,
@@ -619,9 +618,6 @@
             <div class="loading c-spin"></div>
         </div>
         <div id="div_content">
-            <div id="dialogmask" class="maskbg" style="display: none; z-index: 500;">
-                <div class="loading_icon icon c-spin"></div>
-            </div>
             <div class="function_title">
                 <span class="sbutton iconsave" onclick="OnSave(0);" data-lgid="P_AG_SAVE">Save</span>
                 <span class="sbutton iconsave" onclick="OnSave(1);" data-lgid="P_AG_SAVE1">Save and Exit</span>
@@ -635,19 +631,19 @@
                     <tr>
                         <td class="label" data-lgid="P_AG_GROUPNAME_COLON">Group Name:</td>
                         <td>
-                            <input type="text" id="dialog_groupname" class="inputbox" maxlength="200" tabindex="1" style="width: 300px;" />
+                            <input type="text" id="dialog_groupname" maxlength="200" tabindex="1" style="width: 300px;" />
                         </td>
                     </tr>
                     <tr>
                         <td class="label" style="width: 50px; text-align: right;" data-lgid="P_AG_CODE_COLON">Code:</td>
                         <td>
-                            <input type="text" id="dialog_groupcode" class="inputbox" maxlength="50" tabindex="1" style="width: 300px;" />
+                            <input type="text" id="dialog_groupcode" maxlength="50" tabindex="1" style="width: 300px;" />
                         </td>
                     </tr>
                     <tr>
                         <td class="label" data-lgid="P_AG_DESCRIPTION_COLON">Description:</td>
                         <td>
-                            <textarea id="dialog_description" class="inputbox" maxlength="1000" tabindex="2" style="width: 300px"></textarea></td>
+                            <textarea id="dialog_description" maxlength="1000" tabindex="2" style="width: 300px"></textarea></td>
                     </tr>
                 </table>
                 <div class="dialog-subheader">

Site/MachineDeviceManagement/AddRental.aspx

@@ -538,7 +538,7 @@
                     <tr>
                         <td class="label" data-lgid="P_MR_COMMENTS_COLON">Comments:</td>
                         <td>
-                            <textarea id="dialog_comments" class="inputbox" maxlength="1000" tabindex="14" style="width: 540px; height: 120px;"></textarea>
+                            <textarea id="dialog_comments" maxlength="1000" tabindex="14" style="width: 540px; height: 120px;"></textarea>
                             <span id="span_a" style="margin-left: 50px;"><a href="#" onclick="OnViewChangeHistory();" data-lgid="P_MR_VIEWCHANGEHIS">View Change History</a></span>
                         </td>
                     </tr>

Site/MachineDeviceManagement/DeviceManagementBase.master

@@ -96,8 +96,6 @@
                     $('.content_main').css('min-height', $(window).height() - $('.content_main').offset().top - 4);
                 if ($('#machinesDiv').length > 0)
                     $('#machinesDiv').css('min-height', $(window).height() - $('#machinesDiv').offset().top - 4);
-
-                $('#mask_bg').height($(document).outerHeight(false)).width($(document).outerWidth(false));
             }
 
             $(window).resize(function () {

Site/MachineDeviceManagement/MachineGroups.aspx

@@ -32,11 +32,6 @@
             left: 150px;
         }
 
-        .inputbox {
-            width: 564px;
-            padding: 1px;
-        }
-
         #dialog_description {
             padding: 2px;
             height: 60px;
@@ -345,17 +340,17 @@
                 <tr>
                     <td class="label">Group Name:</td>
                     <td>
-                        <input type="text" id="dialog_groupname" class="inputbox" maxlength="200" tabindex="1" style="width: 300px;" />
+                        <input type="text" id="dialog_groupname" maxlength="200" tabindex="1" style="width: 300px;" />
                     </td>
                     <td class="label" style="width: 50px; text-align: right;">Code:</td>
                     <td>
-                        <input type="text" id="dialog_groupcode" class="inputbox" maxlength="50" tabindex="1" style="width: 200px;" />
+                        <input type="text" id="dialog_groupcode" maxlength="50" tabindex="1" style="width: 200px;" />
                     </td>
                 </tr>
                 <tr>
                     <td class="label">Description:</td>
                     <td colspan="3">
-                        <textarea id="dialog_description" class="inputbox" maxlength="1000" tabindex="2"></textarea></td>
+                        <textarea id="dialog_description" maxlength="1000" tabindex="2"></textarea></td>
                 </tr>
             </table>
             <div class="dialog-subheader">Group Assets</div>

Site/MachineDeviceManagement/ManageGPSDevices.aspx

@@ -178,11 +178,11 @@
                     if (j === "Status")
                         r[j] = { DisplayValue: r["Status"] === 1 ? "Active" : "Inactive", Value: r[j] };
                     else if (j === "AddDate")
-                        r[j] = { DisplayValue: r["AddDateStr"], Value: r["AddDateStr1"] };
+                        r[j] = { DisplayValue: r["AddDateStr"], Value: r[j] };
                     else if (j === "InvoiceDate")
                         r[j] = { DisplayValue: r["InvoiceDateStr"], Value: r[j] };
                     else if (j === "ServiceStartDate")
-                        r[j] = { DisplayValue: r["ServiceStartDateStr"], Value: r["ServiceStartDateStr1"] };
+                        r[j] = { DisplayValue: r["ServiceStartDateStr"], Value: r[j] };
                     else if (j === "EngineHoursDate")
                         r[j] = { DisplayValue: r["EngineHoursDateStr"], Value: r[j] };
                     else if (j === "EngineHours")
@@ -548,7 +548,7 @@
                     type: 3,
                     key: 'checked',
                     allcheck: true,
-                    width: 30,
+                    width: 45,
                     align: 'center'
                 });
             }

Site/MachineDeviceManagement/ManageMachines.aspx

@@ -487,7 +487,7 @@
             //grid_dt.lang.ok = "Apply";
             //grid_dt.lang.reset;
             var list_columns = [
-                { name: 'Selected', caption: "", valueIndex: 'Selected', alwaysshow: true, css: { 'width': 40, 'text-align': 'center' }, type: 3 },
+                { name: 'Selected', caption: "", valueIndex: 'Selected', alwaysshow: true, css: { 'width': 45, 'text-align': 'center' }, type: 3 },
                 { name: 'VIN', caption: GetTextByKey("P_MA_VINSN", "SN/VIN"), valueIndex: 'VIN', css: { 'width': 180, 'text-align': 'left' } },
                 { name: 'Name', caption: GetTextByKey("P_MA_ASSETNAME", "Asset Name"), valueIndex: 'Name', css: { 'width': 180, 'text-align': 'left' } },
                 { name: 'Name2', caption: GetTextByKey("P_MA_ASSETNAME2", "Asset Name(Custom)"), valueIndex: 'Name2', css: { 'width': 180, 'text-align': 'left' } },
@@ -897,7 +897,7 @@
                     type: 3,
                     key: 'checked',
                     allcheck: true,
-                    width: 30,
+                    width: 45,
                     align: 'center'
                 });
             }

Site/MachineDeviceManagement/ManageRentals.aspx

@@ -62,7 +62,6 @@
     <link href="<%=GetFileUrlWithVersion("../css/jquery.datetimepicker.css")%>" rel="stylesheet" />
     <script src="<%=GetFileUrlWithVersion("../Maintenance/js/inputdatactr.js")%>" type="text/javascript"></script>
     <script src="<%=GetFileUrlWithVersion("../js/jquery.datetimepicker.full.js")%>"></script>
-    <script src="<%=GetFileUrlWithVersion("../js/editableselect.js")%>"></script>
     <script type="text/javascript">        
         var IsDealer = <%=IsDealer ?"true":"false"%>;
         var IsAdmin =<%=IsAdmin ?"true":"false"%>;
@@ -70,10 +69,6 @@
         var MachineID = "<%=MachineID %>";
 
         var machines;
-        var editableSelectMachine;
-        var listeditableSelectMachine;
-
-
 
         function devicerequest(method, param, callback, error) {
             _network.request("MachineDeviceManagement/ManageRentals.aspx", -1, method, param, callback, error || function (e) {
@@ -106,8 +101,7 @@
                 else
                     $("#btnAdd").hide();
 
-                GetMachines();
-
+                OnRefresh();
             });
         }
 
@@ -133,7 +127,7 @@
                 }
                 else
                     $("#btnAdd").hide();
-                GetMachines();
+                OnRefresh();
             });
         }
 
@@ -207,29 +201,6 @@
             });
         }
 
-        function GetMachines() {
-            contractorid = htmlencode($.trim($('#sel_contractor').val()));
-
-            devicerequest("GetSelectMachinesByCompany", contractorid, function (data) {
-                if (data && data.length > 0) {
-                    machines = data;
-                    editableSelectMachine.datasource = machines;
-                    editableSelectMachine.valuepath = "MachineID"
-                    editableSelectMachine.displaypath = "DisplayName";
-
-                    listeditableSelectMachine.datasource = machines;
-                    listeditableSelectMachine.valuepath = "MachineID"
-                    listeditableSelectMachine.displaypath = "DisplayName";
-                    //if (MachineID !== "")//暂时不过滤机器
-                    //    listeditableSelectMachine.val(MachineID);
-                }
-
-                OnRefresh();
-
-            }, function (err) {
-            });
-        }
-
         function OnRefresh() {
             showloading(true);
 
@@ -239,10 +210,6 @@
             var startdate = htmlencode($('#startdatetxt').val());
             var enddate = htmlencode($('#enddatetxt').val());
 
-            var machine = listeditableSelectMachine.selecteditem();
-            if (machine != null)
-                MachineID = machine.MachineID;
-
             devicerequest("SearchRentals", contractorid + String.fromCharCode(170) + searchtxt
                 + String.fromCharCode(170) + startdate + String.fromCharCode(170) + enddate
                 + String.fromCharCode(170) + "", function (data) {
@@ -411,8 +378,7 @@
             var from = htmlencode($('#startdatetxt').val());
             var to = htmlencode($('#enddatetxt').val());
 
-            mid = listeditableSelectMachine.val();
-            if (mid === undefined) mid = "";
+            var mid = "";
 
             var sortPath = $("#tbRentals").data("sortPath");
             if (sortPath === undefined) sortPath = "";
@@ -429,8 +395,7 @@
             var from = htmlencode($('#startdatetxt').val());
             var to = htmlencode($('#enddatetxt').val());
 
-            mid = listeditableSelectMachine.val();
-            if (mid === undefined) mid = "";
+            var mid = "";
 
             var sortPath = $("#tbRentals").data("sortPath");
             if (sortPath === undefined) sortPath = "";
@@ -444,10 +409,6 @@
             setPageTitle(GetTextByKey("P_MANAGERENTALS", "Manage Rentals"), true);
             InitGridData();
 
-            editableSelectMachine = new $editableselect($("#dialog_machine"));
-            editableSelectMachine.tabIndex(1);
-            listeditableSelectMachine = new $editableselect($("#sel_machine"));
-
             if (IsDealer == true) {
                 $('#span_contractor').css('display', '');
                 $('#span_contractor').parent().css('display', '');
@@ -458,13 +419,12 @@
                 }
             }
             else
-                GetMachines();
+                OnRefresh();
 
             $("#sel_contractor").change(function () {
-                GetMachines();
+                OnRefresh();
             });
 
-
             $('#searchinputtxt').keydown(searchEnter);
 
             $('#startdatetxt').datetimepicker({
@@ -531,18 +491,6 @@
             }
         }
 
-        function OnViewHistory() {
-            var cid = "";
-            cid = htmlencode($.trim($('#sel_contractor').val()));
-            var machineID = "";
-            var machine = listeditableSelectMachine.selecteditem();
-            if (machine != null)
-                machineID = machine.MachineID;
-            else
-                machineID = "";
-            window.open("RentalChangeHistory.aspx?cid=" + cid + "&mid=" + machineID + "");
-        }
-
         function OnViewChangeHistory(rental) {
             if (!rental) {
                 return;
@@ -550,11 +498,6 @@
             var cid = "";
             cid = htmlencode($.trim($('#sel_contractor').val()));
             var machineID = "";
-            var machine = listeditableSelectMachine.selecteditem();
-            if (machine != null)
-                machineID = machine.MachineID;
-            else
-                machineID = "";
 
             window.open("RentalChangeHistory.aspx?cid=" + cid + "&mid=" + machineID + "&rid=" + rental.RentalID + "");
         }
@@ -597,7 +540,6 @@
                         <span class="sbutton iconrefresh" onclick="OnRefresh();" data-lgid="P_MR_REFRESH">Refresh</span>
                         <span class="sbutton iconprint" onclick="OnPrint();" style="display: none;" data-lgid="P_MR_PRINT">Print</span>
                         <span id="spExport" class="sbutton iconexport" onclick="OnExport();" data-lgid="P_MR_EXPORTTOEXCEL">Export to Excel</span>
-                        <%--<input id="btnhistory" type="button" onclick="OnViewHistory();" value="View Change History" style="width: 150px;" />--%>
                     </div>
                 </td>
             </tr>

Site/MachineDeviceManagement/RentalChangeHistory.aspx

@@ -80,90 +80,14 @@
             });
         }
 
-        //admin用户 获取所有contractor
-        function getContractors() {
-            devicerequest('GetContractors', '', function (data) {
-                if (typeof (data) === "string") {
-                    showAlert(data, GetTextByKey("P_MR_ERROR", 'Error'));
-                    return;
-                }
-                if (data && data.length > 0) {
-                    var sel_search = $('#sel_contractor').empty();
-                    for (var i = 0; i < data.length; i++) {
-                        var kv = data[i];
-                        var op_search = $('<option></option>').val(kv.Key).text(kv.Value);
-                        if (kv.Key == contractorid)
-                            op_search.prop('selected', true);
-                        sel_search.append(op_search);
-                    }
-                    if (contractorid !== "")
-                        sel_search.val(contractorid);
-                }
-
-                GetMachines();
-
-            });
-        }
-
-        //普通用户 获取可操作的contractor     
-        function GetContractorsByUser() {
-            devicerequest('GetContractorsByUser', '', function (data) {
-                if (typeof (data) === "string") {
-                    showAlert(data, GetTextByKey("P_MR_ERROR", 'Error'));
-                    return;
-                }
-                if (data && data.length > 0) {
-                    var sel_search = $('#sel_contractor').empty();
-                    for (var i = 0; i < data.length; i++) {
-                        var kv = data[i];
-                        var op_search = $('<option></option>').val(kv.Key).text(kv.Value);
-                        sel_search.append(op_search);
-                    }
-
-                    if (contractorid !== "")
-                        sel_search.val(contractorid);
-                }
-                GetMachines();
-            });
-        }
-
-        function GetMachines() {
-            contractorid = htmlencode($.trim($('#sel_contractor').val()));
-
-            devicerequest("GetSelectMachinesByCompany", contractorid, function (data) {
-                if (data && data.length > 0) {
-                    machines = data;
-                    listeditableSelectMachine.datasource = machines;
-                    listeditableSelectMachine.valuepath = "MachineID"
-                    listeditableSelectMachine.displaypath = "DisplayName";
-                    //if (MachineID !== "")//暂时不过滤机器
-                    //listeditableSelectMachine.val(MachineID);
-                }
-
-                OnRefresh();
-
-            }, function (err) {
-            });
-        }
-
         function OnRefresh() {
             showloading(true);
 
-            var cid = htmlencode($.trim($('#sel_contractor').val()));
-            if (cid && cid != '')
-                contractorid = cid;
             var searchtxt = "";
             searchtxt = htmlencode($.trim($('#searchinputtxt').val()));
             var startdate = htmlencode($('#startdatetxt').val());
             var enddate = htmlencode($('#enddatetxt').val());
 
-            var machine = listeditableSelectMachine.selecteditem();
-            if (machine != null)
-                MachineID = machine.MachineID;
-            else
-                MachineID = "";
-
-
             devicerequest("SearchRentalChangeHistory", contractorid + String.fromCharCode(170) + searchtxt
                 + String.fromCharCode(170) + startdate + String.fromCharCode(170) + enddate
                 + String.fromCharCode(170) + MachineID + String.fromCharCode(170) + RentalID, function (data) {
@@ -181,16 +105,11 @@
         }
 
         function OnExport() {
-            var cid = htmlencode($.trim($('#sel_contractor').val()));
-            if (cid && cid != '')
-                contractorid = cid;
             var searchtxt = "";
             searchtxt = htmlencode($.trim($('#searchinputtxt').val()));
             var from = htmlencode($('#startdatetxt').val());
             var to = htmlencode($('#enddatetxt').val());
-
-            mid = listeditableSelectMachine.val();
-            if (mid === undefined) mid = "";
+            var mid = "";
 
             var sortPath = grid_dt.sortKey;
             if (sortPath === undefined) sortPath = "";
@@ -200,16 +119,11 @@
         }
 
         function OnPrint() {
-            var cid = htmlencode($.trim($('#sel_contractor').val()));
-            if (cid && cid != '')
-                contractorid = cid;
             var searchtxt = "";
             searchtxt = htmlencode($.trim($('#searchinputtxt').val()));
             var from = htmlencode($('#startdatetxt').val());
             var to = htmlencode($('#enddatetxt').val());
-
-            mid = listeditableSelectMachine.val();
-            if (mid === undefined) mid = "";
+            var mid = "";
 
             var sortPath = grid_dt.sortKey;
             if (sortPath === undefined) sortPath = "";
@@ -298,22 +212,6 @@
                 $('#tr_search').css('display', 'none');
             }
 
-            //if (IsDealer == true) {
-            //    $('#span_contractor').css('display', '');
-            //    $('#span_contractor').parent().css('display', '');
-            //    if (IsAdmin)
-            //        getContractors();
-            //    else {
-            //        GetContractorsByUser();
-            //    }
-            //}
-            //else
-            //    GetMachines();
-
-            //$("#sel_contractor").change(function () {
-            //    GetMachines();
-            //});
-
             OnRefresh();
 
             $('#searchinputtxt').keydown(searchEnter);