From 145af91046a46d54690361e8d952ec81cfc02f5c Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Wed, 25 Sep 2024 17:45:32 +0530 Subject: [PATCH] CHANGE_SANJEEV_ISSUE_AND_LISTING_LOADER_ISSUE_CLEAR --- app/Models/Purchaseorder_model.php | 4 +- app/Views/BatchcardHistAdd.php | 3 +- app/Views/BatchcardHistEdit.php | 6 +- app/Views/BatchcardMaintEdit.php | 3 + app/Views/Editmaterialinspectionreport.php | 6 +- app/Views/EditservicePurchaseorder.php | 26 +- app/Views/Favourite.php | 10 +- app/Views/action_report.php | 1567 +++-- app/Views/addEmployee.php | 4 +- app/Views/addEmployeenew.php | 10 +- app/Views/addRawMaterial.php | 8 +- app/Views/addSupplier.php | 9 +- app/Views/addUser.php | 8 +- app/Views/addasset.php | 8 +- app/Views/addcomplaint.php | 7 +- app/Views/addenquiry.php | 9 +- app/Views/addnewIncomeExpense.php | 15 +- app/Views/addstorerequisitionslip.php | 1432 +++-- app/Views/alterpurchaseorder.php | 62 +- app/Views/approvalstorerequisitionslip.php | 11 +- app/Views/bankamountpaid.php | 1138 ++-- app/Views/bankamountreceived.php | 867 ++- app/Views/bankamountunpaid.php | 1030 ++-- app/Views/bankcash.php | 2 + app/Views/bankcashnew.php | 1703 +++--- app/Views/bankcashreceipt.php | 1278 ++-- app/Views/bankdebit.php | 1309 ++-- app/Views/bankinvoice.php | 1247 ++-- app/Views/bankinvoicesettlement.php | 703 ++- app/Views/banksettlement.php | 1105 ++-- app/Views/banksettlementcash.php | 900 +-- app/Views/banksettlementcredit.php | 900 +-- app/Views/capitalpurchaseorder.php | 13 +- app/Views/cashbooklisting.php | 6 +- app/Views/companyview.php | 8 +- app/Views/costListing.php | 4 +- app/Views/createPOfromRequistion.php | 4 +- app/Views/dailyBatchCardListing.php | 8 +- app/Views/dailybatchcard.php | 8 +- app/Views/dashboard.php | 20 +- app/Views/editCapitalAmendPO.php | 911 +-- app/Views/editCapitalPo.php | 18 +- app/Views/editDailyData.php | 8 +- app/Views/editEmployee.php | 10 + app/Views/editEmployeenew.php | 16 +- app/Views/editFinalProduct.php | 80 +- app/Views/editImportAmendPO.php | 8 +- app/Views/editInprocessReport.php | 6 +- app/Views/editNissanInprocessReport.php | 6274 ++++++++++---------- app/Views/editOld.php | 12 +- app/Views/editOldasset.php | 13 +- app/Views/editPayslip.php | 3 + app/Views/editRawmaterial.php | 8 +- app/Views/editRevenueAmendPO.php | 8 +- app/Views/editRevenuepurchaseorder.php | 23 +- app/Views/editServiceAmendPO.php | 17 +- app/Views/editSupplier.php | 10 +- app/Views/editaction_report.php | 21 +- app/Views/editasset.php | 532 +- app/Views/editcomplaint.php | 4 +- app/Views/editconfig.php | 4 +- app/Views/editenquiry.php | 4 +- app/Views/editimportpo.php | 7 + app/Views/editincomeexpenses.php | 15 +- app/Views/editmaterialadjustment.php | 8 +- app/Views/editrequisitionform.php | 15 +- app/Views/editresinbatchcard.php | 42 +- app/Views/editstorerequisition.php | 22 +- app/Views/expense_list.php | 22 +- app/Views/importpo.php | 4 +- app/Views/includes/new_header.php | 2 + app/Views/newresinbatchcard.php | 38 +- app/Views/purchaseorder.php | 21 +- app/Views/qualityreport.php | 1985 ++++--- 74 files changed, 12635 insertions(+), 12997 deletions(-) diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php index acb39b08..fe3d6992 100755 --- a/app/Models/Purchaseorder_model.php +++ b/app/Models/Purchaseorder_model.php @@ -17,13 +17,11 @@ class Purchaseorder_model extends Model ->where('Req.RequestedDept', $this->session->get('DEPCode')); $query = $builder->get(); - return $query->getResult(); } - /*------------jun15------------------*/ @@ -405,7 +403,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath, $builder->where('POMast.Status !=', PO_AMENDED); // $builder->orderBy('POMast.Status !=',PO_AMENDED); } - $builder->orderBy('POMast.PODate', 'desc'); + $builder->orderBy('POMast.CreatedDate', 'desc'); $query = $builder->get(); $result = $query->getResult(); diff --git a/app/Views/BatchcardHistAdd.php b/app/Views/BatchcardHistAdd.php index 226b965a..4b96088a 100755 --- a/app/Views/BatchcardHistAdd.php +++ b/app/Views/BatchcardHistAdd.php @@ -276,7 +276,7 @@ $("#machs_category").change(function(){ $("#machs_pono").change(function(){ var machine_pono = $(this).val(); //alert(machine_pono); - + $('#loader').show(); $.ajax({ data:{id:machine_pono}, type:"POST", @@ -295,6 +295,7 @@ $("#machs_pono").change(function(){ hist_supplier = arr.SupplierID+'-'+arr.SupplierName; }); } + $('#loader').hide(); $("#machs_podate").val(hist_podate); $("#machs_supplier").val(hist_supplier); diff --git a/app/Views/BatchcardHistEdit.php b/app/Views/BatchcardHistEdit.php index 072c905b..27b31c91 100755 --- a/app/Views/BatchcardHistEdit.php +++ b/app/Views/BatchcardHistEdit.php @@ -443,7 +443,8 @@ $("#machs_category").change(function(){ $("#machs_pono").change(function(){ var machine_pono = $(this).val(); //alert(machine_pono); - + $('#loader').show(); + $.ajax({ data:{id:machine_pono}, type:"POST", @@ -462,6 +463,7 @@ $("#machs_pono").change(function(){ hist_supplier = arr.SupplierID+'-'+arr.SupplierName; }); } + $('#loader').hide(); $("#machs_podate").val(hist_podate); $("#machs_supplier").val(hist_supplier); @@ -520,12 +522,14 @@ function deleted(deleteid) { var fileid = $("#hidefileid"+number).val(); var filename = $("#machs_filename"+number).val(); + $('#loader').show(); $.ajax({ data:{id:fileid,name:filename}, type:"POST", url:"batchcard/Removefiledetails", success:function(data) { + $('#loader').hide(); } }); diff --git a/app/Views/BatchcardMaintEdit.php b/app/Views/BatchcardMaintEdit.php index df98ce21..47d9a303 100755 --- a/app/Views/BatchcardMaintEdit.php +++ b/app/Views/BatchcardMaintEdit.php @@ -592,12 +592,15 @@ function deleted(deleteid) { var fileid = $("#hidefileid"+number).val(); var filename = $("#machs_filename"+number).val(); + $('#loader').show(); $.ajax({ data:{id:fileid,name:filename}, type:"POST", url:"batchcard/Removefiledetails", success:function(data) { + $('#loader').hide(); + } }); diff --git a/app/Views/Editmaterialinspectionreport.php b/app/Views/Editmaterialinspectionreport.php index 3b3c535d..36d8d4fd 100755 --- a/app/Views/Editmaterialinspectionreport.php +++ b/app/Views/Editmaterialinspectionreport.php @@ -514,8 +514,8 @@ function updatemrir() { if(validate()) { - $('#content').loader('show'); - //alert("update function worked "); + $('#loader').show();sss + //alert("update function worked "); $.ajax({ data:$('.MRIR').serialize(), type:"POST", @@ -524,6 +524,8 @@ function updatemrir() success:function(data){ //alert("success function worked "); + $('#loader').hide(); + if(data){ $('#content').loader('hide'); alert(data); diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index fba5c928..78b41d30 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -377,6 +377,7 @@ if (!empty($getlogpodtl)) { }); } var d = $('#drpSupplier').val(); + $('#loader').show(); $.ajax({ url: "VerifyWithSupplierForPendingPO", type: 'POST', @@ -385,6 +386,8 @@ if (!empty($getlogpodtl)) { materialcode: id }, success: function(response) { + $('#loader').hide(); + if (response) alert(response); } }); @@ -421,6 +424,7 @@ if (!empty($getlogpodtl)) { }); } var d = $('#drpSupplier').val(); + $('#loader').show(); $.ajax({ url: "VerifyWithSupplierForPendingPO", type: 'POST', @@ -429,6 +433,8 @@ if (!empty($getlogpodtl)) { materialcode: id }, success: function(response) { + $('#loader').hide(); + if (response) alert(response); } }); @@ -2773,6 +2779,7 @@ if (!empty($getlogpodtl)) { } $('#txtDeletedRow').val(DelRows); + $('#loader').show(); $.ajax({ data: { id: id @@ -2781,9 +2788,11 @@ if (!empty($getlogpodtl)) { url: "purchaseorder/DeletePODetails", success: function(data) { if (data) { - // $('#content').loader('hide'); + $('#loader').hide(); alert(data); } else { + $('#loader').hide(); + alert("Error"); } @@ -2967,7 +2976,7 @@ if (!empty($getlogpodtl)) { // return false; // } else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { - alert('Please Enter Other Payment Details'); + alert('Please Enter Payable Terms'); $('#Otherpayment').focus(); return false; } else if ($('#editdescofpo').val().trim() == '') { @@ -2977,6 +2986,7 @@ if (!empty($getlogpodtl)) { } else { // $('#content').loader('show'); var formData = new FormData($('.ServicePO')[0]); + $('#loader').show(); $.ajax({ // data: $('.ServicePO').serialize(), type: "POST", @@ -2987,7 +2997,7 @@ if (!empty($getlogpodtl)) { success: function(data) { // console.log(data); if (data) { - // $('#content').loader('hide'); + $('#loader').hide(); alert(data); $('#txtRowCount').val(''); $('#txtDeletedRow').val(''); @@ -2997,7 +3007,7 @@ if (!empty($getlogpodtl)) { window.location = "purchaseorderListing"; } else { - // $('#content').loader('hide'); + $('#loader').hide(); alert("Error"); } @@ -3459,7 +3469,8 @@ if (!empty($getlogpodtl)) { // formData.append('param6',param6); // $('.content').loader('show'); - $.ajax({ + $('#loader').show(); + $.ajax({ data: formData, type: "POST", url: "servicepurchaseorder/uploadfile", @@ -3469,8 +3480,8 @@ if (!empty($getlogpodtl)) { success: function(data) { if (data) { alert(data); + $('#loader').hide(); window.location.reload(); - // $('.content').loader('hide'); //$('#spl').find('td').eq(1).text(filename[2]); $('#EditServiceSplPOModel').modal('hide'); } @@ -3511,7 +3522,8 @@ if (!empty($getlogpodtl)) { // formData.append('igr',igr); // $('.content').loader('show'); - $.ajax({ + $('#loader').show(); + $.ajax({ data: formData, type: "POST", url: "servicepurchaseorder/addfileuplod", diff --git a/app/Views/Favourite.php b/app/Views/Favourite.php index 305defba..c6c59a50 100755 --- a/app/Views/Favourite.php +++ b/app/Views/Favourite.php @@ -1158,7 +1158,7 @@ function save(url,name){ // console.log(span[0].className); // alert(count++); count = parseInt(fav_count)+parseInt(count)+1; - $('#content').loader('show'); + $('#loader').show(); //alert(count); window.location.reload(); if(count <= 8){ @@ -1170,8 +1170,8 @@ function save(url,name){ url:'user/favouriteadd', success:function(data){ - $('#content').loader('hide'); - alert(data); + $('#loader').hide(); + alert(data); } @@ -1186,7 +1186,7 @@ function save(url,name){ //console.log(span[0].className); //alert("else"); count = parseInt(fav_count)-parseInt(count)-1; - $('#content').loader('show'); + $('#loader').show(); window.location.reload(); // count--; //alert("else"+count); @@ -1200,7 +1200,7 @@ function save(url,name){ cache:false, url:'user/favouriteadd', success:function(data){ - $('#content').loader('hide'); + $('#loader').hide(); } diff --git a/app/Views/action_report.php b/app/Views/action_report.php index 6c80d470..1d666918 100755 --- a/app/Views/action_report.php +++ b/app/Views/action_report.php @@ -1,910 +1,711 @@ - + - - - - - - -
-
-
- -
-
-

ACTION REPORT

