sync
This commit is contained in:
		| @@ -7,38 +7,6 @@ | ||||
|             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; | ||||
| @@ -71,7 +39,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"%>; | ||||
| @@ -184,7 +151,7 @@ | ||||
|                 alerttitle = GetTextByKey("P_MA_ADDRENTAL", "Add Rental"); | ||||
|             } | ||||
|  | ||||
|             if (item.MachineID === "") { | ||||
|             if (!item.MachineID) { | ||||
|                 showAlert(GetTextByKey("P_MR_ASSETNOTEMPTY", 'Asset cannot be empty.'), alerttitle); | ||||
|                 $('#dialog_machine').focus(); | ||||
|                 return; | ||||
| @@ -398,11 +365,11 @@ | ||||
|             for (var i = 0; i < data.length; i++) { | ||||
|                 var rental = data[i]; | ||||
|                 var tr = $('<tr></tr>').data('rental', rental); | ||||
|                 tr.append($('<td class="machinetd" style="width: 10%;""></td>').attr('title', rental.Comments).html(replaceHtmlText(rental.Outside))); | ||||
|                 tr.append($('<td class="machinetd" style="width: 10%;""></td>').html(getLangOutside(rental.Outside))); | ||||
|                 tr.append($('<td class="machinetd" style="width: 10%;""></td>').html(replaceHtmlText(rental.Vendor))); | ||||
|                 tr.append($('<td class="machinetd" style="width: 8%;""></td>').text(rental.RentalRate)); | ||||
|                 tr.append($('<td class="machinetd" style="width: 8%;""></td>').text(rental.Term)); | ||||
|                 tr.append($('<td class="machinetd" style="width: 8%;""></td>').text(rental.TermUnit)); | ||||
|                 tr.append($('<td class="machinetd" style="width: 8%;""></td>').text(getLangTermUnit(rental.TermUnit))); | ||||
|                 tr.append($('<td class="machinetd" style="width: 8%;">"></td>').text(rental.RentalDateStr)); | ||||
|                 tr.append($('<td class="machinetd" style="width: 8%;""></td>').text(rental.ProjectReturnDateStr)); | ||||
|                 tr.append($('<td class="machinetd" style="width: 8%;""></td>').text(rental.ReturnDateStr)); | ||||
| @@ -415,13 +382,40 @@ | ||||
|             $('#tbody_rentals').append(trs); | ||||
|         } | ||||
|  | ||||
|  | ||||
|         function getLangTermUnit(text) { | ||||
|             var langtext = text; | ||||
|             if (text === "Hourly") | ||||
|                 langtext = GetTextByKey("P_MR_HOURLY", "Hourly"); | ||||
|             else if (text === "Daily") | ||||
|                 langtext = GetTextByKey("P_MR_DAILY", "Daily"); | ||||
|             else if (text === "Weekly") | ||||
|                 langtext = GetTextByKey("P_MR_WEEKLY", "Weekly"); | ||||
|             else if (text === "Monthly") | ||||
|                 langtext = GetTextByKey("P_MR_MONTHLY", "Monthly"); | ||||
|             else if (text === "Annually") | ||||
|                 langtext = GetTextByKey("P_MR_ANNUALLY", "Annually"); | ||||
|             return langtext; | ||||
|         } | ||||
|  | ||||
|         function getLangOutside(text) { | ||||
|             var langtext = text; | ||||
|             if (text === "Inside") | ||||
|                 langtext = GetTextByKey("P_MR_INSIDE", "Inside"); | ||||
|             else if (text === "Outside") | ||||
|                 langtext = GetTextByKey("P_MR_OUTSIDE", "Outside"); | ||||
|             return langtext; | ||||
|         } | ||||
|  | ||||
|         function OnViewChangeHistory() { | ||||
|             window.open("RentalChangeHistory.aspx?cid=" + contractorid + "&mid=" + machineid + "&rid=" + rentalid + ""); | ||||
|         } | ||||
|     </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 id="mask_bg" style="display: none;"> | ||||
|         <div class="loading c-spin"></div> | ||||
|     </div> | ||||
|     <div> | ||||
|         <div class="function_title"> | ||||
|             <span class="sbutton iconsave" onclick="OnSave(0);" data-lgid="P_MR_SAVE">Save</span> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user