merge : GWM
This commit is contained in:
parent
55d49266e5
commit
610e75999e
@ -84,18 +84,19 @@
|
||||
<div class="box-header">
|
||||
<!--<center><h3 class="box-title">-->
|
||||
<div class="box-tools">
|
||||
<!-- <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() ?>monthlyListings" method="POST" id="searchList">
|
||||
</form>
|
||||
|
||||
<!-- <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> -->
|
||||
|
||||
</div>
|
||||
<!--</h3></center>-->
|
||||
|
||||
</div><!-- /.box-header -->
|
||||
<?php
|
||||
//print_r($sample);
|
||||
|
||||
$year = date("Y");
|
||||
$current = date("m-Y");
|
||||
|
||||
@ -368,6 +369,7 @@
|
||||
</td>
|
||||
|
||||
<?php $totalotherDet[] = isset($Other_Deductions) ? $Other_Deductions : []; ?>
|
||||
|
||||
<td id="Festival<?php echo $index ?>" onkeypress="return isNumber(event);"
|
||||
onkeyup="changeInput(event);"
|
||||
<?php if (empty($record->Key)) {
|
||||
@ -539,46 +541,8 @@
|
||||
i = i + 1;
|
||||
totalmonthloan[i] = $(this).find('td').eq(7).text();
|
||||
});
|
||||
//console.log(totalmonthloan);
|
||||
/* $('#monthlylisting').DataTable({
|
||||
"paging": true,
|
||||
"lengthChange": true,
|
||||
"searching": true,
|
||||
"ordering": true,
|
||||
"aaSorting": [[ 0, "asc" ]],
|
||||
"info": true,
|
||||
"autoWidth": true
|
||||
|
||||
}); */
|
||||
|
||||
|
||||
//var key = <?php echo $show_hide_column_value; ?>;
|
||||
|
||||
|
||||
//alert($('#monthyear').val());
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// show_hide_column(11,key);
|
||||
// var t = $('#monthlylistings').DataTable({
|
||||
// "columnDefs": [{
|
||||
// "searchable": false,
|
||||
// "orderable": false,
|
||||
// "targets": 0
|
||||
// }],
|
||||
// "searching": true,
|
||||
// "lengthChange": true,
|
||||
// "info": true,
|
||||
// "paging": false,
|
||||
// "autoWidth": true,
|
||||
|
||||
// // "scrollX": true,
|
||||
// "order": [
|
||||
// [1, 'asc']
|
||||
// ],
|
||||
// });
|
||||
|
||||
t.on('order.dt search.dt', function() {
|
||||
t.column(0, {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user