-
- -
- - -
- -
- -
- - 'form-label-left action_report ','name' => 'action_report','id' => 'action_report'); - - echo form_open(base_url().'/purchaseorder/Action_Report/',$attributes); - ?> - -
-
- - - - SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; - - // endforeach; - // } - - // echo form_dropdown('DEPTFN', $options2,set_value('DEPTFN',$SupId),'id="DEPTFN"' ,'required="true"' ,'class="form-control select2'); - - $data = array('name' => 'Department','value' => set_value('Department'),'id'=>'Department', 'class' => 'form-control' ,'required' => 'true'); - echo form_input($data); - - ?> - -
- +
+
+
+
+ 'form-label-left action_report ', 'name' => 'action_report', 'id' => 'action_report'); + echo form_open(base_url() . '/purchaseorder/Action_Report/', $attributes); + ?> +
+
+ + SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; + // endforeach; + // } + // echo form_dropdown('DEPTFN', $options2,set_value('DEPTFN',$SupId),'id="DEPTFN"' ,'required="true"' ,'class="form-control select2'); + $data = array('name' => 'Department', 'value' => set_value('Department'), 'id' => 'Department', 'class' => 'form-control', 'required' => 'true'); + echo form_input($data); + ?> +
+ -
- - 'Date','value' => set_value('Date',$CurrentDate),'id'=>'Date', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); +
+ + 'Date', 'value' => set_value('Date', $CurrentDate), 'id' => 'Date', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;'); echo form_input($data); - ?> -
-
- - -
- 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); - // echo form_input($data); - $data = array('name' => 'AUDITOR','value' => set_value('AUDITOR'),'id'=>'AUDITOR', 'class' => 'form-control' ,'required' => 'true'); - echo form_input($data); - ?> -
- -
- -
- - -
- 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); - // echo form_input($data); - $data = array('name' => 'AUDITEE','value' => set_value('AUDITEE'),'id'=>'AUDITEE', 'class' => 'form-control' ,'required' => 'true'); - echo form_input($data); - ?> -
- -
-
-
-
- - -
- 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); - // echo form_input($data); - $data = array('name' => 'IQAREF','value' => set_value('IQAREF'),'id'=>'IQAREF', 'class' => 'form-control' ,'required' => 'true'); - echo form_input($data); - ?> -
- -
-
- -
- 'ObjectiveEvidence','value' => set_value('ObjectiveEvidence',$ObjectiveEvidence),'id'=>'ObjectiveEvidence', 'class' => 'form-control' ,'required' => 'true', 'rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> -
-
- - -
-
- -
-
-
- - -
-
Disposition Action Plan
- -
-
- - - Add Disposition Action - - - - - - - -
-
-
-
- -
- - - - - - - - - - - - - - - -
S.NoActionRespTargetAction
-
- - -
-
Root Cause (s)
- -
-
- Add Root Cause - - - - - - -
-
-
-
- -
- - - - - - - - - - - - - - - -
S.NoRootCauseAction
-
- - -
-
Counter Measure Action Plan
- -
-
- Add Counter Measure Action - - - - - - - -
-
-
-
- -
- - - - - - - - - - - - - - -
S.NoActionRespTarget
-
- - - - Effectiveness of Corrective Action Taken -
- -
- 'ReviewDetails','value' => set_value('ReviewDetails'),'id'=>'ReviewDetails', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' ); - echo form_textarea($data); - ?> -
-
- -
+ ?> +
+
+ +
+ 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); + // echo form_input($data); + $data = array('name' => 'AUDITOR', 'value' => set_value('AUDITOR'), 'id' => 'AUDITOR', 'class' => 'form-control', 'required' => 'true'); + echo form_input($data); + ?> +
+
+
+ +
+ 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); + // echo form_input($data); + $data = array('name' => 'AUDITEE', 'value' => set_value('AUDITEE'), 'id' => 'AUDITEE', 'class' => 'form-control', 'required' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+
- NCR Closed - -
-
- + 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); + // echo form_input($data); + $data = array('name' => 'IQAREF', 'value' => set_value('IQAREF'), 'id' => 'IQAREF', 'class' => 'form-control', 'required' => 'true'); + echo form_input($data); + ?> +
+
+
+ +
+ 'ObjectiveEvidence', 'value' => set_value('ObjectiveEvidence', $ObjectiveEvidence), 'id' => 'ObjectiveEvidence', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40'); + echo Form_textarea($data); + ?> +
+
+ +
+
- - - -
- -
- 'Comments','value' => set_value('Comments'),'id'=>'Comments', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' ); - echo form_textarea($data); - ?> -
-
- - - - - - - - -
-   Save -
- -
- -
-
+ + +
+
+ Disposition Action Plan +
+ +
+
+ Add Disposition Action + + + + +
+
+
+
+
+ + + + + + + + + + + + + + +
S.NoActionRespTargetAction
+
+ +
+
+ Root Cause (s) +
+ +
+
+ Add Root Cause + + + +
+
+
+
+
+ + + + + + + + + + + +
S.NoRootCauseAction
+
+ +
+
+ Counter Measure Action Plan +
+ +
+
+ Add Counter Measure Action + + + + +
+
+
+
+
+ + + + + + + + + + + + + +
S.NoActionRespTarget
+
+ Effectiveness of Corrective Action Taken +
+ +
+ 'ReviewDetails', 'value' => set_value('ReviewDetails'), 'id' => 'ReviewDetails', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); + echo form_textarea($data); + ?> +
+
+
+
+ NCR Closed + +
+
+
+ +
+ 'Comments', 'value' => set_value('Comments'), 'id' => 'Comments', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); + echo form_textarea($data); + ?> +
+
+ + + + +
+   Save +
+ + + + + + + - - - \ No newline at end of file + // function DeleteActionRow(RowId) + // { + // alert(RowId) + // var id=[]; + // var tr = document.getElementById(RowId); + // tr.parentNode.removeChild(tr); + // } + \ No newline at end of file diff --git a/app/Views/addEmployee.php b/app/Views/addEmployee.php index bfd19d4a..a8bb3e6a 100755 --- a/app/Views/addEmployee.php +++ b/app/Views/addEmployee.php @@ -1314,6 +1314,7 @@ $("#emailid").change(function() { var id = $('#emailid').val(); if (validateEmail()) { + $('#loader').show(); $.ajax({ data: { id: id @@ -1337,9 +1338,8 @@ $("#emailid").change(function() { alert('please edit the emailid in the edit employee screen'); window.location = 'employeedetails/employeeListing'; } - } - + $('#loader').hide(); } }); diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index 2ad0cf4a..5a911e85 100755 --- a/app/Views/addEmployeenew.php +++ b/app/Views/addEmployeenew.php @@ -1279,6 +1279,7 @@ var id = $('#emailid').val(); if (validateEmail()) { + $('#loader').show(); $.ajax({ data: { id: id @@ -1304,7 +1305,7 @@ } } - + $('#loader').hide(); } }); @@ -1316,6 +1317,7 @@ var id = $('#panno').val(); if (id != '') { + $('#loader').show(); $.ajax({ data: { id: id @@ -1324,6 +1326,7 @@ type: "POST", url: "employeePANExist", success: function(data) { + $('#loader').hide(); if (data) { // alert( data+""+" Employee already exists in the database.Please Change the Pan Card Number"); // $('#panno').val(''); @@ -1358,6 +1361,7 @@ var id = $('#aadharno').val(); if (id != '') { + $('#loader').show(); $.ajax({ data: { id: id @@ -1366,6 +1370,7 @@ type: "POST", url: "employeecheckAadharNoExist", success: function(data) { + $('#loader').hide(); if (data) { // alert( data+""+" Employee already exists in the database.Please Change the Aadhar card Number"); // $('#aadharno').val(''); @@ -1480,6 +1485,7 @@ console.log('Combined Form Data:', combinedFormData); // Log the combined form data for debugging // Now you can send the combined data via AJAX + $('#loader').show(); $.ajax({ type: 'POST', url: 'addNewEmployee', // Replace with your form submission URL @@ -1489,6 +1495,7 @@ success: function(response) { console.log('Form submitted successfully:', response); // Handle the success scenario + $('#loader').hide(); if (response) { window.location.href = ''; } else { @@ -1496,6 +1503,7 @@ } }, error: function(error) { + $('#loader').hide(); console.log('Form submission failed:', error); // Handle the error scenario } diff --git a/app/Views/addRawMaterial.php b/app/Views/addRawMaterial.php index 8693ce71..37fdcbe3 100755 --- a/app/Views/addRawMaterial.php +++ b/app/Views/addRawMaterial.php @@ -235,7 +235,7 @@ //material = material.replace(/\s*$/,""); var material = materialname.replace(/ /g, ''); //alert(m.length+" "+m+" "+s+" "+s.length); - $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { id: material @@ -247,7 +247,7 @@ //alert(count); if (count > 2) { - $('#content').loader('hide'); + $('#loader').hide(); alert('Material name already existed ! '); var related_name = ""; @@ -260,13 +260,13 @@ alert("'" + materialname + "' - related materials are , " + " \n \n" + related_name); $("#MaterialName").focus(); } else { - $('#content').loader('hide'); + $('#loader').hide(); // alert("empty data"); } }, error: function() { - $('#content').loader('hide'); + $('#loader').hide(); alert("Error Occur"); } }); diff --git a/app/Views/addSupplier.php b/app/Views/addSupplier.php index 3feb1215..631f85db 100755 --- a/app/Views/addSupplier.php +++ b/app/Views/addSupplier.php @@ -260,7 +260,7 @@ $('#supplierName').change(function() { var suppliername = $('#supplierName').val(); var supplier = suppliername.replace(/ /g, ''); - $('#content').loader('show'); + $('#loader').show(); $.ajax({ type: "POST", url: "", @@ -270,7 +270,7 @@ success: function(data) { var count = data.length; if (count > 2) { - $('#content').loader('hide'); + $('#loader').hide(); alert('supplier already existed ! '); var related_supplier = ""; $.each(data, function(i, obj) { @@ -279,13 +279,12 @@ alert("'" + suppliername + "' - related supplier are , " + " \n \n" + related_supplier); $("#supplierName").focus(); } else { - $('#content').loader('hide'); + $('#loader').hide(); // alert('This is New Supplier! '); } - console.log(data); }, error: function() { - $('#content').loader('hide'); + $('#loader').hide(); // alert("Error Occur"); } }); diff --git a/app/Views/addUser.php b/app/Views/addUser.php index 726b4d63..c55034f6 100755 --- a/app/Views/addUser.php +++ b/app/Views/addUser.php @@ -161,6 +161,7 @@ console.log(empID); if (empID) { + $('#loader').show(); $.ajax({ url: "fetchEmployeeDetails", type: 'POST', @@ -168,21 +169,20 @@ EmpID: empID }, success: function(data) { - console.log(data); - if (data.success) { - console.log(data.userInfo[0].FirstName); - $("#FirstName").val(data.userInfo[0].FirstName); $("#LastName").val(data.userInfo[0].LastName); $("#Designation").val(data.userInfo[0].Designation); $("#MailID").val(data.userInfo[0].EmailId); $("#ContactNo").val(data.userInfo[0].ContactNumber); + $('#loader').hide(); } else { + $('#loader').hide(); alert('Employee not found'); } }, error: function() { + $('#loader').hide(); alert('Failed to fetch employee details'); } }); diff --git a/app/Views/addasset.php b/app/Views/addasset.php index 04fe0eed..6abc9ee0 100755 --- a/app/Views/addasset.php +++ b/app/Views/addasset.php @@ -226,6 +226,7 @@ // alert(PONO); if (PONO) { + $('#loader').show(); $.ajax({ type: 'POST', @@ -233,6 +234,8 @@ data: 'PONO=' + PONO, dataType: 'json', success: function(data) { + $('#loader').hide(); + console.log(data); var line = ''; $('#MaterialCode').empty(); @@ -270,14 +273,12 @@ //line +='' if (line) { + $('#loader').show(); $.ajax({ type: 'POST', url: "assetdetails/getline", data: 'line=' + line, success: function(data) { - - - $.each(JSON.parse(data), function(i, item) { if (id == item.LineItemNo) { @@ -324,6 +325,7 @@ //line =''; // $('#POLineItem').append(line); + $('#loader').hide(); }); diff --git a/app/Views/addcomplaint.php b/app/Views/addcomplaint.php index 75b11e1c..20aa7c26 100755 --- a/app/Views/addcomplaint.php +++ b/app/Views/addcomplaint.php @@ -245,7 +245,7 @@ $actcount = (int)$count + 1; var Action = $('#Action').val(); var Remark = $('#Remark').val(); //var remarks= $('#Remark').val(); - $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { @@ -261,10 +261,7 @@ $actcount = (int)$count + 1; type: "POST", url: "purchaseorder/SaveComplaint", success: function(data) { - $('#content').loader('hide'); - - - + $('#loader').show(); if (data) { alert(data); window.location = "Nonconfirmativelist"; diff --git a/app/Views/addenquiry.php b/app/Views/addenquiry.php index 74b8b366..b1e06e28 100755 --- a/app/Views/addenquiry.php +++ b/app/Views/addenquiry.php @@ -250,7 +250,8 @@ function Save() var reqqty = $('#ReqQty').val(); var supqty = $('#SupQty').val(); var remarks= $('#Remark').val(); - $('#content').loader('show'); + // $('#content').loader('show'); + $('#loader').show(); $.ajax( { @@ -260,10 +261,8 @@ function Save() url:"purchaseorder/SaveEnquiry", success:function(data) { - $('#content').loader('hide'); - - - + // $('#content').loader('hide'); + $('#loader').hide(); if(data) { alert(data); diff --git a/app/Views/addnewIncomeExpense.php b/app/Views/addnewIncomeExpense.php index 9f8102da..30be5dd5 100755 --- a/app/Views/addnewIncomeExpense.php +++ b/app/Views/addnewIncomeExpense.php @@ -608,16 +608,16 @@ $(document).ready(function(){ var selectedvalue = $('input[name=merchant]').val(); if(selectedvalue != ' ' ) { - + $('#loader').show(); $.ajax({ data:{id:selectedvalue}, type:"POST", url:"cashbook/getSupplierDtls", success:function(data) { var supplier_gstno = ''; + $('#loader').hide(); if(data != '') { - data = JSON.parse(data); $.each(data,function(i,arr){ supplier_gstno = arr.GSTNO; @@ -790,7 +790,7 @@ $('.AddSupplier').click(function() var alternatecont = $('#AlternateContactNumber').val(); var email = $('#emailid').val(); var Address = $('#Address').val(); - $('#content').loader('show'); + $('#loader').show(); $.ajax({ data:{suppliername:suppliername,contact:contact,alternatecont:alternatecont,email:email,Address:Address}, @@ -799,12 +799,9 @@ $('.AddSupplier').click(function() success:function(data) { - // $('#content').loader('hide'); // alert(data); var alertdata=data; - $.ajax({ - type:"POST", url:"cashbook/getAllSupplier", success:function(data) @@ -823,16 +820,14 @@ $('.AddSupplier').click(function() //$("#supplier").append(html); alert(alertdata); - $('#content').loader('hide'); + $('#loader').hide(); $('#Addsup').modal('hide'); } - - }); - + $('#loader').hide(); } diff --git a/app/Views/addstorerequisitionslip.php b/app/Views/addstorerequisitionslip.php index 69bafe48..9261da62 100755 --- a/app/Views/addstorerequisitionslip.php +++ b/app/Views/addstorerequisitionslip.php @@ -1,751 +1,709 @@ format('d-m-Y'); - -// print_r($cost);die(); - ?> + $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); + $CurrentDate = $dt->format('d-m-Y'); + + // print_r($cost);die(); + ?> - - -
- -
-

-
Raise Store Requisition
- -

-
-
-
-
- 'form-label-left requistion ','name' => 'requistion','id' => 'requistion'); - - echo form_open(base_url().'storerequisitionlist - / addstores',$attributes); ?> - - -
-
- -
- - 'RequestedBy','value' => set_value('RequestedBy',$name) ,'id'=>'RequestedBy','class' => 'form-control num' ,'required' => 'true' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
- - 'DepartmentName','value' => set_value('DepartmentName',$DEPCode . "-".$DepName), 'id'=>'DepartmentName','class' => 'form-control num' ,'required' => 'true' ,'readonly' => 'true'); - echo form_input($data); - ?> -
- - - -
- - 'Date','value' => set_value('Date',$CurrentDate), 'id' =>"Date", 'class' => 'form-control num' ,'required' => 'true'); - echo form_input($data); - ?> - - -
-
- + + +
+ +
+

+
Raise Store Requisition
+ +

