sync
This commit is contained in:
		| @@ -7,60 +7,11 @@ | ||||
|             display: none; | ||||
|         } | ||||
|  | ||||
|         .edit-content table { | ||||
|             border-collapse: collapse; | ||||
|             width: 100%; | ||||
|         } | ||||
|  | ||||
|             .edit-content table td.label { | ||||
|                 width: 200px; | ||||
|                 text-align: right; | ||||
|                 padding-right: 10px; | ||||
|                 line-height: 24px; | ||||
|                 height: 24px; | ||||
|                 vertical-align: top; | ||||
|             } | ||||
|  | ||||
|             .edit-content table td input, | ||||
|             .edit-content table td textarea { | ||||
|                 border: 1px solid #a9a9a9; | ||||
|                 width: 320px; | ||||
|                 height: 18px; | ||||
|                 padding: 1px; | ||||
|             } | ||||
|  | ||||
|                 .edit-content table td input[type="checkbox"] { | ||||
|                     border: none; | ||||
|                 } | ||||
|  | ||||
|             .edit-content table td textarea { | ||||
|                 height: 100px; | ||||
|                 resize: none; | ||||
|                 /*max-width: 200px;*/ | ||||
|             } | ||||
|  | ||||
|         .a { | ||||
|             text-decoration: none; | ||||
|             color: #2140fb; | ||||
|         } | ||||
|  | ||||
|         .subtitle { | ||||
|             margin: 20px 40px 5px 0px; | ||||
|             font-size: 16px; | ||||
|             color: gray; | ||||
|         } | ||||
|  | ||||
|             .subtitle span { | ||||
|                 margin-left: 10px; | ||||
|             } | ||||
|  | ||||
|             .subtitle hr { | ||||
|                 background-color: #d8d8d8; | ||||
|                 border: none; | ||||
|                 height: 1px; | ||||
|             } | ||||
|  | ||||
|  | ||||
|         .machinetd { | ||||
|             white-space: nowrap; | ||||
|             text-overflow: ellipsis; | ||||
| @@ -357,7 +308,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 src="<%=GetFileUrlWithVersion("../js/vue.min.js")%>"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/adj_odometer.js")%>"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/adj_enginehours.js")%>"></script> | ||||
| @@ -473,7 +423,7 @@ | ||||
|                             setTimeout(function () { | ||||
|                                 timelineLoaded = true; | ||||
|                                 OnRefresh(); | ||||
|                             },100); | ||||
|                             }, 100); | ||||
|                         }); | ||||
|                         $('#div_timeline').show(); | ||||
|                     } | ||||
| @@ -688,11 +638,11 @@ | ||||
|                 GetAssetRental(); | ||||
|  | ||||
|                 if (data.Description && data.Description !== "") { | ||||
|                     data.Description = replaceHtmlText(data.Description); | ||||
|                     $("#tddesc").html(data.Description); | ||||
|                     //data.Description = replaceHtmlText(data.Description); | ||||
|                     $("#tddesc").text(data.Description); | ||||
|                 } | ||||
|                 else | ||||
|                     $("#tddesc").html(""); | ||||
|                     $("#tddesc").text(""); | ||||
|  | ||||
|                 if ((IsSupperAdmin || isAllowed) && canAddReading() && canEditAsset) { | ||||
|                     if (data.OnRoad) { | ||||
| @@ -991,7 +941,7 @@ | ||||
|  | ||||
|         function GetAssetExtInfo(rentaldata) { | ||||
|             showloading(true); | ||||
|             assetrequest("GetAssetExtInfo", contractorid + String.fromCharCode(170) + assetid, function (data) { | ||||
|             assetrequest("GetAssetExtInfo", contractorid + String.fromCharCode(170) + assetid + String.fromCharCode(170) + "", function (data) { | ||||
|                 showloading(false); | ||||
|                 if (typeof (data) === "string") { | ||||
|                     return; | ||||
| @@ -1320,20 +1270,14 @@ | ||||
|                     if (j === "AlertLocalTime") | ||||
|                         r[j] = { DisplayValue: r["AlertLocalTimeStr"], Value: r[j] }; | ||||
|                 } | ||||
|                 var fr = { Values: r }; | ||||
|                 rows.push(fr); | ||||
|                 rows.push(r); | ||||
|             } | ||||
|  | ||||
|             grid_alertsdt.setData(rows); | ||||
|         } | ||||
|  | ||||
|         function InitAlertsGridData() { | ||||
|             grid_alertsdt = new GridView('#divalerts'); | ||||
|             grid_alertsdt.lang = { | ||||
|                 all: GetTextByKey("P_GRID_ALL", "(All)"), | ||||
|                 ok: GetTextByKey("P_GRID_OK", "OK"), | ||||
|                 reset: GetTextByKey("P_GRID_RESET", "Reset") | ||||
|             }; | ||||
|             grid_alertsdt = createGridView('#divalerts'); | ||||
|             var list_columns = [ | ||||
|                 { name: 'AlertLocalDateStr', caption: GetTextByKey("P_MV_DATE", "Date"), valueIndex: 'AlertLocalDateStr', css: { 'width': 70, 'text-align': 'left' } }, | ||||
|                 { name: 'AlertLocalTimeStr', caption: GetTextByKey("P_MV_TIME", "Time"), valueIndex: 'AlertLocalTimeStr', css: { 'width': 75, 'text-align': 'left' } }, | ||||
| @@ -1357,12 +1301,6 @@ | ||||
|             grid_alertsdt.canMultiSelect = false; | ||||
|             grid_alertsdt.columns = columns; | ||||
|             grid_alertsdt.init(); | ||||
|  | ||||
|             grid_alertsdt.selectedrowchanged = function (rowindex) { | ||||
|                 var rowdata = grid_alertsdt.source[rowindex]; | ||||
|                 if (rowdata) { | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         var grid_assetstatusdt; | ||||
| @@ -1374,20 +1312,14 @@ | ||||
|                     if (j === "EventLocalTime") | ||||
|                         r[j] = { DisplayValue: r["EventLocalTimeStr"], Value: r[j] }; | ||||
|                 } | ||||
|                 var fr = { Values: r }; | ||||
|                 rows.push(fr); | ||||
|                 rows.push(r); | ||||
|             } | ||||
|  | ||||
|             grid_assetstatusdt.setData(rows); | ||||
|         } | ||||
|  | ||||
|         function InitAssetStatusGridData() { | ||||
|             grid_assetstatusdt = new GridView('#divassetstatus'); | ||||
|             grid_assetstatusdt.lang = { | ||||
|                 all: GetTextByKey("P_GRID_ALL", "(All)"), | ||||
|                 ok: GetTextByKey("P_GRID_OK", "OK"), | ||||
|                 reset: GetTextByKey("P_GRID_RESET", "Reset") | ||||
|             }; | ||||
|             grid_assetstatusdt = createGridView('#divassetstatus'); | ||||
|             var list_columns = [ | ||||
|                 { name: 'EventLocalTime', caption: GetTextByKey("P_MV_DATE", "Date"), valueIndex: 'EventLocalTime', css: { 'width': 100, 'text-align': 'left' } }, | ||||
|                 { name: 'AttributeName', caption: GetTextByKey("P_MV_READING", "Reading"), valueIndex: 'AttributeName', css: { 'width': 120, 'text-align': 'left' } }, | ||||
| @@ -1410,12 +1342,6 @@ | ||||
|             grid_assetstatusdt.canMultiSelect = false; | ||||
|             grid_assetstatusdt.columns = columns; | ||||
|             grid_assetstatusdt.init(); | ||||
|  | ||||
|             grid_assetstatusdt.selectedrowchanged = function (rowindex) { | ||||
|                 var rowdata = grid_assetstatusdt.source[rowindex]; | ||||
|                 if (rowdata) { | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|  | ||||
|  | ||||
| @@ -1428,20 +1354,14 @@ | ||||
|                     if (j === "AlertLocalTime") | ||||
|                         r[j] = { DisplayValue: r["AlertLocalTimeStr"], Value: r[j] }; | ||||
|                 } | ||||
|                 var fr = { Values: r }; | ||||
|                 rows.push(fr); | ||||
|                 rows.push(r); | ||||
|             } | ||||
|  | ||||
|             grid_utilizationdt.setData(rows); | ||||
|         } | ||||
|  | ||||
|         function InitUtilizationGridData() { | ||||
|             grid_utilizationdt = new GridView('#divutilization'); | ||||
|             grid_utilizationdt.lang = { | ||||
|                 all: GetTextByKey("P_GRID_ALL", "(All)"), | ||||
|                 ok: GetTextByKey("P_GRID_OK", "OK"), | ||||
|                 reset: GetTextByKey("P_GRID_RESET", "Reset") | ||||
|             }; | ||||
|             grid_utilizationdt = createGridView('#divutilization'); | ||||
|             var list_columns = [ | ||||
|                 { name: 'AlertLocalTime', caption: "", valueIndex: 'AlertLocalTime', css: { 'width': 70, 'text-align': 'left' } }, | ||||
|                 { name: 'TotalHours', caption: GetTextByKey("P_MV_TOTALHOURS", "Total Hours"), TotalHours: 'Level', css: { 'width': 80, 'text-align': 'left' } }, | ||||
| @@ -1466,12 +1386,6 @@ | ||||
|             grid_utilizationdt.canMultiSelect = false; | ||||
|             grid_utilizationdt.columns = columns; | ||||
|             grid_utilizationdt.init(); | ||||
|  | ||||
|             grid_utilizationdt.selectedrowchanged = function (rowindex) { | ||||
|                 var rowdata = grid_utilizationdt.source[rowindex]; | ||||
|                 if (rowdata) { | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         function getNowFormatDate() { | ||||
| @@ -1571,9 +1485,6 @@ | ||||
|     </script> | ||||
| </asp:Content> | ||||
| <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server"> | ||||
|     <div id="mask_bg" style="display: none;"> | ||||
|         <div class="loading c-spin"></div> | ||||
|     </div> | ||||
|     <div> | ||||
|         <div class="clear"></div> | ||||
|         <div id="divcontent" style="overflow: auto; font-size: 13px;"> | ||||
| @@ -1605,9 +1516,9 @@ | ||||
|                                             <label>{{asset.TypeName}}</label> | ||||
|                                             <br /> | ||||
|                                             <b class="assetlable" data-lgid="P_MV_MAKE_COLON">Make:</b> | ||||
|                                             <b>{{asset.MakeName}}</b> | ||||
|                                             <label>{{asset.MakeName}}</label> | ||||
|                                             <b class="assetlable" data-lgid="P_MV_MODEL_COLON">Model:</b> | ||||
|                                             <b>{{asset.ModelName}}</b> | ||||
|                                             <label>{{asset.ModelName}}</label> | ||||
|                                             <br /> | ||||
|                                             <label data-lgid="P_MV_VINSN_COLON">VIN/SN:</label> | ||||
|                                             <label>{{asset.VIN}}</label> | ||||
| @@ -1716,6 +1627,9 @@ | ||||
|     <div id="div_wsp" class="div-wsp"> | ||||
|         <iframe id="ifwsp" class="iframe-wsp"></iframe> | ||||
|     </div> | ||||
|     <div id="mask_bg" style="display: none;"> | ||||
|         <div class="loading c-spin"></div> | ||||
|     </div> | ||||
|  | ||||
|     <div class="dialog" id="dialog_addodometer" style="display: none; width: 600px;"> | ||||
|         <div id="addodomask" class="maskbg" style="display: none; z-index: 1;"></div> | ||||
| @@ -1723,7 +1637,7 @@ | ||||
|         <div class="dialog-content adjust-content"> | ||||
|             <table style="line-height: 25px; width: 100%;"> | ||||
|                 <tr> | ||||
|                     <td class="label" title="Odometer at time of reading" data-titlt-lgid="P_MV_ODOMETERATTIMEOFREADING" data-lgid="P_MV_ODOMETER_COLON">Odometer:</td> | ||||
|                     <td class="label" title="Odometer at time of reading" data-title-lgid="P_MV_ODOMETERATTIMEOFREADING" data-lgid="P_MV_ODOMETER_COLON">Odometer:</td> | ||||
|                     <td> | ||||
|                         <input type="text" id="dialogadd_odometer" maxlength="8" tabindex="151" /></td> | ||||
|                 </tr> | ||||
| @@ -1736,17 +1650,17 @@ | ||||
|                         </select></td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td class="label" title="Time zone of asset reading" data-titlt-lgid="P_MV_TIMEZONEOFASSETREADING" data-lgid="P_MV_TIMEZON_COLON">Time Zone:</td> | ||||
|                     <td class="label" title="Time zone of asset reading" data-title-lgid="P_MV_TIMEZONEOFASSETREADING" data-lgid="P_MV_TIMEZON_COLON">Time Zone:</td> | ||||
|                     <td> | ||||
|                         <select id="dialogadd_odometertimezone" tabindex="153" /></td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td class="label" title="Date of reading" data-titlt-lgid="P_MV_DATEOFREADING" data-lgid="P_MV_ODOMETERDATE_COLON">Odometer Date:</td> | ||||
|                     <td class="label" title="Date of reading" data-title-lgid="P_MV_DATEOFREADING" data-lgid="P_MV_ODOMETERDATE_COLON">Odometer Date:</td> | ||||
|                     <td> | ||||
|                         <input type="text" id="dialogadd_odometerdate" maxlength="8" tabindex="154" /></td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td class="label" title="Time of reading (military)" data-titlt-lgid="P_MV_TIMEOFREADINGMILITARY" data-lgid="P_MV_ODOMETERTIME_COLON">Odometer Time:</td> | ||||
|                     <td class="label" title="Time of reading (military)" data-title-lgid="P_MV_TIMEOFREADINGMILITARY" data-lgid="P_MV_ODOMETERTIME_COLON">Odometer Time:</td> | ||||
|                     <td> | ||||
|                         <select id="dialogadd_timehour" style="width: 48px;" tabindex="155"></select><span style="font-weight: bold;">  :  </span> | ||||
|                         <select id="dialogadd_timeminute" style="width: 48px;" tabindex="156"></select></td> | ||||
| @@ -1776,17 +1690,17 @@ | ||||
|                         <input type="text" id="dialogaddgenginehours_enginehours" maxlength="8" tabindex="171" /></td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td class="label" title="Time zone of asset reading" data-titlt-lgid="P_MV_TIMEZONEOFASSETREADING" data-lgid="P_MV_TIMEZON_COLON">Time Zone:</td> | ||||
|                     <td class="label" title="Time zone of asset reading" data-title-lgid="P_MV_TIMEZONEOFASSETREADING" data-lgid="P_MV_TIMEZON_COLON">Time Zone:</td> | ||||
|                     <td> | ||||
|                         <select id="dialogadd_enginehourstimezone" tabindex="172" /></td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td class="label" title="Date of reading" data-titlt-lgid="P_MV_DATEOFREADING" data-lgid="P_MV_ENGINEHOURSDATE_COLON">Engine Hours Date:</td> | ||||
|                     <td class="label" title="Date of reading" data-title-lgid="P_MV_DATEOFREADING" data-lgid="P_MV_ENGINEHOURSDATE_COLON">Engine Hours Date:</td> | ||||
|                     <td> | ||||
|                         <input type="text" id="dialogaddenginehours_date" maxlength="8" tabindex="173" /></td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td class="label" title="Time of reading (military)" data-titlt-lgid="P_MV_TIMEOFREADINGMILITARY" data-lgid="P_MV_ENGINEHOURSTIME_COLON">Engine Hours Time:</td> | ||||
|                     <td class="label" title="Time of reading (military)" data-title-lgid="P_MV_TIMEOFREADINGMILITARY" data-lgid="P_MV_ENGINEHOURSTIME_COLON">Engine Hours Time:</td> | ||||
|                     <td> | ||||
|                         <select id="dialogaddenginehours_timehour" style="width: 48px;" tabindex="174"></select><span style="font-weight: bold;">  :  </span> | ||||
|                         <select id="dialogaddenginehours_timeminute" style="width: 48px;" tabindex="175"></select></td> | ||||
| @@ -1806,7 +1720,7 @@ | ||||
|     </div> | ||||
|  | ||||
|     <div class="dialog" id="dialog_pmschedulelist" style="display: none; width: 640px;"> | ||||
|         <div id="pmschedulelistmask" class="maskbg" style="display: none; z-index: 1;"></div> | ||||
|         <div id="pmschedulelistmask" class="maskbg" style="display: none;"></div> | ||||
|         <div class="dialog-title"><span class="title" data-lgid="P_MV_EDITPLAN">Edit Plan</span><em class="dialog-close"></em></div> | ||||
|         <div class="dialog-content"> | ||||
|             <div id="pmschedulelist" style="height: 300px;"></div> | ||||
| @@ -1818,7 +1732,7 @@ | ||||
|         </div> | ||||
|     </div> | ||||
|  | ||||
|     <div class="dialog" id="dialog_pm" style="display: none; min-width: 540px; max-width: 720px; z-index: 2;"> | ||||
|     <div class="dialog" id="dialog_pm" style="display: none; min-width: 540px; max-width: 720px;"> | ||||
|         <div class="dialog-title"><span class="title" data-lgid="P_MV_ADDASSETTOSCHEDULE">Add Asset To Schedule</span><em class="dialog-close"></em></div> | ||||
|         <div class="dialog-content" style="line-height: 24px; padding-left: 20px; padding-right: 20px;"> | ||||
|         </div> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user