SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QAD ISSUES and Other Cosmetic Issues Fixed

Browse Source
This commit is contained in:
velz2020 2017-12-06 17:38:50 +05:30
parent 3dedcb9229
commit e6436aa3e2
6 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
application/views/loanreports.php
View File

@ -191,15 +191,15 @@
<th>S.No</th> <th>S.No</th>
<th>Employee Name</th> <th>Employee Name</th>
<th>Loan Given</th> <th>Loan Given ₹</th>
<?php if($dateflag == 1) {?> <?php if($dateflag == 1) {?>
<th>Loan Issue Date</th> <th>Loan Issue Date</th>
<?php }?> <?php }?>
<th>Loan Recovered</th> <th>Loan Recovered ₹ </th>
<?php if($statusflag == 1) {?> <?php if($statusflag == 1) {?>
<th>Loan Status</th> <th>Loan Status</th>
<?php }?> <?php }?>
<th>Loan Balance</th> <th>Loan Balance ₹</th>
</tr> </tr>
@ -227,7 +227,7 @@
<?php }?> <?php }?>
<td style="text-align:right;"><?php if(!empty($rec->Loan_Amount)){$totalloangiven+=$rec->Loan_Amount; echo $rec->Loan_Amount;}else{echo "0.00";}?></td> <td style="text-align:right;"><?php if(!empty($rec->Loan_Amount)){$totalloangiven+=$rec->Loan_Amount; echo $rec->Loan_Amount;}else{echo "0.00";}?></td>
<?php if($dateflag == 1) {?> <?php if($dateflag == 1) {?>
<td style="text-align:right;"><?php if(!empty($rec->Loan_Issued_Date)){echo $rec->Loan_Issued_Date;}else{echo "-";}?></td> <td style="text-align:right;"><?php if(!empty($rec->Loan_Issued_Date)){echo date_format(date_create($rec->Loan_Issued_Date),'d-m-Y');}else{echo "-";}?></td>
<?php }?> <?php }?>
<td style="text-align:right;"><?php if(!empty($rec->Paid_Amount)){$totalrecovered+=$rec->Paid_Amount ;echo $rec->Paid_Amount;}else{echo "0.00";} ?></td> <td style="text-align:right;"><?php if(!empty($rec->Paid_Amount)){$totalrecovered+=$rec->Paid_Amount ;echo $rec->Paid_Amount;}else{echo "0.00";} ?></td>
<?php if($statusflag == 1) { <?php if($statusflag == 1) {
@ -269,19 +269,19 @@
<tr> <tr>
<td></td> <td></td>
<td style="text-align:right;"><strong>Total</strong></td> <td style="text-align:right;"><strong>Total</strong></td>
<td style="text-align:left;"><strong><?php echo number_format($totalloangiven,2,'.','');?></strong></td> <td style="text-align:right;"><strong><?php echo number_format($totalloangiven,2,'.','');?></strong></td>
<?php if($dateflag == 1) {?> <?php if($dateflag == 1) {?>
<td></td> <td></td>
<?php }?> <?php }?>
<td style="text-align:left;"><strong><?php echo number_format($totalrecovered,2,'.','');?></strong></td> <td style="text-align:right;"><strong><?php echo number_format($totalrecovered,2,'.','');?></strong></td>
<?php if($statusflag == 1) {?> <?php if($statusflag == 1) {?>
<td></td> <td></td>
<?php }?> <?php }?>
<td style="text-align:left;"><strong><?php echo number_format( $totalbalance,2,'.','');?></strong></td> <td style="text-align:right;"><strong><?php echo number_format( $totalbalance,2,'.','');?></strong></td>
<tr> <tr>
</table> </table>
</div> </div>
@ -316,7 +316,7 @@
<table id="historytable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;"> <table id="historytable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
<thead style="background-color:#ddf"> <thead style="background-color:#ddf">
<tr><th>Date </th> <th>Due_Month </th> <th>Due Amount </th> <th>Balance Amount</th> </tr> <tr><th>Date </th> <th>Due_Month </th> <th>Due Amount ₹</th> <th>Balance Amount ₹</th> </tr>
</thead> </thead>
<tbody> <tbody>
<?php <?php
@ -330,7 +330,7 @@
$final = $monthsoptions[$monthno].'-'.$yr; $final = $monthsoptions[$monthno].'-'.$yr;
?> ?>
<tr> <td style="text-align:left;"><?php echo date_format(date_create($child->Entry_Date),'Y-m-d');?></td> <td style="text-align:right;"><?php echo $final;?></td> <td style="text-align:right;"><?php echo $child->Due_Amount ;?></td> <td style="text-align:right;"><?php echo $child->Balance_Amount;?></td> </tr> <tr> <td style="text-align:left;"><?php echo date_format(date_create($child->Entry_Date),'d-m-Y');?></td> <td style="text-align:right;"><?php echo $final;?></td> <td style="text-align:right;"><?php echo $child->Due_Amount ;?></td> <td style="text-align:right;"><?php echo $child->Balance_Amount;?></td> </tr>
<?php <?php
} }
} }