+
+
+
+
+ 'form-label-left requistion ', 'name' => 'requistion', 'id' => 'requistion'); + + echo form_open(base_url() . 'storerequisitionlist + / addstores', $attributes); ?> + + +
+
+ +
+ + 'RequestedBy', 'value' => set_value('RequestedBy', $name), 'id' => 'RequestedBy', 'class' => 'form-control num', 'required' => 'true', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ + 'DepartmentName', 'value' => set_value('DepartmentName', $DEPCode . "-" . $DepName), 'id' => 'DepartmentName', 'class' => 'form-control num', 'required' => 'true', 'readonly' => 'true'); + echo form_input($data); + ?> +
+ + + +
+ + 'Date', 'value' => set_value('Date', $CurrentDate), 'id' => "Date", 'class' => 'form-control num', 'required' => 'true'); + echo form_input($data); + ?> + + +
+
+ + + + 'Select Cost Center Name'); + //print_r( $options); + + if (!empty($cost)) { + foreach ($cost as $SID): + // echo $SID->ConfigValue; + $Costs[$SID->CostCenterCode] = $SID->CostCenterCode . '-' . $SID->CostCenterName; + + endforeach; + } + echo form_dropdown('CostCenter', $Costs, set_value('CostCenter'), 'id="CostCenter"', 'class="form-control select2"'); + + ?> +
+ + -
-
-
-
- -
- -
-
- Add Line Item - - - - - - - -
-
-
-
- -
- - - - - - - - - - - - - -
S.NoItem CodeDescriptionUOMQuantityRemarksAction
-
- - - -
-
- - - - - - -   Save - - -   Submit - - - - -
- -
-
-
- - - - - - - - - - - - - - - - - - - +
+
+
+
+ +
+ +
+
+ Add Line Item + + + + + + + +
+
+
+
+ +
+ + + + + + + + + + + + + +
S.NoItem CodeDescriptionUOMQuantityRemarksAction
+
+ + +
+
+ + + + + + +   Save + + +   Submit + + + + +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index 41b16547..65397ab7 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -1928,6 +1928,7 @@ if (!empty($INRSYMBOL)) { }); var d = $('#drpSupplier').val(); + $('#loader').show(); $.ajax({ url: "VerifyWithSupplierForPendingPO", type: 'POST', @@ -1936,6 +1937,7 @@ if (!empty($INRSYMBOL)) { materialcode: selectedMaterialCode }, success: function (response) { + $('#loader').hide(); if (response) alert(response); } }); @@ -2022,7 +2024,7 @@ if (!empty($INRSYMBOL)) { } else { $("#POType").val(input); - // $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { input: input @@ -2062,7 +2064,7 @@ if (!empty($INRSYMBOL)) { } - // $('#content').loader('hide'); + $('#loader').hide(); } @@ -2078,7 +2080,7 @@ if (!empty($INRSYMBOL)) { if (id != '0' && ReqType != '-1') { - // $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { id: id, @@ -2088,10 +2090,10 @@ if (!empty($INRSYMBOL)) { url: "serviceAvilBudgetAmount", success: function (data) { if (data) { - // $('#content').loader('hide'); + $('#loader').hide(); $("#AvalBuget").val(data ? parseFloat(data).toFixed(2) : 0); } else { - // $('#content').loader('hide'); + $('#loader').hide(); //alert("Error"); } @@ -2129,6 +2131,7 @@ if (!empty($INRSYMBOL)) { }); var d = $('#drpSupplier').val(); + $('#loader').show(); $.ajax({ url: "VerifyWithSupplierForPendingPO", type: 'POST', @@ -2137,6 +2140,7 @@ if (!empty($INRSYMBOL)) { materialcode: selectedRevenueMaterialCode }, success: function (response) { + $('#loader').hide(); if (response) alert(response); } }); @@ -6047,7 +6051,7 @@ if (!empty($INRSYMBOL)) { function Save() { $('#txtStatus').val(''); if (validate()) { - // $('#content').loader('show'); + $('#loader').show(); var formData = new FormData($('.CreatePO')[0]); $.ajax({ @@ -6059,14 +6063,16 @@ if (!empty($INRSYMBOL)) { url: "purchaseorder/addNewPurchaseOrder", success: function (data) { if (data) { - // $('#content').loader('hide'); - // alert(data); + $('#loader').hide(); + // alert(data); //$('#txtRowCount').val(''); //$('#txtDeletedRow').val(''); //window.location = "Requisition"; } else { + $('#loader').hide(); + alert("Error"); } @@ -6266,7 +6272,7 @@ if (!empty($INRSYMBOL)) { CostArray = ''; var id = $('#DepartmentName').val(); if (id != '0') { - // $('#content').loader('show'); + $('#loader').show(); $.ajax({ @@ -6287,10 +6293,11 @@ if (!empty($INRSYMBOL)) { }); - // $('#content').loader('hide'); + $('#loader').hide(); } else { + $('#loader').hide(); alert("Error"); } @@ -6317,7 +6324,7 @@ if (!empty($INRSYMBOL)) { if (id != '0' && ReqType != '-1') { - // $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { id: id, @@ -6327,11 +6334,11 @@ if (!empty($INRSYMBOL)) { url: "serviceAvilBudgetAmount", success: function (data) { if (data) { - // $('#content').loader('hide'); + $('#loader').hide(); $("#AvalBuget").val(parseFloat(data).toFixed(2)); } else { - // $('#content').loader('hide'); - // alert("Error"); + $('#loader').hide(); + alert("Error"); } } @@ -6354,7 +6361,7 @@ if (!empty($INRSYMBOL)) { if (id != '0' && ReqType != '-1') { - // $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { id: id, @@ -6364,11 +6371,11 @@ if (!empty($INRSYMBOL)) { url: "serviceAvilBudgetAmount", success: function (data) { if (data) { - // $('#content').loader('hide'); + $('#loader').hide(); $("#AvalBuget").val(data ? parseFloat(data).toFixed(2) : 0); } else { - // $('#content').loader('hide'); - // alert("Error"); + $('#loader').hide(); + alert("Error"); } } @@ -7084,6 +7091,7 @@ if (!empty($INRSYMBOL)) { return false; } else { // Submit the form using AJAX + $('#loader').show(); $.ajax({ url: "emergencypurchaseorder/addNewServicePurchaseOrder", type: "POST", @@ -7092,7 +7100,7 @@ if (!empty($INRSYMBOL)) { contentType: false, // Prevent jQuery from setting the content type header success: function (data) { // Handle the server response - // $('#content').loader('hide'); + $('#loader').hide(); if(data){ alert(data); } @@ -7105,7 +7113,7 @@ if (!empty($INRSYMBOL)) { }, error: function (xhr, status, error) { // Handle errors - // $('#content').loader('hide'); + $('#loader').hide(); alert("Error: " + error); } }); @@ -7164,6 +7172,7 @@ if (!empty($INRSYMBOL)) { return false; } else { // Submit the form using AJAX + $('#loader').show(); $.ajax({ url: "emergencypurchaseorder/addNewRevenuePurchaseOrder", type: "POST", @@ -7173,8 +7182,7 @@ if (!empty($INRSYMBOL)) { success: function (data) { // Handle the server response // alert(data); - console.log(data); - + $('#loader').hide(); $('#txtRowCount1').val(''); $('#txtDeletedRow1').val(''); $('#SpcialInstruction').val(''); @@ -7276,7 +7284,7 @@ if (!empty($INRSYMBOL)) { var EditReqType = $('#EditReqNo').val(); if (getCostId != '0') { - // $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { id: getCostId, @@ -7286,10 +7294,10 @@ if (!empty($INRSYMBOL)) { url: "serviceAvilBudgetAmount", success: function (data) { if (data) { - // $('#content').loader('hide'); + $('#loader').hide(); $("#EditAvlBudAmt").val(data ? data : 0); } else { - // $('#content').loader('hide'); + $('#loader').hide(); alert("Error"); } @@ -7319,6 +7327,7 @@ if (!empty($INRSYMBOL)) { }); var d = $('#drpSupplier').val(); + $('#loader').show(); $.ajax({ url: "VerifyWithSupplierForPendingPO", type: 'POST', @@ -7327,6 +7336,7 @@ if (!empty($INRSYMBOL)) { materialcode: editselectedMaterialCode }, success: function (response) { + $('#loader').hide(); if (response) alert(response); } }); @@ -7435,6 +7445,7 @@ if (!empty($INRSYMBOL)) { }); var d = $('#drpSupplier').val(); + $('#loader').show(); $.ajax({ url: "VerifyWithSupplierForPendingPO", type: 'POST', @@ -7443,6 +7454,7 @@ if (!empty($INRSYMBOL)) { materialcode: editselectedMaterialCode }, success: function (response) { + $('#loader').hide(); if (response) alert(response); } }); diff --git a/app/Views/approvalstorerequisitionslip.php b/app/Views/approvalstorerequisitionslip.php index 3b5b14a8..926b6508 100755 --- a/app/Views/approvalstorerequisitionslip.php +++ b/app/Views/approvalstorerequisitionslip.php @@ -244,7 +244,7 @@ $("#ReqDate").val(''); $("#Desigination").val(''); - $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { id: ReqId @@ -254,8 +254,8 @@ url: "storerequisitionlist/ViewRequest", success: function(json) { //success:function(data) { - $('#content').loader('hide'); - //alert(json.Requist); + $('#loader').hide(); + //alert(json.Requist); if (json.Requist != '') { //alert(json.Requist[0]['Requestedby']) ; $("#Requestedby").val(json.Requist[0]['FirstName']); @@ -297,7 +297,7 @@ var answer = confirm(strMsg); if (answer) { - $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { id: id, @@ -307,10 +307,11 @@ url: "storerequisitionlist/ApproveRequest?Status=" + Status, success: function(data) { if (data) { - $('#content').loader('hide'); + $('#loader').hide(); alert(data); location.reload(); } else { + $('#loader').hide(); alert("Error"); } diff --git a/app/Views/bankamountpaid.php b/app/Views/bankamountpaid.php index f2672108..21b32699 100755 --- a/app/Views/bankamountpaid.php +++ b/app/Views/bankamountpaid.php @@ -1,392 +1,371 @@ - - financial_year; - - } ?> - +foreach ($financialyear as $item) { + $finyear = $item->financial_year; +} ?> + - - + .dataTables_filter { + width: 50%; + float: right; + text-align: right; + } + + .dataTables_paginate { + width: 50%; + float: right; + text-align: right; + } + + div.dt-buttons { + position: relative; + float: right; + + } + - - - - -
-
-
- - -
- -
-
-
- - - - - + + + + + + - - - - - - - - - + + + + + + + + + + "aaSorting": [ + [0, "desc"] + ], + "info": true, + "autoWidth": false, + orderCellsTop: true, + "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + + "<'row'<'col-md-6'><'col-md-6'>>" + + "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", + buttons: [ + { + extend: 'excelHtml5', + footer: 'true', + messageTop: $('h4').text(), + title: 'Amount Received Reports', + exportOptions: { + columns: ':visible' + } + }, + 'colvis' + ] + }); + }); + \ No newline at end of file diff --git a/app/Views/bankamountunpaid.php b/app/Views/bankamountunpaid.php index 9c35661c..817f50c5 100755 --- a/app/Views/bankamountunpaid.php +++ b/app/Views/bankamountunpaid.php @@ -1,574 +1,572 @@ financial_year; +foreach ($financialyear as $item) { + $finyear = $item->financial_year; } ?> - - - - + + +
-
- -
-
-
- - - - - - - - - + + - + + + + + + - // '' +item.FilePath+""> +'' - - ''; - - - - }); - - $("#tbleAppend1").empty(); - $('#Inwardgateregistertable1 > tbody').append(trHTML); -} - }); + - + buttons: [{ + extend: 'excelHtml5', + footer: 'true', + messageTop: $('h4').text(), + title: 'Unpaid Purchase Order Report', + exportOptions: { + columns: ':visible' + } + }, + 'colvis' + ] + }); /** datatable closed */ + }); /** ready closed */ + \ No newline at end of file diff --git a/app/Views/bankcash.php b/app/Views/bankcash.php index f9972654..a72ac04a 100755 --- a/app/Views/bankcash.php +++ b/app/Views/bankcash.php @@ -602,6 +602,7 @@ function Save() { if(totalvalue<=bankdebitamount) { + $('#loader').show(); $.ajax( { data:{date:date,pono:pono,sname:suppliername,tot:totalordervalue,aa:amountpaid,ip:invoicepaymet,rc:rowCount,tpv:totalvalue,bda:bankdebitamount,bi:bid,check:check,rw:rw}, @@ -609,6 +610,7 @@ function Save() url:"cashbook/receipt", success:function(data) { + $('#loader').hide(); if(data) { alert(data); diff --git a/app/Views/bankcashnew.php b/app/Views/bankcashnew.php index 3072e65f..272c61f7 100755 --- a/app/Views/bankcashnew.php +++ b/app/Views/bankcashnew.php @@ -1,358 +1,352 @@ - + -
- - - -
-
-
- Back -
-
-
- -
- -
-
-

-
Bank Statement(Income and Expenses)
-

-
-
- -
+ -
- - - - - - - - - - - - - - - - - - - - - - - - - -
Payment IDPayment ModePayment TypePayment Amount (₹)Payment date Naration

Bank

-
+ +
+
+
+ Back +
+
+
+ +
+ +
+
+

+
Bank Statement(Income and Expenses)
+

+

+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Payment IDPayment ModePayment TypePayment Amount (₹)Payment date Naration
+

+ 		Bank +

+ 		+

+ 		+

+ 		+

+

-
- -
+
+
+
- - -
-
- Select Account type:

- -
- PAYMENT -
- -
- RECEIPT         -
- -
-
- -
-
- Account Name Select: *

- -
-
- -
-
- Date:*

- -
-
-
-
- AAA*

- -
-
- - -
- -
- - +
-
- Select Supplier: *

- +
+ Select Account type:

+ +
+ PAYMENT +
+ +
+ RECEIPT         +
+ +
+ +
+
+ Account Name Select: *

+ +
+
+ +
+
+ Date:*

+ +
+
+
+
+ AAA*

+ +
+
+ + +
+ +
+ + +
+
+ Select Supplier: *

+ +
Add New Supplier @@ -425,191 +419,193 @@ else -
-
-Add Line Item - +
+
-
- Total Amount:*

- - +
+ Total Amount:*

+ +
- Description:

- - -
+
+
+
- -
- +
- GST + GST
-
- -
-
- +
+ + + + + + + + +
+
+
+
+
+ data: { + suppliername: suppliername, + contact: contact, + alternatecont: alternatecont, + email: email, + Address: Address + }, + type: "POST", + url: "cashbook/addNewSupplierCash", + + success: function(data) { + // $('#content').loader('hide'); + // alert(data); + // location.reload(); - - - - + var alertdata = data; + + $.ajax({ + + type: "POST", + url: "cashbook/getAllSupplier", + success: function(data) { + var html = ''; + $('#supplier').find('option:not(:first)').remove(); + + $.each(JSON.parse(data), function(supDet, supobj) { + + // html +=""; + + $("#supplier").append($('').val(supobj.SupplierID).html(supobj.SupplierID + ' - ' + supobj.SupplierName)); + + }); + + //$("#supplier").append(html); + alert(alertdata); + // $('#supplier option[value=""]').prop('selected', true); + $('#loader').hide(); + $('#Addsup').modal('hide'); + + + + } + + + }); + + } + + }); + + + } + }); + \ No newline at end of file diff --git a/app/Views/bankcashreceipt.php b/app/Views/bankcashreceipt.php index e4e24c37..b098679c 100755 --- a/app/Views/bankcashreceipt.php +++ b/app/Views/bankcashreceipt.php @@ -1,703 +1,675 @@ - - financial_year; - - } ?> - + +foreach ($cash as $c) { +} +foreach ($bankid as $i) { +} +foreach ($financialyear as $item) { + $finyear = $item->financial_year; +} ?> + - - -
-
+ .dataTables_filter { + width: 50%; + float: right; + text-align: right; + } - -
- - - - + .dataTables_paginate { + width: 50%; + float: right; + text-align: right; + } - - -
- -
- - - - - - - -
-

Cashbook Receipt Report

-
- -
-
- -
- - - - -
-
+ div.dt-buttons { + position: relative; + float: right; - -
- -
- - - - -
+ } + + +
+
+ + +
+ + + + + + + +
+ +
+ + + + + + + + +
+

+

Cashbook Receipt Report

+

+
+
+ +
+
+ +
+ + + + +
+
+ + +
+ +
+ + + + +
+
+
+ + +
+
+ + +
+
+   Save + +
-
- - -
-
- - -
-
-   Save - -
-
-
-
- -
- - -
-
- - -
- -
-
- -
-
- - - - - - - - - - - - - - - - - - - Paymentstatus; - $balancetopay=$t->Balancetopay; - //print_r($$status); - if($status !='ST057') - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - +
+
+ +
+ + +
+
+ + +
+ +
+
+ +
+
+ +
SelectTypeDateAccount CodeTo WhomTotal (₹)Amountpaid
type?>date?>account_code?>towhom?>total?>
+ - - - - - - - - - - - - - + + + + + + + + + + + + + + + Paymentstatus; + $balancetopay = $t->Balancetopay; + //print_r($$status); + if ($status != 'ST057') { + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
Total      - - - - - -
SelectTypeDateAccount CodeTo WhomTotal (₹)Amountpaid
type ?>date ?>account_code ?>towhom ?>total ?>
Total      + + + + + +
- + +
-
-
- -
-
+
- -
-
+ +
+ + + +
+
-
+
-
- -
- - - -
- -
- +
- +
- - - - + - +
+ +
+ + + + + + + + + + - - - + - - + }); + \ No newline at end of file diff --git a/app/Views/bankdebit.php b/app/Views/bankdebit.php index b46d93e1..5f63e974 100755 --- a/app/Views/bankdebit.php +++ b/app/Views/bankdebit.php @@ -1,210 +1,222 @@ financial_year; +foreach ($financialyear as $item) { + $finyear = $item->financial_year; } ?> - - - - + + +
-
- -
- -
-
-
- Back -
-
-

View Purchase

-
- - - - - - - - - - - +
+ +
+ +
+
+
+ Back +
+ +
+

+

View Purchase

+

+
+
+
Payment IDPayment ModePayment Amount (₹)Payment date Narration
+ + - - - - - - - - - - -

Bank

-
-
+ Payment ID + Payment Mode + Payment Amount (₹) + Payment date + Narration + + + + + + + +

+ + Bank + +

+ + +

+ + +

+ + + + +
+
- -
- + +
+ - - - - - - - - - - + + + - - - - - -
- -
- - - - -
-
- -
- -
- - - - -
-
-
- - -
-
- - -
-
- - - -
-
- -
- - -
- -
-
- - - - - - - - - - - - - - - - - - - Paymentstatus; - $balancetopay=$t->Balancetopay; - $ReceivedQuantity=$t->ReceivedQuantity; - $rate=$t->total; - $Amountpaid=$t->Amountpaid; - //$rate=$t->TotalOrderValue; - if($status !='ST057') - { - ?> - - - - - - - - - - - - - - - - - - + + + +
+ +
+ + + + +
+
+ + +
+ +
+ + + + +
+
+ +
+ + +
+
+ + +
+ + + + +
+
+ +
+ + +
+ +
+
+ +
SelectIGR Created DateMaterial Received DatePONOIGRNOSupplier NameSupplier IDPO Amount (₹)Balance payable (₹)Amount Paid (₹)
created_date,0,'d-m-Y');?>materialrcvddate,0,'d-m-Y');?>pono?>igrn?>supplier_name?>Amountpaid,2)?>
+ + + + + + + + + + + + + + + + + Paymentstatus; + $balancetopay = $t->Balancetopay; + $ReceivedQuantity = $t->ReceivedQuantity; + $rate = $t->total; + $Amountpaid = $t->Amountpaid; + //$rate=$t->TotalOrderValue; + if ($status != 'ST057') { + ?> + + + + + + + + + + + + + + + + + + @@ -214,531 +226,520 @@ foreach($financialyear as $item) - - - + + + -
SelectIGR Created DateMaterial Received DatePONOIGRNOSupplier NameSupplier IDPO Amount (₹)Balance payable (₹)Amount Paid (₹)
created_date, 0, 'd-m-Y'); ?>materialrcvddate, 0, 'd-m-Y'); ?>pono ?>igrn ?>supplier_name ?>Amountpaid, 2) ?>
Total        - - -
+ + +
- -
- Save -
- + + +
+ Save +
+ +
-
-
-
-
- -
+
+
+
-
- -
- - +
-
- -
- -
- -
- -
- - - - - -
- -
- - - - - - - - - +
- - + + + + + + + + + - - + }); + \ No newline at end of file diff --git a/app/Views/bankinvoice.php b/app/Views/bankinvoice.php index 2cc28fc5..f54504e6 100755 --- a/app/Views/bankinvoice.php +++ b/app/Views/bankinvoice.php @@ -1,705 +1,704 @@ financial_year; - } ?> - - - - + + +
-
- - -
- -
-
-
- Back -
-
- -
- -

View Invoice

+
-
- - - - - - - - - - - + +
+ +
+
+
+ Back +
+
-
- - - - - - - - - -
Payment IDPayment ModePayment Amount (₹)Payment date Naration

Bank

-
-
+ -
+
+

+

View Invoice

+

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
Payment IDPayment ModePayment Amount (₹)Payment date Naration
+

+ 		Bank +

+ 		+

+ 		+

+
+
+
+ +
- - - - - - - - - + - - - - -
- -
- - - - -
-
- -
- -
- - - - -
-
- -
- - -
- - -
- - - - -
-
- + + + +
+ +
+ + + + +
+
+ + +
+ +
+ + + + +
+
+ +
+ + +
+ + +
+ + + + +
+
+ +
+
+
+ + +
+

