diff --git a/application/views/loanreports.php b/application/views/loanreports.php index c419dc70..bc82eda7 100755 --- a/application/views/loanreports.php +++ b/application/views/loanreports.php @@ -191,15 +191,15 @@ S.No Employee Name - Loan Given + Loan Given ₹ Loan Issue Date - Loan Recovered + Loan Recovered ₹ Loan Status - Loan Balance + Loan Balance ₹ @@ -227,7 +227,7 @@ Loan_Amount)){$totalloangiven+=$rec->Loan_Amount; echo $rec->Loan_Amount;}else{echo "0.00";}?> - Loan_Issued_Date)){echo $rec->Loan_Issued_Date;}else{echo "-";}?> + Loan_Issued_Date)){echo date_format(date_create($rec->Loan_Issued_Date),'d-m-Y');}else{echo "-";}?> Paid_Amount)){$totalrecovered+=$rec->Paid_Amount ;echo $rec->Paid_Amount;}else{echo "0.00";} ?> Total - + - + - + @@ -316,7 +316,7 @@ - + - +

-->
+

The Red highlighted Employee have loan to pay. Put 'NA' for Skip Current Month Loan Due.

diff --git a/application/views/qualitymaster.php b/application/views/qualitymaster.php index d72bba0f..624983c0 100644 --- a/application/views/qualitymaster.php +++ b/application/views/qualitymaster.php @@ -302,7 +302,8 @@ $("#specmodel").on("shown.bs.modal", function(e) { } }); - rowid.parentNode.removeChild(tr); + //rowid.parentNode.removeChild(rowid); + $('#testspecifications').find('tr').eq(rowid).remove(); } } diff --git a/application/views/qualityreport.php b/application/views/qualityreport.php index 77148a96..4915989b 100644 --- a/application/views/qualityreport.php +++ b/application/views/qualityreport.php @@ -257,7 +257,8 @@ $(document).ready(function(){ }); $('#reportdate').datepicker({ - minDate : 'now', + //minDate : 'year+16', + maxDate : 'now', dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10' }); @@ -400,13 +401,14 @@ $(document).ready(function(){ function calculateMaster(id) { - + if(document.getElementById('12sw')){ var SW12 = document.getElementById('12sw').textContent; if(SW12 != 100) { - alert('AFS Details Sans Weight Total Should be 100..!'); + alert('AFS Details Sand Weight Total Should be 100..!'); return false; } + } if($('#invoiceno').val() == -1) { diff --git a/application/views/viewIndSpec.php b/application/views/viewIndSpec.php index 6d89f149..5378a449 100644 --- a/application/views/viewIndSpec.php +++ b/application/views/viewIndSpec.php @@ -280,11 +280,11 @@ $("#specmodel").on("shown.bs.modal", function(e) { } else{ var rowid = r; - alert(rowid); + //alert(rowid); var d=''; var Row = $('#testspecifications').find('tr').eq(rowid).find('td'); - console.log(Row); + //console.log(Row); $.each(Row,function(index,value){ if(index == 0 ){ @@ -305,8 +305,10 @@ $("#specmodel").on("shown.bs.modal", function(e) { } }); - r.parentNode.removeChild(tr); - } + $('#testspecifications').find('tr').eq(rowid).remove(); + //rowid.parentNode.removeChild(rowid); + //document.getElementById('#testspecifications').removeChild(document.getElementById('#'+rowid)); + } } diff --git a/application/views/viewindreport.php b/application/views/viewindreport.php index 72c9f767..f72196a1 100644 --- a/application/views/viewindreport.php +++ b/application/views/viewindreport.php @@ -74,7 +74,7 @@ th{
- +
@@ -104,7 +104,7 @@ th{
- +
@@ -334,9 +334,9 @@ ctx.stroke(); ctx.closePath(); ctx.beginPath(); -ctx.font = "10px Arial"; +ctx.font = "bold 12px Arial"; ctx.fillStyle = "black"; -ctx.fillText("Sand Weight",(canvaswidth/2),(canvasheight-2)); +ctx.fillText("Sieve Size µm",(canvaswidth/2),(canvasheight-2)); ctx.closePath(); var xaxislabelwidth = (canvaswidth/12);

Date Due_Month Due Amount Balance Amount
Date Due_Month Due Amount ₹ Balance Amount ₹
Entry_Date),'Y-m-d');?> Due_Amount ;?> Balance_Amount;?>
Entry_Date),'d-m-Y');?> Due_Amount ;?> Balance_Amount;?>