diff --git a/app/Views/Report_pending_purchase.php b/app/Views/Report_pending_purchase.php index 321afeac..03bc0e6f 100644 --- a/app/Views/Report_pending_purchase.php +++ b/app/Views/Report_pending_purchase.php @@ -129,7 +129,7 @@
- +
@@ -138,7 +138,7 @@
- +
diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index a48c2f4c..d0e47df9 100644 --- a/app/Views/addEmployeenew.php +++ b/app/Views/addEmployeenew.php @@ -999,7 +999,7 @@ - + diff --git a/app/Views/addasset.php b/app/Views/addasset.php index fc84c896..d22c5c4c 100644 --- a/app/Views/addasset.php +++ b/app/Views/addasset.php @@ -414,8 +414,8 @@ - }); - + }) +; }); diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index 094ae7bb..f10c9456 100644 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -3277,129 +3277,129 @@ if (!empty($INRSYMBOL)) { -
-
+
+
- CGST In % -
+ CGST In % +
-
-
- - 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);'); - echo form_input($data); - ?> -
- -
-
-
- - 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true'); - echo form_input($data); - ?> -
+
+
+ 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?>
-
-
- - SGST In % -
- -
-
- - 'EditSgst', 'value' => set_value('EditSgst', 0), 'id' => 'EditSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); - echo form_input($data); - ?> -
- -
-
-
- - 'EditAfterSgst', 'value' => set_value('EditAfterSgst', 0), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true'); - echo form_input($data); - ?> -
+
+
+ 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true'); + echo form_input($data); + ?>
-
-
- IGST In % -
+
+
+
-
-
+ SGST In % +
- 'EditIgst', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); - echo form_input($data); - ?> -
- -
-
-
- - 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true'); - echo form_input($data); - ?> - -
+
+
+ 'EditSgst', 'value' => set_value('EditSgst', 0), 'id' => 'EditSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?>
-
-
- +
+
+ + 'EditAfterSgst', 'value' => set_value('EditAfterSgst', 0), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true'); + echo form_input($data); + ?>
-
-
- 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances', 0), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); - echo form_input($data); - ?> -
+ +
+ +
+
+
+ + IGST In % +
+ +
+
+ + 'EditIgst', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?> +
+ +
+
+
+ + 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true'); + echo form_input($data); + ?> + +
+ +
+ +
+
+
+ +
+
+
+ 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances', 0), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?>
-
-
- -
-
-
- 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
+
+
+
+ +
+
+
+ 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?>
-
-
+
+
+
'EdittxtSpcialInstructionSingle', 'value' => set_value('EdittxtSpcialInstructionSingle'), 'id' => 'EdittxtSpcialInstructionSingle', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); echo form_textarea($data); ?> -
- +
+ + -
@@ -3497,38 +3497,38 @@ if (!empty($INRSYMBOL)) { ?>
-
- -
- 'EditRevenueQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditRevenueQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;'); - echo form_input($data); - ?> -
+
+ +
+ 'EditRevenueQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditRevenueQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;'); + echo form_input($data); + ?>
-
- -
- 'EditRevenueRate', 'value' => set_value('EditRate'), 'id' => 'EditRevenueRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;'); - echo form_input($data); - ?> -
+
+
+ +
+ 'EditRevenueRate', 'value' => set_value('EditRate'), 'id' => 'EditRevenueRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;'); + echo form_input($data); + ?>
-
- 'editrevenueEmergPer', 'value' => set_value('editrevenueEmergPer'), 'id' => 'editrevenueEmergPer', 'class' => 'form-control'); - echo form_input($data); ?> -
-
- -
- 'txtEditRevenueBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditRevenueBasicValue', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); - echo form_input($data); - ?> -
+
+
+ 'editrevenueEmergPer', 'value' => set_value('editrevenueEmergPer'), 'id' => 'editrevenueEmergPer', 'class' => 'form-control'); + echo form_input($data); ?> +
+
+ +
+ 'txtEditRevenueBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditRevenueBasicValue', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); + echo form_input($data); + ?>
+
@@ -3763,16 +3763,16 @@ if (!empty($INRSYMBOL)) {
-
- +
+ 'Edit_Service_Description', 'value' => set_value('Edit_Service_Description'), 'id' => 'Edit_Service_Description', 'class' => 'form-control', 'rows' => '2', 'cols' => '100'); echo form_textarea($data);; ?>
-
+
- +
@@ -3836,38 +3836,38 @@ if (!empty($INRSYMBOL)) { ?>
-
- -
- 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()'); - echo form_input($data); - ?> -
+
+ +
+ 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()'); + echo form_input($data); + ?>
-
- -
- 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()'); - echo form_input($data); - ?> -
+
+
+ +
+ 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()'); + echo form_input($data); + ?>
-
- 'addrevenueEmergPer', 'value' => set_value('addrevenueEmergPer'), 'id' => 'addrevenueEmergPer', 'class' => 'form-control'); - echo form_input($data); ?> -
-
- -
- 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
+
+
+ 'addrevenueEmergPer', 'value' => set_value('addrevenueEmergPer'), 'id' => 'addrevenueEmergPer', 'class' => 'form-control'); + echo form_input($data); ?> +
+
+ +
+ 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?>
+
@@ -4104,8 +4104,8 @@ if (!empty($INRSYMBOL)) {
-
- +
+ 'Add_Service_Description', 'value' => set_value('Add_Service_Description'), 'id' => 'Add_Service_Description', 'class' => 'form-control', 'rows' => '2', 'cols' => '100'); echo form_textarea($data);; @@ -5765,7 +5765,7 @@ if (!empty($INRSYMBOL)) { addHidden(theForm, "RevenueIgst" + temp, Igst); addHidden(theForm, "RevenueAfterIgst" + temp, AfterIgst); $('#txtRowCount1').val(temp); - + $('#hiddenRevenueuserid').val(temp); clearRevenueModalFields(); @@ -5925,6 +5925,10 @@ if (!empty($INRSYMBOL)) { $(document).ready(function() { + $('#Deliverydt').attr({ + 'data-provide': 'datepicker', + 'data-date-format': 'dd-mm-yyyy' + }); // Initialize the DataTable var table = $('#serviceTax').DataTable({ @@ -6753,7 +6757,7 @@ if (!empty($INRSYMBOL)) { populateValueMainFormForEditServiceTax(); - }else{ + } else { console.log("in else part..."); } @@ -7178,79 +7182,79 @@ if (!empty($INRSYMBOL)) { }); }); $(document).ready(function() { - $("#EDITREVENUE").on("shown.bs.modal", function(e) { - var userid = $(e.relatedTarget).data('userid'); + $("#EDITREVENUE").on("shown.bs.modal", function(e) { + var userid = $(e.relatedTarget).data('userid'); - var CheckLocalInter = $('#CheckLocalInter' + userid).val(); - if (CheckLocalInter == "0") { + var CheckLocalInter = $('#CheckLocalInter' + userid).val(); + if (CheckLocalInter == "0") { - $('#SGSTEditModel').show(); - $('#IGSTEditModel').hide(); + $('#SGSTEditModel').show(); + $('#IGSTEditModel').hide(); - } else { + } else { - $('#SGSTEditModel').hide(); - $('#IGSTEditModel').show(); + $('#SGSTEditModel').hide(); + $('#IGSTEditModel').show(); - } + } - $('#isEdit').val(1); - //alert(userid); - var tr = document.getElementById(userid); + $('#isEdit').val(1); + //alert(userid); + var tr = document.getElementById(userid); - var cellval = tr.cells; + var cellval = tr.cells; - var id = $('#Reqnumber' + userid).val(); + var id = $('#Reqnumber' + userid).val(); - $('#EditRevenueReqNo').val($('#Reqnumber' + userid).val()); - $('#EditRevenuedeptName').val($('#departmentName' + userid).val()); - $("#EditRevenueCostCenter").val($('#costCode' + userid).val()); - $('#EditRevenueAvlBudAmt').val($('#AvilBudget' + userid).val() ? $('#AvilBudget' + userid).val() : 0); - $('#EditRevenueItemName').val($('#materialName' + userid).val()); - $('#EditRevenueUOM').val($('#uom' + userid).val()); - $('#EditRevenueQuantity').val($('#quantity' + userid).val()); - $('#EditRevenueRate').val($('#itemRate' + userid).val()); - $('#editrevenueEmergPer').val($('#per' + userid).val()); - $('#txtEditRevenueBasicValue').val(cellval[7].innerHTML); - RequistQuantity = $('#quantity' + userid).val(); - $('#txtEditDiscount').val($('#DisVal' + userid).val()); - $('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val()); + $('#EditRevenueReqNo').val($('#Reqnumber' + userid).val()); + $('#EditRevenuedeptName').val($('#departmentName' + userid).val()); + $("#EditRevenueCostCenter").val($('#costCode' + userid).val()); + $('#EditRevenueAvlBudAmt').val($('#AvilBudget' + userid).val() ? $('#AvilBudget' + userid).val() : 0); + $('#EditRevenueItemName').val($('#materialName' + userid).val()); + $('#EditRevenueUOM').val($('#uom' + userid).val()); + $('#EditRevenueQuantity').val($('#quantity' + userid).val()); + $('#EditRevenueRate').val($('#itemRate' + userid).val()); + $('#editrevenueEmergPer').val($('#per' + userid).val()); + $('#txtEditRevenueBasicValue').val(cellval[7].innerHTML); + RequistQuantity = $('#quantity' + userid).val(); + $('#txtEditDiscount').val($('#DisVal' + userid).val()); + $('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val()); - $('#txtEditPackaging').val($('#PackVal' + userid).val()); - $('#txtEditAfterPackaging').val($('#AfterPackVal' + userid).val()); + $('#txtEditPackaging').val($('#PackVal' + userid).val()); + $('#txtEditAfterPackaging').val($('#AfterPackVal' + userid).val()); - $('#txtEditFreight').val($('#FreightVal' + userid).val()); - $('#txtEditAfterFreight').val($('#AfterFreightVal' + userid).val()); + $('#txtEditFreight').val($('#FreightVal' + userid).val()); + $('#txtEditAfterFreight').val($('#AfterFreightVal' + userid).val()); - $('#EditNOOfTrips').val($('#NoOfTrip' + userid).val()); + $('#EditNOOfTrips').val($('#NoOfTrip' + userid).val()); - var FreightType = $('#FreightType' + userid).val(); + var FreightType = $('#FreightType' + userid).val(); - if (FreightType == "PER TRIP") { - $('#EditTripsValue').show(); - } else { - $('#EditTripsValue').hide(); - } - $('#txtEditInsurance').val($('#Insval' + userid).val()); - $('#RevenueEditAfterCgst').val($('#RevenueAfterCgst' + userid).val()); - $('#RevenueEditAfterSgst').val($('#RevenueAfterSgst' + userid).val()); - $('#RevenueEditAfterIgst').val($('#RevenueAfterIgst' + userid).val()); - $('#RevenueEditCgst').val($('#RevenueCgst' + userid).val()); - $('#RevenueEditSgst').val($('#RevenueSgst' + userid).val()); - $('#RevenueEditIgst').val($('#RevenueIgst' + userid).val()); - $('#txtEditRevenueTotalOrderValue').val($('#TotalOrderValue' + userid).val()); - tinyMCE.get('Edit_Service_Description').setContent($('#service_description' + userid).val()); + if (FreightType == "PER TRIP") { + $('#EditTripsValue').show(); + } else { + $('#EditTripsValue').hide(); + } + $('#txtEditInsurance').val($('#Insval' + userid).val()); + $('#RevenueEditAfterCgst').val($('#RevenueAfterCgst' + userid).val()); + $('#RevenueEditAfterSgst').val($('#RevenueAfterSgst' + userid).val()); + $('#RevenueEditAfterIgst').val($('#RevenueAfterIgst' + userid).val()); + $('#RevenueEditCgst').val($('#RevenueCgst' + userid).val()); + $('#RevenueEditSgst').val($('#RevenueSgst' + userid).val()); + $('#RevenueEditIgst').val($('#RevenueIgst' + userid).val()); + $('#txtEditRevenueTotalOrderValue').val($('#TotalOrderValue' + userid).val()); + tinyMCE.get('Edit_Service_Description').setContent($('#service_description' + userid).val()); - $("#EditRevenueMaterialCode").empty(); + $("#EditRevenueMaterialCode").empty(); - $("#EditRevenueMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val())); - if (typeof materialData !== 'undefined' && materialData !== null && materialData !== '') { + $("#EditRevenueMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val())); + if (typeof materialData !== 'undefined' && materialData !== null && materialData !== '') { var parsedMaterialData = JSON.parse(materialData); - $.each(parsedMaterialData, function(index, value) { + $.each(parsedMaterialData, function(index, value) { if ($('#materialCode' + userid).val() != value.MaterialCode) { $("#EditRevenueMaterialCode").append($('').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName)); } @@ -7259,10 +7263,10 @@ if (!empty($INRSYMBOL)) { console.log("materialData is not defined or empty."); } - - $("#EditDiscountType").val($('#DisType' + userid).val()); - $("#drpEditFreight").val($('#FreightType' + userid).val()); - $("#EditPackagingType").val($('#PackType' + userid).val()) + + $("#EditDiscountType").val($('#DisType' + userid).val()); + $("#drpEditFreight").val($('#FreightType' + userid).val()); + $("#EditPackagingType").val($('#PackType' + userid).val()) }); }); diff --git a/app/Views/companyview.php b/app/Views/companyview.php index feee9973..2692f508 100644 --- a/app/Views/companyview.php +++ b/app/Views/companyview.php @@ -403,16 +403,32 @@ function ValidateUA() { var mindt = year-70; var maxdt = year-15; - $("#financialstart").datepicker({ - maxDate :'now', - //maxDate : new Date(maxdt,1,1), - dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-1:+1' +// $("#financialstart").datepicker({ +// maxDate :'now', +// //maxDate : new Date(maxdt,1,1), +// dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-1:+1' -}); +// }); - $("#financialend").datepicker({dateFormat: 'dd-mm-yy',minDate :'now',changeMonth: true, changeYear: true,yearRange: '-1:+1' -}); +// $("#financialend").datepicker({dateFormat: 'dd-mm-yy',minDate :'now',changeMonth: true, changeYear: true,yearRange: '-1:+1' +// }); + +// $("#financialstart").datepicker({ +// dateFormat: 'dd-mm-yy', +// onSelect: function(selectedDate) { +// var minDate = $(this).datepicker("getDate"); +// $("#toDate").datepicker("option", "minDate", minDate); +// } +// }); + +// $("#financialend").datepicker({ +// dateFormat: 'dd-mm-yy', +// onSelect: function(selectedDate) { +// var maxDate = $(this).datepicker("getDate"); +// $("#fromDate").datepicker("option", "maxDate", maxDate); +// } +// }); }); @@ -523,14 +539,19 @@ function ValidateUA() {
+ +
- -
+ +
- +
@@ -753,7 +774,8 @@ function ValidateUA() {
- + +
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php index 0a32d1ac..3f595542 100644 --- a/app/Views/editRevenueAmendPO.php +++ b/app/Views/editRevenueAmendPO.php @@ -1000,7 +1000,7 @@ if (!empty($INRSYMBOL)) {
'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;','min' => date('d-m-Y'),); + $data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;','min' => date('d-m-Y'),); echo form_input($data); ?>
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php index b5e60f89..2d2d79ff 100644 --- a/app/Views/editServiceAmendPO.php +++ b/app/Views/editServiceAmendPO.php @@ -792,7 +792,7 @@ foreach ($PaymentTerms as $TER) {
'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); + $data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); echo form_input($data); ?>
diff --git a/app/Views/employeeListing.php b/app/Views/employeeListing.php index 1668acb2..5eb84cec 100644 --- a/app/Views/employeeListing.php +++ b/app/Views/employeeListing.php @@ -101,24 +101,12 @@
-
- - - - - - - - - -
-
+
- @@ -138,7 +126,6 @@ } else { $cdate = date('d-m-Y', strtotime($record->Created_date)); } ?> - diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php index 9c9e435e..2bda916f 100755 --- a/app/Views/inwardgateregister.php +++ b/app/Views/inwardgateregister.php @@ -139,7 +139,7 @@
- + - $(function () { - $("td").dblclick(function () { - var OriginalContent = $(this).text(); - $(this).addClass("cellEditing"); - $(this).html(""); - $(this).children().first().focus(); - $(this).children().first().keypress(function (e) { - if (e.which == 13) { - var newContent = $(this).val(); - $(this).parent().text(newContent); - $(this).parent().removeClass("cellEditing"); - } }); - $(this).children().first().blur(function(){ - $(this).parent().text(OriginalContent); - $(this).parent().removeClass("cellEditing"); - }); - }); - }); + + $(function + () + { + $("td").dblclick(function + () + { + var + OriginalContent + = + $(this).text(); + $(this).addClass("cellEditing"); + $(this).html(" +"); +$(this).children().first().focus(); +$(this).children().first().keypress(function (e) { +if (e.which == 13) { +var newContent = $(this).val(); +$(this).parent().text(newContent); +$(this).parent().removeClass("cellEditing"); +} }); +$(this).children().first().blur(function(){ +$(this).parent().text(OriginalContent); +$(this).parent().removeClass("cellEditing"); +}); +}); +}); + .table-bordered>thead>tr>th, + .table-bordered>tbody>tr>th, + .table-bordered>tfoot>tr>th, + .table-bordered>thead>tr>td, + .table-bordered>tbody>tr>td, + .table-bordered>tfoot>tr>td { + border: 1px solid #333; + } +
- 'form-label-left RequisitionList ','name' => 'RequisitionList','id' => 'RequisitionList','method' => 'post','role' => 'form' ); - - echo form_open(base_url().'purchaseorderform/purchaseorder',$attributes); ?> - -
- -
-

Requisition List

-
-
-
-
- -
- 'Select Department Name'); - //print_r( $options); - - if(!empty($POType)) - { - foreach ($SupplierName as $SID): - - - $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; + 'form-label-left RequisitionList ', 'name' => 'RequisitionList', 'id' => 'RequisitionList', 'method' => 'post', 'role' => 'form'); - endforeach; - } - - echo form_dropdown('SupplierID', $options,set_value('SupplierID'),'id="SupplierID"' ,'class = "form-control required"','required="true"'); + echo form_open(base_url() . 'purchaseorderform/purchaseorder', $attributes); ?> - ?> - +
+ +
+
+

Requisition List

+
+
+
+
+
+ +
+ 'Select Department Name'); + //print_r( $options); + + if (!empty($POType)) { + foreach ($SupplierName as $SID): + + + $options[$SID->SupplierID] = $SID->SupplierID . ' ' . ' - ' . ' ' . $SID->SupplierName; + + endforeach; + } + + echo form_dropdown('SupplierID', $options, set_value('SupplierID'), 'id="SupplierID"', 'class = "form-control required"', 'required="true"'); + + ?> + +
+
+
+ +
+ 'Select Status'); + //print_r( $options); + + if (!empty($POType)) { + foreach ($SupplierName as $SID): + + + $options[$SID->SupplierID] = $SID->SupplierID . ' ' . ' - ' . ' ' . $SID->SupplierName; + + endforeach; + } + + echo form_dropdown('SupplierID', $options, set_value('SupplierID'), 'id="SupplierID"', 'class = "form-control required"', 'required="true"'); + + ?> + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ +
+
+ +
+
+
+ +
+
+ + + +

+ + +
Created Date Emp ID Employee Name Contact Number EmpID ?> FirstName; ?> ContactNumber ?>
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
S NoItem CodeItem DescriptionUOMQuantity
1 R001Wasted SandTon100
2 R002ResinLiter200
+ +
+ +
+
+ + + + + +
+
+ + +
+
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SelectRequisition NumberRequisition DateStatusCommants
 REQ0000012/3/2017 + + Need to get quick
 REQ0000015/4/2017 + + Need to get quick
 REQ0000019/4/2017 + + Need to get quick
+ + +
+ + + + +
+
-
- -
- 'Select Status'); - //print_r( $options); - - if(!empty($POType)) - { - foreach ($SupplierName as $SID): - - - $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; - endforeach; - } - - echo form_dropdown('SupplierID', $options,set_value('SupplierID'),'id="SupplierID"' ,'class = "form-control required"','required="true"'); - - ?> - -
-
- -
- -
- - -
-
- -
- -
- -
-
- -
-
-
- -
-
- - - -

- - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SelectRequisition NumberRequisition DateStatusCommants
 REQ0000012/3/2017 - - Need to get quick
 REQ0000015/4/2017 - - Need to get quick
 REQ0000019/4/2017 - - Need to get quick
- - -
- - - - -
-
-
-
- - +
- \ No newline at end of file + + e.preventDefault(); + + var id = ''; + var chk1 = $('#chk1').val(); + var chk2 = $('#chk2').val(); + var chk3 = $('#chk3').val(); + if ($('#chk1').is(":checked")) { + id = ''; + } else if ($('#chk2').is(":checked")) { + id = ''; + } else if ($('#chk3').is(":checked")) { + id = ''; + } + // alert(chk1); + // alert(chk2); + // alert(chk3); + + window.location = baseurl + 'purchaseorderform/purchaseorder'; + + + }); + //Date range picker + $('#reservation').daterangepicker(); + \ No newline at end of file diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index 45363d8b..ad8fea0c 100644 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -1626,5 +1626,59 @@ function appendExistingFilesFileds(data){ } } }); + // Date range filter function + $.fn.dataTable.ext.search.push( + function(settings, data, dataIndex) { + var fromDate = $('#fromDate').val(); + var toDate = $('#toDate').val(); + + if (!fromDate || !toDate) { + return true; // If no dates selected, don't filter + } + + var dateStr = data[0]; // Assuming the date is in the first column + var dateParts = dateStr.split("-"); + var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object + + var startDate = new Date(fromDate); + var endDate = new Date(toDate); + + // Adjust startDate to include the day before the selected fromDate + startDate.setDate(startDate.getDate() - 1); + + // Ensure endDate includes the entire end date by setting time to the end of the day + endDate.setHours(23, 59, 59, 999); + + // Return true if the date is within the range + return date >= startDate && date <= endDate; + } + ); + + // Handle form submission for the date range filter + $("#DateRangeFilter").submit(function(e) { + e.preventDefault(); + table.draw(); // Redraw the table to apply the filter + }); + + // Reset button functionality + $("#resetButton").click(function() { + $("#fromDate").val(''); + $("#toDate").val(''); + table.draw(); // Redraw the table to clear the filter + }); + + // Automatically focus and open the To Date picker when From Date is selected + document.getElementById('fromDate').addEventListener('change', function() { + var fromDate = this.value; + var toDateInput = document.getElementById('toDate'); + + // Set the min attribute of the To Date input to the selected From Date + toDateInput.min = fromDate; + + // Optionally reset the To Date input if the current value is before the new min date + if (toDateInput.value < fromDate) { + toDateInput.value = fromDate; + } + }); }); \ No newline at end of file