-
- - -
- -
-
- - - - - - - - - - - - - - - - Paymentstatus; - $balancetopay=$t->Balancetopay; - if($status !='ST057') - { - ?> - - - - - - - - - - - - - - - + +
SelectDateInvoice NumberCustomer NameCustomer IDInvoice Amount (₹) Balance Receivable Amount Received
invoice_date_created,0,'d-m-Y');?>invoice_number?>client_name?>invoice_total?>invoice_total)-($t->amountreceived)?>
+ - - - - - - - - - - - - - + + + + + + + + + + + + Paymentstatus; + $balancetopay = $t->Balancetopay; + if ($status != 'ST057') { + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
Total      - - - - -
SelectDateInvoice NumberCustomer NameCustomer IDInvoice Amount (₹) Balance Receivable Amount Received
invoice_date_created, 0, 'd-m-Y'); ?>invoice_number ?>client_name ?>invoice_total ?>invoice_total) - ($t->amountreceived) ?>
Total      + + + + +
- -
-   Save -
+ + + +
+   Save +
-
- -
- -
- - -
- -
- -
+
-
- -
- -
- -
- - +
-
+
- - - - - - - - - - - + + + + + + + \ No newline at end of file + }); + \ No newline at end of file diff --git a/app/Views/bankinvoicesettlement.php b/app/Views/bankinvoicesettlement.php index 6e90d0b5..1b16f79c 100755 --- a/app/Views/bankinvoicesettlement.php +++ b/app/Views/bankinvoicesettlement.php @@ -1,331 +1,302 @@ - - financial_year; - - } ?> - +foreach ($financialyear as $item) { + $finyear = $item->financial_year; +} ?> + - + .dataTables_paginate { + width: 50%; + float: right; + text-align: right; + } + + div.dt-buttons { + position: relative; + float: right; + + } +
- -
- -
-
- - bankid; - - } - } - if(!empty($mappingcashbook)) - { - foreach($mappingcashbook as $mc) - { - $bankid=$mc->bankid; - - } - } - - - if(!empty($paidcbook)){ - - foreach($paidcbook as $pc) - { - $pcamount=$pc->total; - - } - } - - if(!empty($clearbalance)){ - + +
+ +
+
- $bankclear=$clearbalance; - - + bankid; + } + } + if (!empty($mappingcashbook)) { + foreach ($mappingcashbook as $mc) { + $bankid = $mc->bankid; + } } - if(!empty($balancetoclear)){ - - $bankbaltoclear=$balancetoclear; - - + + if (!empty($paidcbook)) { + + foreach ($paidcbook as $pc) { + $pcamount = $pc->total; + } } - - - if(!empty($invoiceramount)) - { - foreach($invoiceramount as $ia) - { - $inamount=$ia->amountreceived; - - } - } - - - $totalamount=$pcamount+$inamount; - //echo $totalamount; - ?> -
-

Bank Credit Amount Paid Report

-
-
- - -
- - - - - - - - - - - - - - - - - - -
Payment IDPayment ModePayment Amount (₹)
Bank
- - + + if (!empty($clearbalance)) { + + + $bankclear = $clearbalance; + } + if (!empty($balancetoclear)) { + + + $bankbaltoclear = $balancetoclear; + } + + + if (!empty($invoiceramount)) { + foreach ($invoiceramount as $ia) { + $inamount = $ia->amountreceived; + } + } + + + $totalamount = $pcamount + $inamount; + //echo $totalamount; + ?> + +
+

+

Bank Credit Amount Paid Report

+

+
+
+
+ + +
+ + + + + + + + + + + + + + + + + + +
Payment IDPayment ModePayment Amount (₹)
Bank
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + invoiceno; + $preBalance = $balance; + } + } + ?> + + +
DateINVOICE NOCustomer NameTotal Amount (₹)Received AmountBalance To ReceivedAction
indate, 0, 'd-m-Y'); ?>invoiceno ?>customername ?>totinvoiceamount ?>amountreceived ?> + + invoiceno) { + if ($preBalance == 0) { + $balance = $ap->totinvoiceamount - $ap->amountreceived; + echo $balance; + } else { + + $balance = $preBalance - $ap->amountreceived; + echo $balance; + } + } else { + + if ($preINV != $ap->invoiceno) { + // $preBalance =0 ; + $balance = $ap->totinvoiceamount - $ap->amountreceived; + echo $balance; + // echo $ap->invoiceno; + // echo 'elseif'; + // echo $preINV; + + } else { + $balance = $ap->totinvoiceamount - $preBalance; + echo $balance; + echo 'elseelse'; + } + } + + + ?> + + + +     +
+
+

+

Cashbook Reports

+

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DateAccount NameBankidAmount TypeTotal Amount (₹)Option (₹)Action
date ?>name ?>bankid ?>amounttype ?>total ?>cashtype ?> +     +
+
+
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - invoiceno; - $preBalance = $balance; - - - } - - } - ?> - - -
DateINVOICE NOCustomer NameTotal Amount (₹)Received AmountBalance To ReceivedAction
indate,0,'d-m-Y');?>invoiceno?>customername?>totinvoiceamount?>amountreceived?> - - invoiceno) - { - if($preBalance == 0 ) - { - $balance = $ap->totinvoiceamount - $ap->amountreceived; - echo $balance; - - } - else - { - - $balance = $preBalance - $ap->amountreceived; - echo $balance; - - } - } - else { - - if($preINV != $ap->invoiceno) - { - // $preBalance =0 ; - $balance = $ap->totinvoiceamount - $ap->amountreceived; - echo $balance; - // echo $ap->invoiceno; - // echo 'elseif'; - // echo $preINV; - - } - - else{ - $balance = $ap->totinvoiceamount - $preBalance; - echo $balance; - echo 'elseelse'; - - - } - } - - - ?> - - - -     -
-

Cashbook Reports

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
DateAccount NameBankidAmount TypeTotal Amount (₹)Option (₹)Action
date?>name?>bankid?>amounttype?>total?>cashtype?> -     -
-
-
-
- +
- +
@@ -338,65 +309,73 @@ foreach($financialyear as $item) - + { + data: { + credit: credit, + mappingid: mappingid, + invoiceno: invoiceno, + bankid: bankid, + amountreceived: amountreceived, + bankingclear: bankingclear, + bankingbalclear: bankingbalclear, + totinvoiceamount: totinvoiceamount, + balancetoreceived: balancetoreceived + }, + type: "POST", + url: "DeleteInvoice", + success: function(data) { + $('#loader').hide(); + + if (data) { + + window.location.href = "Bankingstatement"; + //location.reload(); + + } + } + }); + + } + $(document).ready(function() { + table = $('#req').DataTable({ + "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + + "<'row'<'col-md-6'><'col-md-6'>>" + + "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", + buttons: [ + + { + extend: 'excelHtml5', + footer: 'true', + messageTop: $('h3').text(), + title: 'cashbook Overall Report', + exportOptions: { + columns: ':visible' + + } + }, + + 'colvis' + ] + }); + }); + \ No newline at end of file diff --git a/app/Views/banksettlement.php b/app/Views/banksettlement.php index 130c894d..7f0f77a5 100755 --- a/app/Views/banksettlement.php +++ b/app/Views/banksettlement.php @@ -1,202 +1,192 @@ - - financial_year; +} ?> - foreach($financialyear as $item) - - { - $finyear = $item->financial_year; - - } ?> - - - + .dataTables_filter { + width: 50%; + float: right; + text-align: right; + } + + .dataTables_paginate { + width: 50%; + float: right; + text-align: right; + } + + div.dt-buttons { + position: relative; + float: right; + + } + - - - - - -
+ + + +
- -
- -
- -
-
- Back -
- - - - + +
+ +
+ +
+
+ Back +
+ + + + - +
- - -
- - - - - - + + +
+ + + + + + - - - - - - - - + + + + + -function pono(i) -{ - var igrno=$('#igrno'+i).text(); - var pono =$('#pono'+i).text(); - // alert(igrno); - // alert(pono); - // return false; - $("#Fileshow").modal('show'); - $.ajax( - - { - data:{igrno:igrno,pono:pono}, - type:"POST", - url:"cashbook/filelist", - success:function(data) - { - - var trHTML = ''; - $.each($.parseJSON(data),function (i, item) { - i=i+1; - trHTML += '' + - '' + i + '' + - - '' + item.BillNo+ '' + - '' + item.PONO+ '' + + \ No newline at end of file diff --git a/app/Views/banksettlementcash.php b/app/Views/banksettlementcash.php index 1f075c58..624ae1a4 100755 --- a/app/Views/banksettlementcash.php +++ b/app/Views/banksettlementcash.php @@ -1,511 +1,511 @@ - - financial_year; +} ?> - foreach($financialyear as $item) - - { - $finyear = $item->financial_year; - - } ?> - - - + .dataTables_filter { + width: 50%; + float: right; + text-align: right; + } + + .dataTables_paginate { + width: 50%; + float: right; + text-align: right; + } + + div.dt-buttons { + position: relative; + float: right; + + } + - - - - - -
+ + + +
- -
- -
- -
- - - - + +
+ +
+ +
+ + + + - - -
- - -
-
- Back -
- - -

Cashbook Reports -    - - -

-

-
-
- -
-
- - - - -
-
- - - - - - - - - - +
+
+ + + + +
+
+ + + + + + + + + + - - - - -
- -
- -
-
- -
- -
- -
-
- -
- -
- - - - -
-
- -
- -
- - - - -
-
- -
- - -
-
- - -
- - -
- - - -
- - - - - - - - - - - - - - - - - - - - - id; - $rate=$mc->total; - ?> - - - - - - - - - - - - - - + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ + + + +
+
+ + +
+ +
+ + + + +
+
+ + +
+ + +
+ + + +
+ + +
+ + + +
+
DateAccount NameSupplier NameTotal Amount (₹)
date?>name?>SupplierName?>
+ + + + + + + + + + + + + + + + + + + + id; + $rate = $mc->total; + ?> + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - -
DateAccount NameSupplier NameTotal Amount (₹)
date ?>name ?>SupplierName ?>
Total   - -
- - -
- + + + + + + + + + + + + + + Total +   +   + + + + + + + + + + + +
+ +
-
- - -
- - - - - - + + +
+ + + + + + - - - - - - - - + + + + + -function pono(i) -{ - var igrno=$('#igrno'+i).text(); - var pono =$('#pono'+i).text(); - // alert(igrno); - // alert(pono); - // return false; - $("#Fileshow").modal('show'); - $.ajax( - - { - data:{igrno:igrno,pono:pono}, - type:"POST", - url:"cashbook/filelist", - success:function(data) - { - - var trHTML = ''; - $.each($.parseJSON(data),function (i, item) { - i=i+1; - trHTML += '' + - '' + i + '' + - - '' + item.BillNo+ '' + - '' + item.PONO+ '' + + \ No newline at end of file diff --git a/app/Views/banksettlementcredit.php b/app/Views/banksettlementcredit.php index 6177eb88..23a8a485 100755 --- a/app/Views/banksettlementcredit.php +++ b/app/Views/banksettlementcredit.php @@ -1,511 +1,511 @@ - - financial_year; +} ?> - foreach($financialyear as $item) - - { - $finyear = $item->financial_year; - - } ?> - - - + .dataTables_filter { + width: 50%; + float: right; + text-align: right; + } + + .dataTables_paginate { + width: 50%; + float: right; + text-align: right; + } + + div.dt-buttons { + position: relative; + float: right; + + } + - - - - - -
+ + + +
- -
- -
- -
- - - - + +
+ +
+ +
+ + + + - - -
- - -
- - - -
- Back -
-

Cashbook Reports    - - -

-

-
-
- -
-
- - - - -
-
- - - - - - - - - - +
+
+ + + + +
+
+ + + + + + + + + + - - - - -
- -
- -
-
- -
- -
- -
-
- -
- -
- - - - -
-
- -
- -
- - - - -
-
- -
- - -
-
- - -
- - -
- - - -
- - - - - - - - - - - - - - - - - - - - - id; - $rate=$mc->total; - ?> - - - - - - - - - - - - - - + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ + + + +
+
+ + +
+ +
+ + + + +
+
+ + +
+ + +
+ + + +
+ + +
+ + + +
+
DateAccount NameSupplier NameTotal Amount (₹)
date?>name?>SupplierName?>
+ + + + + + + + + + + + + + + + + + + + id; + $rate = $mc->total; + ?> + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - -
DateAccount NameSupplier NameTotal Amount (₹)
date ?>name ?>SupplierName ?>
Total   - -
- - -
- + + + + + + + + + + + + + + Total +   +   + + + + + + + + + + + +
+ +
-
- - -
- - - - - - + + +
+ + + + + + - - - - - - - - + + + + + -function pono(i) -{ - var igrno=$('#igrno'+i).text(); - var pono =$('#pono'+i).text(); - // alert(igrno); - // alert(pono); - // return false; - $("#Fileshow").modal('show'); - $.ajax( - - { - data:{igrno:igrno,pono:pono}, - type:"POST", - url:"cashbook/filelist", - success:function(data) - { - - var trHTML = ''; - $.each($.parseJSON(data),function (i, item) { - i=i+1; - trHTML += '' + - '' + i + '' + - - '' + item.BillNo+ '' + - '' + item.PONO+ '' + + \ No newline at end of file diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index 256141f0..ae7c68a5 100755 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -2514,6 +2514,7 @@ if (!empty($INRSYMBOL)) { }); } var d = $('#drpSupplier').val(); + $('#loader').show(); $.ajax({ url: "VerifyWithSupplierForPendingPO", type: 'POST', @@ -2522,6 +2523,7 @@ if (!empty($INRSYMBOL)) { materialcode: id }, success: function(response) { + $('#loader').hide(); if (response) alert(response); } }); @@ -2562,6 +2564,7 @@ if (!empty($INRSYMBOL)) { }); } var d = $('#drpSupplier').val(); + $('#loader').show(); $.ajax({ url: "VerifyWithSupplierForPendingPO", type: 'POST', @@ -2570,6 +2573,7 @@ if (!empty($INRSYMBOL)) { materialcode: id }, success: function(response) { + $('#loader').hide(); if (response) alert(response); } }); @@ -3203,7 +3207,7 @@ if (!empty($INRSYMBOL)) { var Subtotal = $('#Subtotal').val(); - var AfterIgst = $('#AfterIgstInt').val(); + // var AfterIgst = $('#AfterIgstInt').val(); var Dutyimpact = $('#DutyImpact').val(); var ClearingCharges = $('#ClearingCharges').val(); var Nett = $('#Nett').val(); @@ -3215,7 +3219,7 @@ if (!empty($INRSYMBOL)) { var beforeCustomEDCess = $('#CustomEDcess').val(); var beforeCustomSHCess = $('#CustomSHcess').val(); - var Igst = $('#IgstInt').val(); + // var Igst = $('#IgstInt').val(); var PurQuantity = $('#PurQuantity').val(); var FreightType = $("#drpFreight").val(); @@ -4095,7 +4099,7 @@ if (!empty($INRSYMBOL)) { $('#EditCustomDutyExpenses').val($('#CustomDutyExpenses' + userid).val()); //$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val()); - + console.log($('#Igst' + userid).val()); $('#EdittxtTotalOrderValue').val(cellval[9].innerHTML); $('#EditCgst').val($('#Cgst' + userid).val()); @@ -4309,7 +4313,7 @@ if (!empty($INRSYMBOL)) { var formData = new FormData($('.CapitalPO')[0]); formData.append('ExchangeRateOn', ExchangeRateOn); formData.append('PaymentMethod', PaymentMethod); - + $('#loader').show(); $.ajax({ data: formData, processData: false, @@ -4319,6 +4323,7 @@ if (!empty($INRSYMBOL)) { url: "purchaseorder/addNewCapitalPurchaseOrder", success: function(data) { alert(data); + $('#loader').hide(); if (data) { // $('#content').loader('hide'); diff --git a/app/Views/cashbooklisting.php b/app/Views/cashbooklisting.php index 20744224..162ae897 100755 --- a/app/Views/cashbooklisting.php +++ b/app/Views/cashbooklisting.php @@ -211,8 +211,8 @@ $('#Add').click(function(){ function saveAll() { - $('#loadingcontent').loader('show'); - var tablevalue = $('#cashbooktable').tableToJSON(); // Convert the table into a javascript object + $('#loader').show(); + var tablevalue = $('#cashbooktable').tableToJSON(); // Convert the table into a javascript object var value = JSON.stringify(tablevalue); $.ajax({ @@ -221,7 +221,7 @@ $('#Add').click(function(){ url:"cashbook/cashbookdtl", success:function(data){ - $('#loadingcontent').loader('hide'); + $('#loader').hide(); alert(data); window.location.href="addNewIncomeExpenseLoad"; }//success function closed diff --git a/app/Views/companyview.php b/app/Views/companyview.php index 8e8b244d..9cbc0951 100755 --- a/app/Views/companyview.php +++ b/app/Views/companyview.php @@ -790,6 +790,7 @@ if (!empty($filenames)) { function deletefile(filename) { var answer = confirm(" Do you want to delete the user from the List?") if (answer) { + $('#loader').show(); $.ajax({ data: { id: filename @@ -797,6 +798,7 @@ if (!empty($filenames)) { type: "POST", url: "companycontroller/deletefile", success: function(data) { + $('#loader').hide(); if (data) { // $('#content').loader('hide'); alert(data); @@ -986,8 +988,8 @@ if (!empty($filenames)) { //if(bankname != '' || ifsccode != '' || bankaddress != '' ) //{ - // $('#content').loader('show'); - $.ajax({ + $('#loader').show(); + $.ajax({ data: { id: value @@ -997,7 +999,7 @@ if (!empty($filenames)) { success: function(data) { - // $('#content').loader('hide'); + $('#loader').hide(); alert(data); diff --git a/app/Views/costListing.php b/app/Views/costListing.php index a75b764e..16472764 100755 --- a/app/Views/costListing.php +++ b/app/Views/costListing.php @@ -183,13 +183,15 @@ id: $('#id').val(), CostCenterName: $('#CostCenterName').val() }; - + $('#loader').show(); $.ajax({ type: 'POST', url: "fetchCostCenterDetails", data: formData, dataType: 'json', success: function(response) { + $('#loader').hide(); + if (response.status) { alert(response.message); $('#ccwizard').modal('hide'); diff --git a/app/Views/createPOfromRequistion.php b/app/Views/createPOfromRequistion.php index 71d6c582..a156a899 100755 --- a/app/Views/createPOfromRequistion.php +++ b/app/Views/createPOfromRequistion.php @@ -351,7 +351,7 @@ $("#RequisitionDtlsModal").on("shown.bs.modal", function(e) { var ReqId = $(e.relatedTarget).data('userid'); $('#SelReqNo').html(ReqId); - // $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { id: ReqId @@ -360,7 +360,7 @@ dataType: 'json', url: "requisitionform/ViewRequest", success: function(json) { - // $('#content').loader('hide'); + $('#loader').hide(); var getAvalAmt = json.AvilBudAmount; getAvalAmt = getAvalAmt.replace(/\,/g, ''); $("#ReqType").val(json.Requist[0]['ReqType']); diff --git a/app/Views/dailyBatchCardListing.php b/app/Views/dailyBatchCardListing.php index adbfca70..ce57379d 100755 --- a/app/Views/dailyBatchCardListing.php +++ b/app/Views/dailyBatchCardListing.php @@ -1101,7 +1101,7 @@ $(function(){ monthnumber--;} //alert(monthnumber); //alert(currentmonth[1]); - $('.content').loader('show'); + $('#loader').show(); $.ajax({ data:{param1:monthnumber,param2:currentmonth[1],param3:currentyearmonth}, type:"POST", @@ -1109,7 +1109,7 @@ $(function(){ success:function(data){ //alert(data); var data = JSON.parse(data); - $('.content').loader('hide'); + $('#loader').hide(); //alert(data.length); if(data.length != 0){ @@ -1232,13 +1232,13 @@ $(function(){ date = currentmonth[1]+'-'+monthnumber+'-'+d; var jsondata = $('#abstracttable').tableToJSON(); jsondata = JSON.stringify(jsondata); - $('.content').loader('show'); + $('#loader').show(); $.ajax({ data:{param1:date,param2:jsondata}, type:'POST', url:"", success:function(data){ - $('.content').loader('hide'); + $('#loader').hide(); if(data){ alert(data) } diff --git a/app/Views/dailybatchcard.php b/app/Views/dailybatchcard.php index 4f588eee..c877282d 100755 --- a/app/Views/dailybatchcard.php +++ b/app/Views/dailybatchcard.php @@ -524,7 +524,7 @@ function keyValidate(e) var rd = v; if(rd != '') { - $('.content').loader('show'); + $('#loader').show(); $.ajax({ data:{param1:rd}, @@ -556,7 +556,7 @@ function keyValidate(e) $('#description').val(data.start+'-'+data.stop); } else{$('#description').val('0'+'-'+'0');} - $('.content').loader('hide'); + $('#loader').hide(); } else { @@ -581,6 +581,7 @@ function keyValidate(e) $('#Maint_Append').empty(); var Index = 1 ; //alert(rd); + $('#loader').show(); $.ajax({ data:{id1:rd}, method:"POST", @@ -670,7 +671,8 @@ function keyValidate(e) $('#less_break_down_hrs').val(0); $('#less_maintenance').val(0); } - + $('#loader').hide(); + } }); diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php index 0a1f0151..8f2543e9 100755 --- a/app/Views/dashboard.php +++ b/app/Views/dashboard.php @@ -88,7 +88,7 @@ if (!empty($EmpCount)) { function synczohobooks() { var sync = true - $('#loader_wrapper').css("display", "block"); + $('#loader').show(); $.ajax({ // $('#loadingDiv').show(); @@ -100,13 +100,17 @@ if (!empty($EmpCount)) { success: function(data) { console.log(data); + $('#loader').hide(); + alert("Sync Completed"); }, failure: function(data) { + $('#loader').hide(); + alert("Failed"); }, complete: function() { - $('#loader_wrapper').css("display", "none"); + $('#loader').hide(); } }); } @@ -333,7 +337,7 @@ if (!empty($EmpCount)) { $("#yearabs").val(''); if (id != 0) { - $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { @@ -345,7 +349,7 @@ if (!empty($EmpCount)) { success: function(json) { console.log(json); // alert(json.workeds); - $('#content').loader('hide'); + $('#loader').hide(); $('#totaldays').text(json.totaldays); $('#worked').text(json.workeds) //alert(json.MatDetail); @@ -532,7 +536,7 @@ if (!empty($EmpCount)) { $("#monthabs").val(''); if (id != 0) { - $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { @@ -544,7 +548,7 @@ if (!empty($EmpCount)) { success: function(json) { console.log(json); - $('#content').loader('hide'); + $('#loader').hide(); //alert(json.MatDetail); $("#present").text(json.values); $("#total_days").text(json.CUR_month); @@ -585,7 +589,7 @@ if (!empty($EmpCount)) { var id = $(this).val(); //alert(id); - + $('#loader').show(); $.ajax({ data: { id: id @@ -609,6 +613,8 @@ if (!empty($EmpCount)) { $("#values").text(json.values); $("#today_salary").text(json.employeeSalary); $("#totalSalary").text(json.totalSalary); + $('#loader').hide(); + } diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php index 2e9e36ce..49acae38 100755 --- a/app/Views/editCapitalAmendPO.php +++ b/app/Views/editCapitalAmendPO.php @@ -190,7 +190,7 @@ ?> subtype == 0) -{ +if ($reportdata['master'][0]->subtype == 0) { $type = 'Type 5'; $afsdata5 = $reportdata['masterreportafs']; -} -else -{ +} else { $type = 'Type 7'; $afsdata7 = $reportdata['masterreportafs']; } @@ -42,3320 +43,3099 @@ else // print_r($afsdata5); // echo "******************Type 7***********************"; // print_r($afsdata7); -$approvedby = array(-1=>'Select Approver Name'); -foreach($emplist as $r) -{ - $approvedby[$r->FirstName.' '.$r->LastName] = $r->FirstName.' '.$r->LastName.'-'.$r->shortName; +$approvedby = array(-1 => 'Select Approver Name'); +foreach ($emplist as $r) { + $approvedby[$r->FirstName . ' ' . $r->LastName] = $r->FirstName . ' ' . $r->LastName . '-' . $r->shortName; } ?> - - - - + + + +
- -
-

-
Edit/View In Process Inspection(Nissan) Report Screen -
-

-
-
- - -
-
-
-
- -
-
-
- -
-
- -
- -
- - -
- -
-
- - - -
- -
-
- -
- - - -
- -
- - -
- -
- - - -
- - - -
- -
- -
- - - -
-
- - -
- - -
- - -
- -
- - -
- -
- - - -
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - $mas) - { - if($mas['stype'] == 0 ) - { - $id = strtolower($mas['specname']); - $id = str_replace(' ', '', $id); - - ?> - - - - - - - - - - - - - - - - - - - + +
+

+
Edit/View In Process Inspection(Nissan) Report Screen -
+

+
+
+ + +
+
+
+
+ +
+
+
+ +
+
+ +
+ +
+ + +
+ +
+
+ + + +
+ + +
+ +
+ + + +
+ +
+ + +
+ +
+ + + +
+ + + +
+ +
+ +
+ + + +
+
+ + +
+ + +
+ + +
+ +
+ + +
+ +
+ + + +
+ + +
+
+
SNODescriptionSpecification
Min		Specification
Max		Specification
UOM		ACT X1ACT X2ACT X3ACT X4ACT X5ACT X6ACT X7ACT X8SPECID
+ + + + + + + + + + + + + + + + + + + + + - - - - - -
SNODescriptionSpecification
Min		Specification
Max		Specification
UOM		ACT X1ACT X2ACT X3ACT X4ACT X5ACT X6ACT X7ACT X8SPECID
-

 

-
- - - - - - - - - - - - $mas) - { - if($mas['stype'] == 1 ) - { - $id = strtolower($mas['specname']); - $id = str_replace(' ', '', $id); - $index++; - - - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SNODescriptionSpec
Min		Spec
Max		Spec
UOM		RST Y1RST Y2RST Y3CST X1CST X2CST X3CST X4CST X5CST X6CST X7CST X8SPECID
- - -
-
- -
AFS Details
- -
-
Raw Sand Tests
-
Coated Sand Tests
 
- - - - - - - - - - + + + $mas) { + if ($mas['stype'] == 0) { + $id = strtolower($mas['specname']); + $id = str_replace(' ', '', $id); + + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NOFactorSieve Size µmSpecRST Y1RST Y2RST Y3CST X1CST X2CST X3CST X4CST X5CST X6CST X7CST X8
+

 

+
+ + + + + + + + + + + + + + + + + + + + + + + + $mas) { + if ($mas['stype'] == 1) { + $id = strtolower($mas['specname']); + $id = str_replace(' ', '', $id); + $index++; + + + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SNODescriptionSpec
Min		Spec
Max		Spec
UOM		RST Y1RST Y2RST Y3CST X1CST X2CST X3CST X4CST X5CST X6CST X7CST X8SPECID
+ + +
+
+ +
AFS Details
+ +
+
+
+
Raw Sand Tests
+
+
+
Coated Sand Tests
+
+
 
+
+ + + + + + + + + + + + + + + + + + + + + + + + + $afs) - { - - if($key == 10){ - - $rst1total += $afs->rst1;$rst2total += $afs->rst2;$rst3total += $afs->rst3; - $cst1total += $afs->cst1;$cst2total += $afs->cst2;$cst3total += $afs->cst3;$cst4total += $afs->cst4;$cst5total += $afs->cst5;$cst6total += $afs->cst6;$cst7total += $afs->cst7;$cst8total += $afs->cst8; - } - if($key == 9 || $key == 8) - { - $rst1total3 += $afs->rst1;$rst2total3 += $afs->rst2;$rst3total3 += $afs->rst3; - $cst1total3 += $afs->cst1;$cst2total3 += $afs->cst2;$cst3total3 += $afs->cst3;$cst4total3 += $afs->cst4;$cst5total3 += $afs->cst5;$cst6total3 += $afs->cst6;$cst7total3 += $afs->cst7;$cst8total3 += $afs->cst8; - } - - if($key == 6 || $key == 7) - { - $rst1total2 += $afs->rst1;$rst2total2 += $afs->rst2;$rst3total2 += $afs->rst3; - $cst1total2 += $afs->cst1;$cst2total2 += $afs->cst2;$cst3total2 += $afs->cst3;$cst4total2 += $afs->cst4;$cst5total2 += $afs->cst5;$cst6total2 += $afs->cst6;$cst7total2 += $afs->cst7;$cst8total2 += $afs->cst8; - } - if($key >= 0 && $key <= 5) - { - $rst1total1 += $afs->rst1;$rst2total1 += $afs->rst2;$rst3total1 += $afs->rst3; - $cst1total1 += $afs->cst1;$cst2total1 += $afs->cst2;$cst3total1 += $afs->cst3;$cst4total1 += $afs->cst4;$cst5total1 += $afs->cst5;$cst6total1 += $afs->cst6;$cst7total1 += $afs->cst7;$cst8total1 += $afs->cst8; - } - - - ?> - - - - - + $rst1total1 = 0; + $rst2total1 = 0; + $rst3total1 = 0; + $cst1total1 = 0; + $cst2total1 = 0; + $cst3total1 = 0; + $cst4total1 = 0; + $cst5total1 = 0; + $cst6total1 = 0; + $cst7total1 = 0; + $cst8total1 = 0; + + $rst1total2 = 0; + $rst2total2 = 0; + $rst3total2 = 0; + $cst1total2 = 0; + $cst2total2 = 0; + $cst3total2 = 0; + $cst4total2 = 0; + $cst5total2 = 0; + $cst6total2 = 0; + $cst7total2 = 0; + $cst8total2 = 0; + + $rst1total3 = 0; + $rst2total3 = 0; + $rst3total3 = 0; + $cst1total3 = 0; + $cst2total3 = 0; + $cst3total3 = 0; + $cst4total3 = 0; + $cst5total3 = 0; + $cst6total3 = 0; + $cst7total3 = 0; + $cst8total3 = 0; + + $rst1total = 0; + $rst2total = 0; + $rst3total = 0; + $cst1total = 0; + $cst2total = 0; + $cst3total = 0; + $cst4total = 0; + $cst5total = 0; + $cst6total = 0; + $cst7total = 0; + $cst8total = 0; + foreach ($afsdata7 as $key => $afs) { + + if ($key == 10) { + + $rst1total += $afs->rst1; + $rst2total += $afs->rst2; + $rst3total += $afs->rst3; + $cst1total += $afs->cst1; + $cst2total += $afs->cst2; + $cst3total += $afs->cst3; + $cst4total += $afs->cst4; + $cst5total += $afs->cst5; + $cst6total += $afs->cst6; + $cst7total += $afs->cst7; + $cst8total += $afs->cst8; + } + if ($key == 9 || $key == 8) { + $rst1total3 += $afs->rst1; + $rst2total3 += $afs->rst2; + $rst3total3 += $afs->rst3; + $cst1total3 += $afs->cst1; + $cst2total3 += $afs->cst2; + $cst3total3 += $afs->cst3; + $cst4total3 += $afs->cst4; + $cst5total3 += $afs->cst5; + $cst6total3 += $afs->cst6; + $cst7total3 += $afs->cst7; + $cst8total3 += $afs->cst8; + } + + if ($key == 6 || $key == 7) { + $rst1total2 += $afs->rst1; + $rst2total2 += $afs->rst2; + $rst3total2 += $afs->rst3; + $cst1total2 += $afs->cst1; + $cst2total2 += $afs->cst2; + $cst3total2 += $afs->cst3; + $cst4total2 += $afs->cst4; + $cst5total2 += $afs->cst5; + $cst6total2 += $afs->cst6; + $cst7total2 += $afs->cst7; + $cst8total2 += $afs->cst8; + } + if ($key >= 0 && $key <= 5) { + $rst1total1 += $afs->rst1; + $rst2total1 += $afs->rst2; + $rst3total1 += $afs->rst3; + $cst1total1 += $afs->cst1; + $cst2total1 += $afs->cst2; + $cst3total1 += $afs->cst3; + $cst4total1 += $afs->cst4; + $cst5total1 += $afs->cst5; + $cst6total1 += $afs->cst6; + $cst7total1 += $afs->cst7; + $cst8total1 += $afs->cst8; + } + + + ?> + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NOFactorSieve Size µmSpecRST Y1RST Y2RST Y3CST X1CST X2CST X3CST X4CST X5CST X6CST X7CST X8
factor; ?> sieve_size;?>
factor; ?>sieve_size; ?>spec; ?>spec; ?>spec; ?>spec; ?>rst1;?>rst2;?>rst3;?>cst1;?>cst2;?>cst3;?>cst4;?>cst5;?>cst6;?>cst7;?>cst8;?>
Total
Total
Total
Total
- - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NOFactorSieve Size µmSpecRST Y1RST Y2RST Y3CST X1CST X2CST X3CST X4CST X5CST X6CST X7CST X8rst1; ?>rst2; ?>rst3; ?>cst1; ?>cst2; ?>cst3; ?>cst4; ?>cst5; ?>cst6; ?>cst7; ?>cst8; ?>
Total
Total
Total
Total
+ + + + + + + + + + + + + + + + + + + + + + + + + + $afs) - { - - if($key == 10){ - - $rst51total += $afs->rst1;$rst52total += $afs->rst2;$rst53total += $afs->rst3; - $cst51total += $afs->cst1;$cst52total += $afs->cst2;$cst53total += $afs->cst3;$cst54total += $afs->cst4;$cst55total += $afs->cst5;$cst56total += $afs->cst6;$cst57total += $afs->cst7;$cst58total += $afs->cst8; - } - if($key == 9 || $key == 8) - { - $rst51total3 += $afs->rst1;$rst52total3 += $afs->rst2;$rst53total3 += $afs->rst3; - $cst51total3 += $afs->cst1;$cst52total3 += $afs->cst2;$cst53total3 += $afs->cst3;$cst54total3 += $afs->cst4;$cst55total3 += $afs->cst5;$cst56total3 += $afs->cst6;$cst57total3 += $afs->cst7;$cst58total3 += $afs->cst8; - } - - if($key >= 3 && $key <= 7) - { - $rst51total2 += $afs->rst1;$rst52total2 += $afs->rst2;$rst53total2 += $afs->rst3; - $cst51total2 += $afs->cst1;$cst52total2 += $afs->cst2;$cst53total2 += $afs->cst3;$cst54total2 += $afs->cst4;$cst55total2 += $afs->cst5;$cst56total2 += $afs->cst6;$cst57total2 += $afs->cst7;$cst58total2 += $afs->cst8; - } - if($key >= 0 && $key <= 2) - { - $rst51total1 += $afs->rst1;$rst52total1 += $afs->rst2;$rst53total1 += $afs->rst3; - $cst51total1 += $afs->cst1;$cst52total1 += $afs->cst2;$cst53total1 += $afs->cst3;$cst54total1 += $afs->cst4;$cst55total1 += $afs->cst5;$cst56total1 += $afs->cst6;$cst57total1 += $afs->cst7;$cst58total1 += $afs->cst8; - } - - - ?> - - - - - + $rst51total1 = 0; + $rst52total1 = 0; + $rst53total1 = 0; + $cst51total1 = 0; + $cst52total1 = 0; + $cst53total1 = 0; + $cst54total1 = 0; + $cst55total1 = 0; + $cst56total1 = 0; + $cst57total1 = 0; + $cst58total1 = 0; + + $rst51total2 = 0; + $rst52total2 = 0; + $rst53total2 = 0; + $cst51total2 = 0; + $cst52total2 = 0; + $cst53total2 = 0; + $cst54total2 = 0; + $cst55total2 = 0; + $cst56total2 = 0; + $cst57total2 = 0; + $cst58total2 = 0; + + $rst51total3 = 0; + $rst52total3 = 0; + $rst53total3 = 0; + $cst51total3 = 0; + $cst52total3 = 0; + $cst53total3 = 0; + $cst54total3 = 0; + $cst55total3 = 0; + $cst56total3 = 0; + $cst57total3 = 0; + $cst58total3 = 0; + + $rst51total = 0; + $rst52total = 0; + $rst53total = 0; + $cst51total = 0; + $cst52total = 0; + $cst53total = 0; + $cst54total = 0; + $cst55total = 0; + $cst56total = 0; + $cst57total = 0; + $cst58total = 0; + foreach ($afsdata5 as $key => $afs) { + + if ($key == 10) { + + $rst51total += $afs->rst1; + $rst52total += $afs->rst2; + $rst53total += $afs->rst3; + $cst51total += $afs->cst1; + $cst52total += $afs->cst2; + $cst53total += $afs->cst3; + $cst54total += $afs->cst4; + $cst55total += $afs->cst5; + $cst56total += $afs->cst6; + $cst57total += $afs->cst7; + $cst58total += $afs->cst8; + } + if ($key == 9 || $key == 8) { + $rst51total3 += $afs->rst1; + $rst52total3 += $afs->rst2; + $rst53total3 += $afs->rst3; + $cst51total3 += $afs->cst1; + $cst52total3 += $afs->cst2; + $cst53total3 += $afs->cst3; + $cst54total3 += $afs->cst4; + $cst55total3 += $afs->cst5; + $cst56total3 += $afs->cst6; + $cst57total3 += $afs->cst7; + $cst58total3 += $afs->cst8; + } + + if ($key >= 3 && $key <= 7) { + $rst51total2 += $afs->rst1; + $rst52total2 += $afs->rst2; + $rst53total2 += $afs->rst3; + $cst51total2 += $afs->cst1; + $cst52total2 += $afs->cst2; + $cst53total2 += $afs->cst3; + $cst54total2 += $afs->cst4; + $cst55total2 += $afs->cst5; + $cst56total2 += $afs->cst6; + $cst57total2 += $afs->cst7; + $cst58total2 += $afs->cst8; + } + if ($key >= 0 && $key <= 2) { + $rst51total1 += $afs->rst1; + $rst52total1 += $afs->rst2; + $rst53total1 += $afs->rst3; + $cst51total1 += $afs->cst1; + $cst52total1 += $afs->cst2; + $cst53total1 += $afs->cst3; + $cst54total1 += $afs->cst4; + $cst55total1 += $afs->cst5; + $cst56total1 += $afs->cst6; + $cst57total1 += $afs->cst7; + $cst58total1 += $afs->cst8; + } + + + ?> + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NOFactorSieve Size µmSpecRST Y1RST Y2RST Y3CST X1CST X2CST X3CST X4CST X5CST X6CST X7CST X8
factor; ?> sieve_size;?>
factor; ?>sieve_size; ?>spec; ?>spec; ?>spec; ?>spec; ?>rst1;?>rst2;?>rst3;?>cst1;?>cst2;?>cst3;?>cst4;?>cst5;?>cst6;?>cst7;?>cst8;?>
Total
Total
Total
Total
- - - -
- -
L.O.I Details
- -
-
- - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NODescriptionSpecRST Y1RST Y2RST Y3CST X1CST X2CST X3CST X4CST X5CST X6CST X7CST X8rst1; ?>rst2; ?>rst3; ?>cst1; ?>cst2; ?>cst3; ?>cst4; ?>cst5; ?>cst6; ?>cst7; ?>cst8; ?>
Total
Total
Total
Total
+ + + +
+ +
L.O.I Details
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + - - $loi) - { - ?> - - - - - - - - - - - - - - - - - - - - - - + + $loi) { + ?> + + + + + + + + + + + + + + + + + + + + + + + -
NODescriptionSpecRST Y1RST Y2RST Y3CST X1CST X2CST X3CST X4CST X5CST X6CST X7CST X8
loidetails?>spec;?>rst1;?>rst2;?>rst3;?>cst1;?>cst2;?>cst3;?>cst4;?>cst5;?>cst6;?>cst7;?>cst8;?>
loidetails ?>spec; ?>rst1; ?>rst2; ?>rst3; ?>cst1; ?>cst2; ?>cst3; ?>cst4; ?>cst5; ?>cst6; ?>cst7; ?>cst8; ?>
+
-
- - - - - - - - - -
 
-
-
- -
- - -
-
-
- NO IMAGE AVAILABLE -
-
- - - - -
+
+ + + + + + + + + +
 
+
+
+ +
+ + +
+
+
+ NO IMAGE AVAILABLE +
+
+ + + + +
- -
- - - -
- -
- - - + +
+ + +
- -
- - -
 
-
-
 
+ +
+ + + +
+ +
+ + +
 
+
+
 
-
- -
-
+
+ +
+
- -
-
-
+
+ + + + + - - - - - - - - - - - - - - \ No newline at end of file + } + + function calculateAFS5() { + var spec1 = document.getElementById('spec1').textContent; + + if (isNaN(spec1)) { + spec1 = spec1.split('-'); + var min = spec1[0]; + var max = spec1[1]; + + for (i = 1; i <= 3; i++) { + var id = 'rst5' + i + 'total1'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + + //FOR CST TOTAL COLOR CHANGE + + for (i = 1; i <= 8; i++) { + var id = 'cst5' + i + 'total1'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + } + + + //FOR SECOND TOTAL2 COLOR CHANGE + + + var spec2 = document.getElementById('spec2').textContent; + + if (isNaN(spec2)) { + spec2 = spec2.split('-'); + var min = spec2[0]; + var max = spec2[1]; + + for (i = 1; i <= 3; i++) { + var id = 'rst5' + i + 'total2'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + //alert(curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + + //FOR CST TOTAL COLOR CHANGE + + for (i = 1; i <= 8; i++) { + var id = 'cst5' + i + 'total2'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + //alert('cst'+curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + } + + //FOR SECOND TOTAL3 COLOR CHANGE + + + var spec3 = document.getElementById('spec3').textContent; + + if (isNaN(spec3)) { + spec3 = spec3.split('-'); + var min = spec3[0]; + var max = spec3[1]; + + for (i = 1; i <= 3; i++) { + var id = 'rst5' + i + 'total3'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + //alert(curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + + //FOR CST TOTAL COLOR CHANGE + + for (i = 1; i <= 8; i++) { + var id = 'cst5' + i + 'total3'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + //alert('cst'+curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + } + + + + + //FOR SECOND TOTAL4 COLOR CHANGE + + + var spec4 = document.getElementById('spec4').textContent; + + if (isNaN(spec4)) { + spec4 = spec4.split('-'); + var min = spec4[0]; + var max = spec4[1]; + + for (i = 1; i <= 3; i++) { + var id = 'rst5' + i + 'total'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + //alert(curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + + //FOR CST TOTAL COLOR CHANGE + + for (i = 1; i <= 8; i++) { + var id = 'cst5' + i + 'total'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + //alert('cst'+curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + } + } + + + + function calculateAFS7() { + var spec1 = document.getElementById('1spec').textContent; + + if (isNaN(spec1)) { + spec1 = spec1.split('-'); + var min = spec1[0]; + var max = spec1[1]; + + for (i = 1; i <= 3; i++) { + var id = 'rst' + i + 'total1'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + + //FOR CST TOTAL COLOR CHANGE + + for (i = 1; i <= 8; i++) { + var id = 'cst' + i + 'total1'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + } + + + //FOR SECOND TOTAL2 COLOR CHANGE + + + var spec2 = document.getElementById('2spec').textContent; + + if (isNaN(spec2)) { + spec2 = spec2.split('-'); + var min = spec2[0]; + var max = spec2[1]; + + for (i = 1; i <= 3; i++) { + var id = 'rst' + i + 'total2'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + //alert(curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + + //FOR CST TOTAL COLOR CHANGE + + for (i = 1; i <= 8; i++) { + var id = 'cst' + i + 'total2'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + //alert('cst'+curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + } + + //FOR SECOND TOTAL3 COLOR CHANGE + + + var spec3 = document.getElementById('3spec').textContent; + + if (isNaN(spec3)) { + spec3 = spec3.split('-'); + var min = spec3[0]; + var max = spec3[1]; + + for (i = 1; i <= 3; i++) { + var id = 'rst' + i + 'total3'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + //alert(curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + + //FOR CST TOTAL COLOR CHANGE + + for (i = 1; i <= 8; i++) { + var id = 'cst' + i + 'total3'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + //alert('cst'+curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + } + + + + + //FOR SECOND TOTAL4 COLOR CHANGE + + + var spec4 = document.getElementById('4spec').textContent; + + if (isNaN(spec4)) { + spec4 = spec4.split('-'); + var min = spec4[0]; + var max = spec4[1]; + + for (i = 1; i <= 3; i++) { + var id = 'rst' + i + 'total'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + //alert(curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + + //FOR CST TOTAL COLOR CHANGE + + for (i = 1; i <= 8; i++) { + var id = 'cst' + i + 'total'; + //alert(id); + var curval = document.getElementById(id).textContent; + curval = parseFloat(curval); + //alert('cst'+curval); + if ($.isNumeric(min) && $.isNumeric(max)) { + if (curval >= min && curval <= max) { + id = '#' + id; + $(id).css("background-color", "#f5e0a5"); //green color + + + } else { + id = '#' + id; + $(id).css("background-color", "#ffcccc"); + + } + } else if ($.isNumeric(min) && !($.isNumeric(max))) { + if (curval >= min) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } else if (!$.isNumeric(min) && $.isNumeric(max)) { + if (curval <= max) { + $(id).css("background-color", "#f5e0a5"); + } else { + $(id).css("background-color", "#ffcccc"); + } + } + } + } + } + \ No newline at end of file diff --git a/app/Views/editOld.php b/app/Views/editOld.php index 4bed94a9..c6926795 100755 --- a/app/Views/editOld.php +++ b/app/Views/editOld.php @@ -198,7 +198,7 @@ if (!empty($EmpList)) { - $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { Eid: Eid @@ -208,7 +208,7 @@ if (!empty($EmpList)) { url: "user/Adduserdepartment", success: function(data) { if (data) { - $('#content').loader('hide'); + $('#loader').hide(); alert(data); $('#txtRowCount').val(''); @@ -217,7 +217,7 @@ if (!empty($EmpList)) { } }); - //$('#content').loader('hide'); + $('#loader').hide(); @@ -257,7 +257,7 @@ if (!empty($EmpList)) { - $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { Eid: Eid @@ -266,7 +266,7 @@ if (!empty($EmpList)) { url: "user/Deleteuserdepartment", success: function(data) { if (data) { - $('#content').loader('hide'); + $('#loader').hide(); alert(data); $('#txtRowCount').val(''); @@ -275,7 +275,7 @@ if (!empty($EmpList)) { } }); - //$('#content').loader('hide'); + $('#loader').hide(); diff --git a/app/Views/editOldasset.php b/app/Views/editOldasset.php index b59bc5cd..fb45ccf2 100755 --- a/app/Views/editOldasset.php +++ b/app/Views/editOldasset.php @@ -304,6 +304,7 @@ if (!empty($assetList)) { // alert(PONO); if (PONO) { //alert("INSIDE IF"); + $('#loader').show(); $.ajax({ type: 'POST', url: "assetdetails/getpodetails", @@ -330,6 +331,7 @@ if (!empty($assetList)) { $('#MaterialCode').append(line); }); + $('#loader').hide(); } @@ -353,6 +355,8 @@ if (!empty($assetList)) { //line +='' if (line) { + $('#loader').show(); + $.ajax({ type: 'POST', url: "assetdetails/getline", @@ -391,14 +395,6 @@ if (!empty($assetList)) { $('#depcode').val(item.Departmentcode); $('#AssetDept').val(item.DepartmentName); - console.log("supplier information"); - console.log(item.SupplierName); - console.log(item.SupplierID); - - console.log("department information"); - console.log(item.DepartmentName); - console.log(item.Departmentcode); - $('#PODescription').val(item.MaterialName); $('#Assetvalue').val(item.TotalValue); @@ -413,6 +409,7 @@ if (!empty($assetList)) { } + $('#loader').hide(); //line =''; diff --git a/app/Views/editPayslip.php b/app/Views/editPayslip.php index 9e221ae9..f063d274 100755 --- a/app/Views/editPayslip.php +++ b/app/Views/editPayslip.php @@ -844,12 +844,15 @@ $("#save").click(function(){ if(calculateSalary()) { + $('#loader').show(); $.ajax({ data:$("#editpayslip").serialize(), type:"POST", url:"payslip/updatePayslip", success:function(result) { + $('#loader').hide(); + if(result) { diff --git a/app/Views/editRawmaterial.php b/app/Views/editRawmaterial.php index 6d4efc6c..e4f5130c 100755 --- a/app/Views/editRawmaterial.php +++ b/app/Views/editRawmaterial.php @@ -355,7 +355,7 @@ if ($total <= $reorder) { //material = material.replace(/\s*$/,""); var material = materialname.replace(/ /g, ''); //alert(m.length+" "+m+" "+s+" "+s.length); - $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { id: material @@ -367,7 +367,7 @@ if ($total <= $reorder) { //alert(count); if (count > 2) { - $('#content').loader('hide'); + $('#loader').hide(); alert('Material name already existed ! '); var related_name = ""; @@ -380,13 +380,13 @@ if ($total <= $reorder) { alert("'" + materialname + "' - related materials are , " + " \n \n" + related_name); $("#MaterialName").focus(); } else { - $('#content').loader('hide'); + $('#loader').hide(); // alert("empty data"); } }, error: function() { - $('#content').loader('hide'); + $('#loader').hide(); alert("Error Occur"); } diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php index c24c7f93..7ac0530c 100755 --- a/app/Views/editRevenueAmendPO.php +++ b/app/Views/editRevenueAmendPO.php @@ -2330,6 +2330,7 @@ if (!empty($INRSYMBOL)) { var totalAmount = parseFloat($('#TotalOrderValue' + i).val()); var avalbudAmt = ''; //alert('before Ajax'); + $('#loader').show(); $.ajax({ data: { id: costcode, @@ -2338,6 +2339,7 @@ if (!empty($INRSYMBOL)) { type: "POST", url: "serviceAvilBudgetAmount", success: function(data) { + $('#loader').hide(); if (data) { avalbudAmt = parseFloat(data); // if(basicAmountRate > avalbudAmt || totalAmount > avalbudAmt) @@ -2402,7 +2404,7 @@ if (!empty($INRSYMBOL)) { //alert('final else for store data'); // $('.content').loader('show'); var formData = new FormData($('.CreatePO')[0]); - + $('#loader').show(); $.ajax({ // data:$('.CreatePO').serialize(), type: "POST", @@ -2413,7 +2415,7 @@ if (!empty($INRSYMBOL)) { success: function(data) { // console.log(data); if (data) { - // $('.content').loader('hide'); + $('#loader').hide(); $('#txtRowCount').val(''); $('#txtDeletedRow').val(''); $('#txtStatus').val(''); @@ -2422,7 +2424,7 @@ if (!empty($INRSYMBOL)) { window.location = "amendmentpurchaseorder"; } else { - // $('.content').loader('hide'); + $('#loader').hide(); alert("Error"); } diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php index abe110f7..0ad30da4 100755 --- a/app/Views/editRevenuepurchaseorder.php +++ b/app/Views/editRevenuepurchaseorder.php @@ -455,6 +455,7 @@ if (!empty($getlogpodtl)) { return false; } var d = $('#drpSupplier').val(); + $('#loader').show(); $.ajax({ url: "VerifyWithSupplierForPendingPO", type: 'POST', @@ -463,6 +464,7 @@ if (!empty($getlogpodtl)) { materialcode: id }, success: function(response) { + $('#loader').hide(); if (response) alert(response); } }); @@ -496,6 +498,7 @@ if (!empty($getlogpodtl)) { return false; } var d = $('#drpSupplier').val(); + $('#loader').show(); $.ajax({ url: "VerifyWithSupplierForPendingPO", type: 'POST', @@ -504,6 +507,7 @@ if (!empty($getlogpodtl)) { materialcode: id }, success: function(response) { + $('#loader').show(); if (response) alert(response); } }); @@ -4570,6 +4574,7 @@ if (!empty($getlogpodtl)) { var basicAmountRate = parseFloat($('#basicval' + i).val()); var totalAmount = parseFloat($('#TotalOrderValue' + i).val()); var avalbudAmt = ''; + $('#loader').show(); $.ajax({ data: { id: costcode, @@ -4578,6 +4583,7 @@ if (!empty($getlogpodtl)) { type: "POST", url: "serviceAvilBudgetAmount", success: function(data) { + $('#loader').show(); if (data) { //alert(data); avalbudAmt = parseFloat(data); @@ -4665,7 +4671,7 @@ if (!empty($getlogpodtl)) { DelRows = "0" + ":" + rowid; } $('#txtDeletedRow').val(DelRows); - + $('#loader').show(); $.ajax({ data: { id: id @@ -4673,6 +4679,7 @@ if (!empty($getlogpodtl)) { type: "POST", url: "purchaseorder/DeletePODetails", success: function(data) { + $('#loader').hide(); if (data) { alert(data); @@ -4985,6 +4992,7 @@ if (!empty($getlogpodtl)) { return false; } else { var formData = new FormData($('.CreatePO')[0]); + $('#loader').show(); $.ajax({ type: "POST", url: "purchaseorder/EditRevenuePurchaseOrder", @@ -4993,6 +5001,7 @@ if (!empty($getlogpodtl)) { contentType: false, success: function(data) { // console.log(data); + $('#loader').hide(); if (data) { alert(data); $('#txtRowCount').val(''); @@ -5222,7 +5231,7 @@ if (!empty($getlogpodtl)) { formData.append('param1', param1); formData.append('param2', param2); - + $('#loader').show(); $.ajax({ data: formData, type: "POST", @@ -5232,7 +5241,7 @@ if (!empty($getlogpodtl)) { processData: false, success: function(data) { if (data) { - console.log(data); + $('#loader').hide(); alert(data); window.location.reload(); // $('#spl').find('td').eq(5).text(filename[2]); @@ -5266,7 +5275,7 @@ if (!empty($getlogpodtl)) { formData.append('param6', param6); formData.append('param7', param7); - + $('#loader').show(); $.ajax({ data: formData, type: "POST", @@ -5276,7 +5285,7 @@ if (!empty($getlogpodtl)) { processData: false, success: function(data) { if (data) { - console.log(data); + $('#loader').hide(); alert(data); window.location.reload(); // $('#spl').find('td').eq(5).text(filename[2]); @@ -5300,7 +5309,7 @@ if (!empty($getlogpodtl)) { formData.append('PONO', PONO); formData.append('count', counter); formData.append('igr', igr); - + $('#loader').show(); $.ajax({ data: formData, type: "POST", @@ -5310,7 +5319,7 @@ if (!empty($getlogpodtl)) { processData: false, success: function(data) { if (data) { - console.log(data); + $('#loader').hide(); alert(data); window.location.reload(); // $('#spl').find('td').eq(5).text(filename[2]); diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php index 424fe5db..a239fa0b 100755 --- a/app/Views/editServiceAmendPO.php +++ b/app/Views/editServiceAmendPO.php @@ -405,6 +405,7 @@ foreach ($PaymentTerms as $TER) { }); } var d = $('#drpSupplier').val(); + $('#loader').show(); $.ajax({ url: "VerifyWithSupplierForPendingPO", type: 'POST', @@ -413,6 +414,8 @@ foreach ($PaymentTerms as $TER) { materialcode: id }, success: function(response) { + $('#loader').hide(); + if (response) alert(response); } }); @@ -448,6 +451,7 @@ foreach ($PaymentTerms as $TER) { } var d = $('#drpSupplier').val(); + $('#loader').show(); $.ajax({ url: "VerifyWithSupplierForPendingPO", type: 'POST', @@ -456,6 +460,8 @@ foreach ($PaymentTerms as $TER) { materialcode: id }, success: function(response) { + $('#loader').hide(); + if (response) alert(response); } }); @@ -2028,6 +2034,7 @@ foreach ($PaymentTerms as $TER) { } $('#txtDeletedRow').val(DelRows); + $('#loader').show(); $.ajax({ data: { id: id @@ -2036,9 +2043,10 @@ foreach ($PaymentTerms as $TER) { url: "purchaseorder/DeletePODetails", success: function(data) { if (data) { - // $('#content').loader('hide'); + $('#loader').hide(); alert(data); } else { + $('#loader').hide(); alert("Error"); } @@ -2205,7 +2213,8 @@ foreach ($PaymentTerms as $TER) { } else { // $('#content').loader('show'); var formData = new FormData($('.ServicePO')[0]); - $.ajax({ + $('#loader').show(); + $.ajax({ // data: $('.ServicePO').serialize(), type: "POST", url: "amendmentpurchaseorder/UpdateAmendServicePurchaseOrder", @@ -2214,7 +2223,7 @@ foreach ($PaymentTerms as $TER) { contentType: false, success: function(data) { if (data) { - // $('#content').loader('hide'); + $('#loader').hide(); alert(data); $('#txtRowCount').val(''); $('#txtDeletedRow').val(''); @@ -2223,7 +2232,7 @@ foreach ($PaymentTerms as $TER) { $('#txtDeliveryAddress').val('') window.location = "amendmentpurchaseorder"; } else { - // $('#content').loader('hide'); + $('#loader').hide(); alert("Error"); } } diff --git a/app/Views/editSupplier.php b/app/Views/editSupplier.php index 21c2084b..4baeeca8 100755 --- a/app/Views/editSupplier.php +++ b/app/Views/editSupplier.php @@ -524,8 +524,8 @@ if (!empty($supplier)) { $('#supplierName').change(function() { var suppliername = $('#supplierName').val(); var supplier = suppliername.replace(/ /g, ''); - $('#content').loader('show'); - $.ajax({ + $('#loader').show(); + $.ajax({ type: "POST", url: "", data: { @@ -534,7 +534,7 @@ if (!empty($supplier)) { success: function(data) { var count = data.length; if (count > 2) { - $('#content').loader('hide'); + $('#loader').hide(); alert('supplier already existed ! '); var related_supplier = ""; $.each(data, function(i, obj) { @@ -543,13 +543,13 @@ if (!empty($supplier)) { alert("'" + suppliername + "' - related supplier are , " + " \n \n" + related_supplier); $("#supplierName").focus(); } else { - $('#content').loader('hide'); + $('#loader').hide(); // alert('This is New Supplier! '); } console.log(data); }, error: function() { - $('#content').loader('hide'); + $('#loader').hide(); // alert("Error Occur"); console.log("an error occur supplierExist") diff --git a/app/Views/editaction_report.php b/app/Views/editaction_report.php index 2cb89990..2b95b169 100755 --- a/app/Views/editaction_report.php +++ b/app/Views/editaction_report.php @@ -824,13 +824,15 @@ function Save() var newdate = date.split("-").reverse().join("-"); //alert(newdate) -$('#content').loader('show'); - $.ajax({ + $('#loader').show(); + $.ajax({ data:$('.action_report').serialize()+"&txtactionrow="+txtactionrow+"&txtrootrow="+txtrootrow+"&txtcounterrow="+txtcounterrow+"&ncrstatus="+ncrstatus+"&newdate="+newdate, type:"POST", url:"purchaseorder/UpdateAction_Report", success:function(data) { + $('#loader').hide(); + if(data) { @@ -1046,13 +1048,16 @@ function DeleteactionRow(rowId) $('#target'+rowId).val('') //alert(delactionId) - + $('#loader').show(); + $.ajax({ data:{delactionId,delactionId}, type:"POST", url:"purchaseorder/DeleteAction_Report", success:function(data) { + $('#loader').hide(); + if(data) { alert(data); @@ -1084,13 +1089,16 @@ function DeleteRootRow(rowId) tr.parentNode.removeChild(tr); // alert(delactionId) - + $('#loader').show(); + $.ajax({ data:{delactionId,delactionId}, type:"POST", url:"purchaseorder/DeleteRoot_Cause", success:function(data) { + $('#loader').hide(); + if(data) { alert(data); @@ -1121,13 +1129,16 @@ function DeleteCounterRow(rowId) $('#countertarget'+rowId).val(''); //alert(delactionId) - + $('#loader').show(); + $.ajax({ data:{delactionId,delactionId}, type:"POST", url:"purchaseorder/DeleteCounter_Row", success:function(data) { + $('#loader').hide(); + if(data) { alert(data); diff --git a/app/Views/editasset.php b/app/Views/editasset.php index e2f0bef5..e50ed279 100755 --- a/app/Views/editasset.php +++ b/app/Views/editasset.php @@ -11,52 +11,48 @@ $DateOfPurchase = ''; $DateOfCommison = ''; $AssetValue = ''; $AssetStatus = ''; -$IsActive =''; +$IsActive = ''; $Remarks = ''; -$DepartmentName =''; -$Department =''; +$DepartmentName = ''; +$Department = ''; $SupplierCode = ''; $MaterialCode = ''; $PONO = ''; -$POLineItem=''; -$Quantity=''; +$POLineItem = ''; +$Quantity = ''; $UOM = ''; -$MaterialName=''; -$DeliveryDate=''; +$MaterialName = ''; +$DeliveryDate = ''; $DDate = ''; -if(!empty($assetList)) -{ - foreach ($assetList as $Asset) - { - //print_r($Asset);die(); +if (!empty($assetList)) { + foreach ($assetList as $Asset) { + //print_r($Asset);die(); $AssetCode = $Asset->AssetCode; $AssetName = $Asset->AssetName; $Description = $Asset->Description; - $Department = $Asset->DEPCode; - $DepartmentName = $Asset->DepartmentName; + $Department = $Asset->DEPCode; + $DepartmentName = $Asset->DepartmentName; $Location = $Asset->Location; $User = $Asset->UserName; $SupplierName = $Asset->SupplierName; - $SupplierCode = $Asset->SupplierCode; - $DateOfPurchase = $Asset->DateOfPurchase;//print_r($Asset->DateOfPurchase); - if($DateOfPurchase != '' && $DateOfPurchase != '0000-00-00 00:00:00' ) { - $PODate = new DateTime($DateOfPurchase); - $DateOfPurchase = $PODate->format('d-m-Y'); - } - else { - $DateOfPurchase = ''; - } - $DateOfCommison = $Asset->DateOfCommison; - if($DateOfCommison != '' && $DateOfCommison != '0000-00-00 00:00:00' ) { - $DateOfCommission= new DateTime($Asset->DateOfCommison, new DateTimeZone('Asia/Kolkata')); - $DateOfCommison = $DateOfCommission->format('d-m-Y'); + $SupplierCode = $Asset->SupplierCode; + $DateOfPurchase = $Asset->DateOfPurchase; //print_r($Asset->DateOfPurchase); + if ($DateOfPurchase != '' && $DateOfPurchase != '0000-00-00 00:00:00') { + $PODate = new DateTime($DateOfPurchase); + $DateOfPurchase = $PODate->format('d-m-Y'); + } else { + $DateOfPurchase = ''; + } + $DateOfCommison = $Asset->DateOfCommison; + if ($DateOfCommison != '' && $DateOfCommison != '0000-00-00 00:00:00') { + $DateOfCommission = new DateTime($Asset->DateOfCommison, new DateTimeZone('Asia/Kolkata')); + $DateOfCommison = $DateOfCommission->format('d-m-Y'); + } else { + $DateOfCommison = ''; } - else { - $DateOfCommison = ''; - } - - $AssetValue = $Asset->AssetValue; + + $AssetValue = $Asset->AssetValue; $AssetStatus = $Asset->AssetStatus; $MaterialCode = $Asset->MaterialCode; $PONO = $Asset->PONO; @@ -65,37 +61,32 @@ if(!empty($assetList)) $MaterialName = $Asset->MaterialName; $UOM = $Asset->UOM; $DDt = $Asset->DeliveryDate; - if($DDt != '' && $DDt != '0000-00-00 00:00:00'){ - $DDate = new DateTime($DDt, new DateTimeZone('Asia/Kolkata')); - $DeliveryDate = $DDate->format('d-m-Y'); - } - else - { - $DeliveryDate = ''; - } + if ($DDt != '' && $DDt != '0000-00-00 00:00:00') { + $DDate = new DateTime($DDt, new DateTimeZone('Asia/Kolkata')); + $DeliveryDate = $DDate->format('d-m-Y'); + } else { + $DeliveryDate = ''; + } $Remarks = $Asset->Remarks; - $chk = $Asset->IsActive; - - if($chk == 1) - { - $IsActive = 'checked'; - } - else - { - $IsActive = ''; - } - - // if($DateOfPurchase != '') - // { - // $dtpurchase = new DateTime($DateOfPurchase); - // $DOPurchase = $dtpurchase ->format('d/m/Y'); - // } - // if($DateOfCommission != '') - // { - // $dtCommission = new DateTime($DateOfCommission); - // $DOCommission = $dtCommission ->format('Y-m-d'); - // } + $chk = $Asset->IsActive; + + if ($chk == 1) { + $IsActive = 'checked'; + } else { + $IsActive = ''; + } + + // if($DateOfPurchase != '') + // { + // $dtpurchase = new DateTime($DateOfPurchase); + // $DOPurchase = $dtpurchase ->format('d/m/Y'); + // } + // if($DateOfCommission != '') + // { + // $dtCommission = new DateTime($DateOfCommission); + // $DOCommission = $dtCommission ->format('Y-m-d'); + // } } } @@ -126,8 +117,8 @@ if(!empty($assetList))
- - + +
@@ -135,44 +126,40 @@ if(!empty($assetList))
- +
- +
@@ -180,7 +167,7 @@ if(!empty($assetList))
@@ -189,71 +176,67 @@ if(!empty($assetList))
- +
- +
- +
- - + +
- +
- +
- +
- +
+
- Cancel + Cancel
@@ -281,182 +264,179 @@ if(!empty($assetList))
- - \ No newline at end of file diff --git a/app/Views/editcomplaint.php b/app/Views/editcomplaint.php index 50aaf08c..be9d831e 100755 --- a/app/Views/editcomplaint.php +++ b/app/Views/editcomplaint.php @@ -278,7 +278,7 @@ function Save() var Remark = $('#Remark').val(); var CId = $('#CId').val(); //var remarks= $('#Remark').val(); - $('#content').loader('show'); + $('#loader').show(); $.ajax( { @@ -288,7 +288,7 @@ function Save() url:"purchaseorder/UpdateComplaint", success:function(data) { - $('#content').loader('hide'); + $('#loader').hide(); diff --git a/app/Views/editconfig.php b/app/Views/editconfig.php index 3e50efca..17a975de 100755 --- a/app/Views/editconfig.php +++ b/app/Views/editconfig.php @@ -384,13 +384,15 @@ if (!empty($master)) { $(".editConfig").submit(function(e) { if (validate()) { - $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: $('.editConfig').serialize(), type: 'POST', url: "configurationctrl/configedit", success: function(data) { //alert(data); + $('#loader').hide(); + if (data) { $('#content').loader('hide'); //alert(data); diff --git a/app/Views/editenquiry.php b/app/Views/editenquiry.php index 529f9f9e..9b27958e 100755 --- a/app/Views/editenquiry.php +++ b/app/Views/editenquiry.php @@ -275,7 +275,7 @@ function Save() var remarks= $('#Remark').val(); var id= $('#enqid').val(); //alert(id) - $('#content').loader('show'); + $('#loader').show(); $.ajax( { @@ -286,7 +286,7 @@ function Save() success:function(data) { - $('#content').loader('hide'); + $('#loader').hide(); if(data) { diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php index 193bd44e..e178c7a6 100755 --- a/app/Views/editimportpo.php +++ b/app/Views/editimportpo.php @@ -5176,6 +5176,7 @@ if (!empty($getlogpodtl)) { DelRows = "0" + ":" + rowid; } $('#txtDeletedRow').val(DelRows); + $('#loader').show(); $.ajax({ data: { @@ -5184,6 +5185,8 @@ if (!empty($getlogpodtl)) { type: "POST", url: "purchaseorder/DeletePODetails", success: function(data) { + $('#loader').hide(); + if (data) { // $('#content').loader('hide'); alert(data); @@ -5357,6 +5360,8 @@ if (!empty($getlogpodtl)) { formData.append('txtRowCount', Row); formData.append('txtDeletedRow', txtDeletedRow); formData.append('textStatus', stat); + $('#loader').show(); + $.ajax({ // data:$('.ImportPO').serialize()+"&txtRowCount="+Row+"&txtDeletedRow="+txtDeletedRow+"&textStatus="+stat, data: formData, @@ -5366,6 +5371,8 @@ if (!empty($getlogpodtl)) { type: "POST", url: "purchaseorder/EditImportPurchaseOrder", success: function(data) { + $('#loader').hide(); + // console.log(data); if (data) { // // $('#content').loader('hide'); diff --git a/app/Views/editincomeexpenses.php b/app/Views/editincomeexpenses.php index f5f4e662..d0f7438c 100755 --- a/app/Views/editincomeexpenses.php +++ b/app/Views/editincomeexpenses.php @@ -147,12 +147,15 @@ $('#merchant').autocomplete({ var selectedvalue = $('input[name=merchant]').val(); if(selectedvalue != ' ' ) { - + $('#loader').show(); + $.ajax({ data:{id:selectedvalue}, type:"POST", url:"cashbook/getSupplierDtls", success:function(data) { + $('#loader').hide(); + var supplier_gstno = ''; if(data != '') { @@ -828,11 +831,15 @@ function GSTvalue(id) var id2= $('#id1').val(); //alert(file); //alert(id2); + $('#loader').show(); + $.ajax({ data:{id:file,ide:id2}, type:"POST", url:"cashbook/deletefile", success:function(data) { + $('#loader').hide(); + if(data==1) { $('#content').loader('hide'); @@ -1031,7 +1038,7 @@ $('.AddSupplier').click(function() var alternatecont = $('#AlternateContactNumber').val(); var email = $('#emailid').val(); var Address = $('#Address').val(); - $('#content').loader('show'); + $('#loader').show(); $.ajax({ data:{suppliername:suppliername,contact:contact,alternatecont:alternatecont,email:email,Address:Address}, @@ -1067,8 +1074,8 @@ $('.AddSupplier').click(function() //$("#supplier").append(html); alert(alertdata); $('#supplier option[value=""]').prop('selected', true); - $('#content').loader('hide'); - $('#Addsup').modal('hide'); + $('#loader').hide(); + $('#Addsup').modal('hide'); diff --git a/app/Views/editmaterialadjustment.php b/app/Views/editmaterialadjustment.php index e0c1b495..92920237 100755 --- a/app/Views/editmaterialadjustment.php +++ b/app/Views/editmaterialadjustment.php @@ -340,16 +340,16 @@ $('.getdetails').click(function() var materialcode =$('#materialcode').val(); var date = $('#date').val(); var Supplier = $('#supplier').val(); - $('#content').loader('show'); - $.ajax({ + $('#loader').show(); + $.ajax({ data:{materialcode:materialcode,date:date,Supplier:Supplier}, type:"POST", url:"batchcard/getQuantity", success:function(data) { - $('#content').loader('hide'); - //console.log(data); + $('#loader').hide(); + //console.log(data); var addqty = ''; var reduceqty = ''; $.each(JSON.parse(data),function(i,obj) diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php index 0f980786..dc19fb80 100755 --- a/app/Views/editrequisitionform.php +++ b/app/Views/editrequisitionform.php @@ -531,8 +531,7 @@ td { if (id != '-1') { if ((converttext != 'SERVICE')) { - // $('#content').loader('show'); - + $('#loader').show(); $.ajax({ data: { id: id @@ -541,7 +540,7 @@ td { type: "POST", url: "getMaterialDetails", success: function(json) { - // $('#content').loader('hide'); + $('#loader').hide(); //alert(json.MatDetail); $("#Description").val(json.MatDetail[0]['MaterialName']); $("#UOM").val(json.MatDetail[0]['UOM']); @@ -551,7 +550,7 @@ td { } else { $('#otherDescription').show(); } - //$('#content').loader('hide'); + $('#loader').hide(); } else { alert('Please select the RequestType'); return false; @@ -630,13 +629,14 @@ td { var servicePeriod = ''; var noOfService = ''; } + $('#loader').show(); $.ajax({ data: $('.requistion').serialize() + "&serviceSchedule=" + serviceSchedule + "&servicePeriod=" + servicePeriod + "&noOfService=" + noOfService, type: "POST", url: "EditRequisition", success: function(data) { if (data) { - // $('#content').loader('hide'); + $('#loader').hide(); alert(data); $('#txtRowCount').val(''); $('#txtDeletedRow').val(''); @@ -644,6 +644,8 @@ td { window.location = "Requisition"; } else { + $('#loader').hide(); + alert("Error"); } @@ -720,7 +722,7 @@ td { DelRows = "0" + ":" + rowid; } $('#txtDeletedRow').val(DelRows); - + $('#loader').show(); $.ajax({ data: { id: id @@ -728,6 +730,7 @@ td { type: "POST", url: "DeleteRequistionForm", success: function(data) { + $('#loader').hide(); if (data) { // $('#content').loader('hide'); alert(data); diff --git a/app/Views/editresinbatchcard.php b/app/Views/editresinbatchcard.php index 5ea83805..5a5b41a1 100755 --- a/app/Views/editresinbatchcard.php +++ b/app/Views/editresinbatchcard.php @@ -538,7 +538,7 @@ $('#igrnos').change(function(){ var html = ''; var igrno = $('#igrnos').val(); //alert(igrno); - $('.content').loader('show'); + $('#loader').show(); $.ajax({ data:{param1:igrno}, //dataType:"json", @@ -546,7 +546,7 @@ $('#igrnos').change(function(){ url:"resinbatchcard/getIGRLineNo", success:function(data) { - $('.content').loader('hide'); + $('#loader').hide(); // alert(data); data = JSON.parse(data); @@ -583,7 +583,7 @@ if(p == -1 || c == -1) } else { - $('.content').loader('show'); + $('#loader').show(); $.ajax({ data:{param1:p,param2:c,param3:type}, //dataType:"json", @@ -601,7 +601,7 @@ if(p == -1 || c == -1) htmlspec = ''; flag = 1; - $('.content').loader('hide'); + $('#loader').hide(); $.each(data,function(i,item){ @@ -646,7 +646,7 @@ if(p == -1 || c == -1) else { alert('No Master Records Found..!'); - $('.content').loader('hide'); + $('#loader').hide(); } } @@ -1257,7 +1257,7 @@ console.log(listopsforstore+'-'+oldops); - $('.content').loader('show'); + $('#loader').show(); $.ajax({ data:formData, type:"POST", @@ -1269,7 +1269,7 @@ console.log(listopsforstore+'-'+oldops); success:function(data) { if(data){ alert(data); - $('.content').loader('hide'); + $('#loader').hide(); window.location = ""; } @@ -1381,7 +1381,7 @@ $('#igrnos').change(function(){ var html = ''; var igrno = $('#igrnos').val(); - $('.content').loader('show'); + $('#loader').show(); $.ajax({ data:{param1:igrno}, @@ -1389,7 +1389,7 @@ $('#igrnos').change(function(){ url:"resinbatchcard/getIGRLineNo", success:function(data) { - $('.content').loader('hide'); + $('#loader').hide(); // alert(data); data = JSON.parse(data); @@ -1416,7 +1416,7 @@ $('#Resinigrnos').change(function(){ var igrno = $('#Resinigrnos').val(); //alert(igrno); - $('.content').loader('show'); + $('#loader').show(); $.ajax({ data:{param1:igrno}, //dataType:"json", @@ -1424,7 +1424,7 @@ $('#Resinigrnos').change(function(){ url:"resinbatchcard/getIGRLineNo", success:function(data) { - $('.content').loader('hide'); + $('#loader').hide(); // alert(data); data = JSON.parse(data); @@ -1451,7 +1451,7 @@ $('#Hexamineigrnos').change(function(){ var igrno = $('#Hexamineigrnos').val(); //alert(igrno); - $('.content').loader('show'); + $('#loader').show(); $.ajax({ data:{param1:igrno}, //dataType:"json", @@ -1459,7 +1459,7 @@ $('#Hexamineigrnos').change(function(){ url:"resinbatchcard/getIGRLineNo", success:function(data) { - $('.content').loader('hide'); + $('#loader').hide(); // alert(data); data = JSON.parse(data); @@ -1485,7 +1485,7 @@ $('#CSigrnos').change(function(){ var igrno = $('#CSigrnos').val(); //alert(igrno); - $('.content').loader('show'); + $('#loader').show(); $.ajax({ data:{param1:igrno}, //dataType:"json", @@ -1493,7 +1493,7 @@ $('#CSigrnos').change(function(){ url:"resinbatchcard/getIGRLineNo", success:function(data) { - $('.content').loader('hide'); + $('#loader').hide(); // alert(data); data = JSON.parse(data); @@ -1519,7 +1519,7 @@ $('#Catalystigrnos').change(function(){ var igrno = $('#Catalystigrnos').val(); //alert(igrno); - $('.content').loader('show'); + $('#loader').show(); $.ajax({ data:{param1:igrno}, //dataType:"json", @@ -1527,7 +1527,7 @@ $('#Catalystigrnos').change(function(){ url:"resinbatchcard/getIGRLineNo", success:function(data) { - $('.content').loader('hide'); + $('#loader').hide(); // alert(data); data = JSON.parse(data); @@ -1553,7 +1553,7 @@ $('#bagsigrnos').change(function(){ var igrno = $('#bagsigrnos').val(); //alert(igrno); - $('.content').loader('show'); + $('#loader').show(); $.ajax({ data:{param1:igrno}, //dataType:"json", @@ -1561,7 +1561,7 @@ $('#bagsigrnos').change(function(){ url:"resinbatchcard/getIGRLineNo", success:function(data) { - $('.content').loader('hide'); + $('#loader').hide(); // alert(data); data = JSON.parse(data); @@ -1587,7 +1587,7 @@ $('#tonigrnos').change(function(){ var igrno = $('#tonigrnos').val(); //alert(igrno); - $('.content').loader('show'); + $('#loader').show(); $.ajax({ data:{param1:igrno}, //dataType:"json", @@ -1595,7 +1595,7 @@ $('#tonigrnos').change(function(){ url:"resinbatchcard/getIGRLineNo", success:function(data) { - $('.content').loader('hide'); + $('#loader').hide(); // alert(data); data = JSON.parse(data); diff --git a/app/Views/editstorerequisition.php b/app/Views/editstorerequisition.php index 7ce48322..ea2b20d3 100755 --- a/app/Views/editstorerequisition.php +++ b/app/Views/editstorerequisition.php @@ -864,14 +864,15 @@ function Deleterow(rowid) } $('#txtDeletedRow').val(DelRows); - $.ajax({ + $('#loader').show(); + $.ajax({ data:{id:id}, type:"POST", url:"storerequisitionlist/DeleteRequistionForm", success:function(data) { if(data) { - $('#content').loader('hide'); + $('#loader').hide(); alert(data); @@ -879,6 +880,8 @@ function Deleterow(rowid) } else { + $('#loader').hide(); + alert("Error"); } @@ -951,14 +954,15 @@ function Deleterow(rowid) } $('#txtDeletedRow').val(DelRows); - $.ajax({ + $('#loader').show(); + $.ajax({ data:{id:id}, type:"POST", url:"storerequisitionlist/DeleteRequistionForm", success:function(data) { if(data) { - $('#content').loader('hide'); + $('#loader').hide(); alert(data); @@ -966,6 +970,8 @@ function Deleterow(rowid) } else { + $('#loader').hide(); + alert("Error"); } @@ -1047,8 +1053,8 @@ else { console.log($('.requistion').serialize()); - $('#content').loader('show'); - $.ajax({ + $('#loader').show(); + $.ajax({ data:$('.requistion').serialize(), type:"POST", url:"storerequisitionlist/UpdateStoreRequistion", @@ -1056,7 +1062,7 @@ else success:function(data) { if(data) { - $('#content').loader('hide'); + $('#loader').hide(); alert(data); $('#txtRowCount').val(''); $('#txtDeletedRow').val(''); @@ -1066,6 +1072,8 @@ else } else { + $('#loader').hide(); + alert("Error"); } diff --git a/app/Views/expense_list.php b/app/Views/expense_list.php index 2d6e01a5..60c010f8 100755 --- a/app/Views/expense_list.php +++ b/app/Views/expense_list.php @@ -327,7 +327,8 @@ }); formActionUrl = ''; // Set action URL for adding - $.ajax({ + $('#loader').show(); + $.ajax({ url: '', type: 'POST', data: { @@ -369,6 +370,7 @@ $('#transporterfile_name').val(''); // Clear hidden input if no file } togglePaymentMethodEdit(); + $('#loader').hide(); } }); @@ -410,7 +412,8 @@ var formData = new FormData($('#expenseForm')[0]); // Use FormData to handle file upload console.log(formActionUrl); - $.ajax({ + $('#loader').show(); + $.ajax({ url: formActionUrl, type: 'POST', data: formData, @@ -420,15 +423,19 @@ console.log(response); if (response) { - $('#expenseModal').modal('hide'); + $('#loader').hide(); $('#expenseForm')[0].reset(); $('#file-name-display').text(''); // Clear the file name display window.location.reload(); } else { + $('#loader').hide(); + console.log(response); } }, error: function(xhr, status, error) { + $('#loader').hide(); + alert('An error occurred: ' + error); } }); @@ -522,7 +529,8 @@ var fileName = $(this).data('file'); var expenseId = $(this).data('value'); - $.ajax({ + $('#loader').show(); + $.ajax({ url: '', type: 'POST', data: { @@ -534,16 +542,22 @@ var result = JSON.parse(response); if (result.success) { + $('#loader').hide(); + alert('File deleted successfully.'); $('#currentFileName').text(''); $('#transporterfile_name').val(''); $('#deleteFile').remove(); // Remove the delete button $('#transporterfile').next('a').remove(); // Remove the download link } else { + $('#loader').hide(); + alert('Failed to delete the file: ' + result.message); } }, error: function() { + $('#loader').hide(); + alert('Error deleting the file.'); } }); diff --git a/app/Views/importpo.php b/app/Views/importpo.php index dc7715cf..b02b1e60 100755 --- a/app/Views/importpo.php +++ b/app/Views/importpo.php @@ -538,7 +538,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
'Exchangerateon', 'value' => set_value('Exchangerateon', $CurrentDate), 'id' => 'Exchangerateon', 'class' => 'form-control num date_range form-date-search', 'required' => 'true', 'onkeypress' => 'return false;'); + $data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $CurrentDate), 'id' => 'Exchangerateon', 'class' => 'form-control num form-date-search', 'required' => 'true', 'onkeypress' => 'return false;'); echo form_input($data); ?>
@@ -2072,7 +2072,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) { //alert(); $(document).ready(function() { setTimeout(() => { - $('#Exchangerateon').addClass('date_range form-date-search'); + $('#Exchangerateon').addClass(' form-date-search'); }, 1000); $('#Date').click(function() { diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php index 8c4ee390..2eaee04a 100755 --- a/app/Views/includes/new_header.php +++ b/app/Views/includes/new_header.php @@ -71,6 +71,8 @@ 'Select Invoice No'); -foreach($records as $rec) -{ +$invoicenos = array(-1 => 'Select Invoice No'); +foreach ($records as $rec) { $invoicenos[$rec->invoice_number] = $rec->invoice_number; } //print_r($emplist); -$approvedby = array(-1=>'Select Approver Name'); -foreach($emplist as $r) -{ - $approvedby[$r->FirstName.' '.$r->LastName] = $r->FirstName.' '.$r->LastName.'-'.$r->shortName; +$approvedby = array(-1 => 'Select Approver Name'); +foreach ($emplist as $r) { + $approvedby[$r->FirstName . ' ' . $r->LastName] = $r->FirstName . ' ' . $r->LastName . '-' . $r->shortName; } ?> - - + +
- -
-

-
Pre Dispatch Inspection Report Screen
-

-
-
- - -
-
-
-
- -
- -
- -
-
- -
- - -
- -
-
- - -
- -
- - -
- -
- - - -
- -
- - - -
- -
- -
-
- - -
- -
- - -
- -
- - -
- - - -
-
- - - - - - - - - - - - - - -
SNODescriptionSpecification
Min		Specification
Max		Specification
UOM		ACT X1ACT X2ACT X3AverageResultsRemarks
-

 

-
- -
- -
L.O.I Details
- -
-
- - - - - - - - - - - - - -
SNO
Heating Time

start
Heating Time

end
Temp *c
Crucible Weight

w1(g)
Before Heating

w2(g)
After Heating

w3(g)
L.O.I %Remarks
-
+ +
+

+
Pre Dispatch Inspection Report Screen
+

+
+
-
- -
AFS Details
- -
-
- - - - - - - - - - - - - - - - - - - - - - - -
NOSieve Size µmSand WeightPercentageMultiplierProduct
1 1700 0.000.0050.0000
2 850 0.000.00100.0000
3 600 0.000.00200.0000
4 425 0.000.00300.0000
5 300 0.000.00400.0000
6 212 0.000.00500.0000
7 150 0.000.00700.0000
8 106 0.000.001000.0000
9 75 0.000.001400.0000
10 53 0.000.002000.0000
11 pan 0.000.003000.0000
  Total 0.000.00 0.0000
-
- -
- -
AFS CHART
- -
-
-
-
- Your browser does not support the HTML5 canvas tag.
- +
+
+
+
+ +
+ +
+ +
+
+ +
+ + +
+ +
+
+ +
-
- - - - - -
 
-
-
- -
- -
+ +
+ + +
+ +
+ + + +
+ +
+ + + +
+
+ +
+
+ + +
+ +
+ + +
+ +
+ + +
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + +
SNODescriptionSpecification
Min		Specification
Max		Specification
UOM		ACT X1ACT X2ACT X3AverageResultsRemarks
+

 

+
+ +
+ +
L.O.I Details
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + +
+
SNO
+ 		+
Heating Time

+
start
+ 		+
Heating Time

+
end
+ 		Temp *c +
Crucible Weight

+
w1(g)
+
+
Before Heating

+
w2(g)
+ 		+
After Heating

w3(g)
+
L.O.I %Remarks
+
+ + +
+ +
AFS Details
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NOSieve Size µmSand WeightPercentageMultiplierProduct
117000.000.0050.0000
28500.000.00100.0000
36000.000.00200.0000
44250.000.00300.0000
53000.000.00400.0000
62120.000.00500.0000
71500.000.00700.0000
81060.000.001000.0000
9750.000.001400.0000
10530.000.002000.0000
11pan0.000.003000.0000
 Total0.000.00 0.0000
+
+ +
+ +
AFS CHART
+
+ +
+
+
+
+ Your browser does not support the HTML5 canvas tag.
+ +
+
+ + + + + +
 
+
+
+ +
+ +
+
- -
- - - -
- -
- - - + +
+ + +
- -
- -
 
-
-
 
+ +
+ + + +
+ +
+ +
 
+
+
 
-
- -
-
+
+ +
+
- -
-
-
+
+
+
- - - - - - \ No newline at end of file + var dataset_locationsX = []; + var dataset_locationsY = []; + + var canvaswidth = document.getElementById('myCanvas').offsetWidth; + var canvasheight = document.getElementById('myCanvas').offsetHeight; + + ctx.beginPath(); + ctx.lineWidth = 1; + ctx.moveTo(30, 0); + ctx.lineTo(30, canvasheight); + ctx.strokeStyle = "black"; + ctx.stroke(); + ctx.closePath(); + + ctx.beginPath(); + ctx.lineWidth = 1; + ctx.moveTo(0, (canvasheight - 30)); + ctx.lineTo(canvaswidth, (canvasheight - 30)); + ctx.strokeStyle = "black"; + ctx.stroke(); + ctx.closePath(); + + ctx.beginPath(); + ctx.font = "bold 12px Arial"; + ctx.fillStyle = "black"; + ctx.fillText("Sieve size µm ", (canvaswidth / 2), (canvasheight - 2)); + ctx.closePath(); + + var xaxislabelwidth = (canvaswidth / 12); + + var startingpointX = 30; + var startingpointY = (canvasheight - 30); + + for (i = 1; i <= dashlinestart.length; i++) // Drawing Dashed Lines from Y + { + + ctx.beginPath(); + ctx.lineWidth = 0.8; + ctx.moveTo(startingpointX, dashlinestart[i - 1]); + //console.log(dataset_locationsY[i]); + ctx.lineTo(canvaswidth, dashlinestart[i - 1]); + ctx.setLineDash([3, 6]); + ctx.strokeStyle = "black"; + + ctx.stroke(); + ctx.closePath(); + + } + ctx.setLineDash([]); + for (i = 1; i <= xlabelscount; i++) //X DataLabel + { + ctx.beginPath(); + ctx.font = "bold 10px Arial"; + ctx.fillStyle = "black"; + ctx.fillText(xlabels[i - 1], (startingpointX + (xaxislabelwidth * i)), (startingpointY + 15)); + ctx.closePath(); + } + + + + for (i = 1; i <= xlabelscount; i++) // X Data + { + ctx.beginPath(); + ctx.arc((startingpointX + (xaxislabelwidth * i)), startingpointY, 4, 0, 2 * Math.PI); + ctx.fillStyle = "black"; + ctx.fill(); + ctx.closePath(); + var xl = (startingpointX + (xaxislabelwidth * i)); + + dataset_locationsX.push(xl); + + } + + + var j = 0; + var ylabel = 0; + for (i = 1; i <= maxdataitem; i++) // y Data and Y labels + { + + ctx.beginPath(); + ctx.arc(startingpointX, (startingpointY - j), 4, 0, 2 * Math.PI); + ctx.fillStyle = "black"; + ctx.fill(); + var yl = ((startingpointY - j)); + dataset_locationsY.push(yl); + ctx.fillStyle = "black"; + ctx.font = "bold 10px Arial"; + ctx.fillText((j / 7), (startingpointX - 30), (startingpointY - j)); + ylabel = ylabel + 5; + j = j + 35; + ctx.closePath(); + + } + + var finallocationofY = []; + var finallocationofX = []; + for (i = 1; i <= xlabelscount; i++) //Exact chart Data Draw red points + { + ctx.beginPath(); < + !--ctx.arc((parseFloat(dataset_locationsX[i - 1])), ((startingpointY - parseFloat(dataset[i - 1]) * 7)), 4, 0, 2 * Math.PI); + -- > + ctx.fillStyle = "red"; + ctx.lineCap = 'round'; < + !--ctx.fill(); + -- > + ctx.fillRect((parseFloat(dataset_locationsX[i - 1]) - 5), ((startingpointY - parseFloat(dataset[i - 1]) * 7) - 5), 10, 10) + finallocationofY.push((startingpointY - parseFloat(dataset[i - 1]) * 7)); + finallocationofX.push(parseFloat(dataset_locationsX[i - 1])); + ctx.closePath(); + //Draw text for data points + ctx.beginPath(); + ctx.font = "bold 12px Arial"; + ctx.fillStyle = "blue"; + ctx.fillText(dataset[i - 1], (parseFloat(dataset_locationsX[i - 1])), ((startingpointY - parseFloat(dataset[i - 1]) * 7) - 10)); + ctx.closePath(); + } + + + for (i = 0; i <= xlabelscount; i++) //Exact Chart Data Draw line + { + + ctx.beginPath(); + ctx.lineWidth = 4; + ctx.setLineDash([15, 5]); + ctx.moveTo(finallocationofX[i], finallocationofY[i]); + ctx.lineTo(finallocationofX[i + 1], finallocationofY[i + 1]); + + //ctx.strokeStyle="#1a75ff"; + //ctx.lineWidth=3; + //setInterval(function(){ + ctx.stroke(); + //},30000); + ctx.closePath(); + + + + } + + ctx.setLineDash([]); + //ctx.beginPath(); + + //sctx.closePath(); + + + } + \ No newline at end of file