1
application/views/monthlypayinputs.php
View File

@ -49,6 +49,7 @@ $('html').bind('keypress', function(e)
<!--<center><h3 class="box-title">--> <!--<center><h3 class="box-title">-->
<div class="box-tools"> <div class="box-tools">
<!-- <form action="<?php echo base_url() ?>assetListing" method="POST" id="searchList">--> <!-- <form action="<?php echo base_url() ?>assetListing" method="POST" id="searchList">-->
<p><b>The <span style="background-color:#ff4d4d;">Red</span> highlighted Employee have loan to pay. Put <span style="background-color:#66ff33;">'NA'</span> for Skip Current Month Loan Due.</b></p>
<form action="<?php echo base_url() ?>monthlypay/monthlyListing" method="POST" id="searchList"> <form action="<?php echo base_url() ?>monthlypay/monthlyListing" method="POST" id="searchList">
</form> </form>

3
application/views/qualitymaster.php
View File

@ -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();
} }
} }
</script> </script>

8
application/views/qualityreport.php
View File

@ -257,7 +257,8 @@ $(document).ready(function(){
}); });
$('#reportdate').datepicker({ $('#reportdate').datepicker({
minDate : 'now', //minDate : 'year+16',
maxDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10' dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
}); });
@ -400,13 +401,14 @@ $(document).ready(function(){
function calculateMaster(id) function calculateMaster(id)
{ {
if(document.getElementById('12sw')){
var SW12 = document.getElementById('12sw').textContent; var SW12 = document.getElementById('12sw').textContent;
if(SW12 != 100) if(SW12 != 100)
{ {
alert('AFS Details Sans Weight Total Should be 100..!'); alert('AFS Details Sand Weight Total Should be 100..!');
return false; return false;
} }
}
if($('#invoiceno').val() == -1) if($('#invoiceno').val() == -1)
{ {

10
application/views/viewIndSpec.php
View File

@ -280,11 +280,11 @@ $("#specmodel").on("shown.bs.modal", function(e) {
} }
else{ else{
var rowid = r; var rowid = r;
alert(rowid); //alert(rowid);
var d=''; var d='';
var Row = $('#testspecifications').find('tr').eq(rowid).find('td'); var Row = $('#testspecifications').find('tr').eq(rowid).find('td');
console.log(Row); //console.log(Row);
$.each(Row,function(index,value){ $.each(Row,function(index,value){
if(index == 0 ){ 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));
}
} }
</script> </script>

8
application/views/viewindreport.php
View File

@ -74,7 +74,7 @@ th{
</form> </form>
<div class="col-md-3"> <div class="col-md-3">
<label>Invoice Date</label> <label>Invoice Date</label>
<input type="text" id="invoicedate" name="invoicedate" value="<?php echo $invoicedate;?>" class="form-control" readonly> <input type="text" id="invoicedate" name="invoicedate" value="<?php echo date_format(date_create($invoicedate),'d-m-Y');?>" class="form-control" readonly>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
@ -104,7 +104,7 @@ th{
<div class="col-md-3"> <div class="col-md-3">
<label>Batch Date</label> <label>Batch Date</label>
<input type="text" id="reportdate" name="reportdate" class="form-control" value = "<?php echo $batchdate?>" readonly> <input type="text" id="reportdate" name="reportdate" class="form-control" value = "<?php echo date_format(date_create($batchdate),'d-m-Y');?>" readonly>
</div> </div>
@ -334,9 +334,9 @@ ctx.stroke();
ctx.closePath(); ctx.closePath();
ctx.beginPath(); ctx.beginPath();
ctx.font = "10px Arial"; ctx.font = "bold 12px Arial";
ctx.fillStyle = "black"; ctx.fillStyle = "black";
ctx.fillText("Sand Weight",(canvaswidth/2),(canvasheight-2)); ctx.fillText("Sieve Size µm",(canvaswidth/2),(canvasheight-2));
ctx.closePath(); ctx.closePath();
var xaxislabelwidth = (canvaswidth/12); var xaxislabelwidth = (canvaswidth/12);