payslip : GWM
This commit is contained in:
parent
939492f202
commit
04cd715c94
@ -1067,25 +1067,25 @@ class Payslip extends BaseController
|
||||
$filename = " ";
|
||||
$html = "";
|
||||
$All = $this->request->getPost('All');
|
||||
if ($All == '') {
|
||||
$this->validator->setRules([
|
||||
'Employee' => [
|
||||
'label' => 'Employee',
|
||||
'rules' => 'trim|callback_Employee_validate',
|
||||
]
|
||||
]);
|
||||
}
|
||||
// if ($All == '') {
|
||||
// $this->validator->setRules([
|
||||
// 'Employee' => [
|
||||
// 'label' => 'Employee',
|
||||
// 'rules' => 'trim|callback_Employee_validate',
|
||||
// ]
|
||||
// ]);
|
||||
// }
|
||||
|
||||
$this->validator->setRules([
|
||||
'PayOn' => [
|
||||
'label' => 'PayOn',
|
||||
'rules' => 'trim|callback_PayOn_validate',
|
||||
]
|
||||
]);
|
||||
// $this->validator->setRules([
|
||||
// 'PayOn' => [
|
||||
// 'label' => 'PayOn',
|
||||
// 'rules' => 'trim|callback_PayOn_validate',
|
||||
// ]
|
||||
// ]);
|
||||
|
||||
if ($this->validator->run() == FALSE) {
|
||||
$this->viewGenerator();
|
||||
} else {
|
||||
// if ($this->validator->run() == FALSE) {
|
||||
// $this->viewGenerator();
|
||||
// } else {
|
||||
$Payon = $this->request->getPost('PayOn');
|
||||
|
||||
$m = date("M", mktime(0, 0, 0, (int)$Payon, 10));
|
||||
@ -1193,7 +1193,7 @@ class Payslip extends BaseController
|
||||
$mpdf->SetTitle('Resico:Payslip');
|
||||
|
||||
$mpdf->Output("Payslip-" . $filename . ".pdf", 'D');
|
||||
}
|
||||
// }
|
||||
}
|
||||
|
||||
function updatePayslip()
|
||||
|
||||
@ -341,7 +341,7 @@ $currentday = date('d');
|
||||
<tr id="<?php echo $row;?>">
|
||||
<td width="45" height="45" class="celda_normal" ><?php echo $index;?></td>
|
||||
<td width="79" height="45" class="celda_normal"><?php echo $a->EmpID;?></td>
|
||||
<td width="80" height="45" class="celda_normal"><?php echo $a->FirstName.'-'.$a->LastName;?></td>
|
||||
<td width="80" height="45" class="celda_normal"><?php echo $a->FirstName;?></td>
|
||||
|
||||
<?php for ($col =1; $col <= $monthdays;$col++){
|
||||
$flag =0;
|
||||
|
||||
@ -779,23 +779,20 @@
|
||||
<?php if($DEPCode == ADMIN || $DEPCode == HR) { ?>
|
||||
<p class="menu-heading"><i class="fa fa-angle-right" aria-hidden="true"></i> HR</p>
|
||||
<?php } ?>
|
||||
<li class="treeview">
|
||||
<a href="#">
|
||||
<i class="fa fa-user-circle"></i>
|
||||
<span>Employee</span>
|
||||
<span class="pull-right-container">
|
||||
<i class="fa fa-angle-down pull-right"></i>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
<?php if ($DEPCode == ADMIN || $DEPCode == HR) { ?>
|
||||
<li><a href="<?php echo base_url(); ?>employeeListing" >
|
||||
|
||||
<li >
|
||||
<a href="<?php echo base_url(); ?>employeeListing" >
|
||||
<i class="fa fa-user-circle"></i>
|
||||
<span class="nav-label">Employee Details</span>
|
||||
</a></li>
|
||||
<?php } ?>
|
||||
</ul>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="<?php echo base_url(); ?>attendance">
|
||||
<i class="fa fa-clock-o "></i>
|
||||
<span>Attendance</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -878,11 +875,11 @@
|
||||
</span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
<!-- <li class="treeview">
|
||||
<a href="<?php echo base_url(); ?>Stock">
|
||||
<i class="fa fa-dashboard"></i> <span>Stock </span>
|
||||
</a>
|
||||
</li> -->
|
||||
<li class="treeview">
|
||||
<a href="<?php echo base_url(); ?>Stock">
|
||||
<i class="fa fa-dashboard"></i> <span>Stock </span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="<?php echo base_url(); ?>FinalProduct">
|
||||
<i class="fa fa-dashboard"></i> <span>Finished Product Batch Card</span>
|
||||
|
||||
@ -222,66 +222,8 @@ function DeleteRow(rowid) {
|
||||
}
|
||||
</script>
|
||||
|
||||
<!--
|
||||
<script>
|
||||
$(function() {
|
||||
|
||||
|
||||
$(document).ready(function() {
|
||||
$('#Requisition').DataTable({
|
||||
"paging": true,
|
||||
"lengthChange": true,
|
||||
"searching": true,
|
||||
"ordering": true,
|
||||
"columnDefs": [{
|
||||
"targets": 0,
|
||||
"type": "date-eu"
|
||||
}],
|
||||
"aaSorting": [
|
||||
[1, "desc"]
|
||||
],
|
||||
"info": true,
|
||||
"autoWidth": true,
|
||||
"pageLength": 10,
|
||||
"lengthMenu": [10, 25, 50,
|
||||
100
|
||||
]
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
$(function() {
|
||||
$("#fromDate").datepicker({
|
||||
dateFormat: 'dd-mm-yy',
|
||||
onSelect: function(selectedDate) {
|
||||
var minDate = $(this).datepicker("getDate");
|
||||
$("#toDate").datepicker("option", "minDate", minDate);
|
||||
}
|
||||
});
|
||||
|
||||
$("#toDate").datepicker({
|
||||
dateFormat: 'dd-mm-yy',
|
||||
onSelect: function(selectedDate) {
|
||||
var maxDate = $(this).datepicker("getDate");
|
||||
$("#fromDate").datepicker("option", "maxDate", maxDate);
|
||||
}
|
||||
});
|
||||
|
||||
$("#resetButton").click(function() {
|
||||
$("#fromDate").datepicker("setDate", null);
|
||||
$("#toDate").datepicker("setDate", null);
|
||||
});
|
||||
|
||||
|
||||
|
||||
});
|
||||
</script> -->
|
||||
|
||||
|
||||
|
||||
|
||||
@ -303,7 +245,8 @@ $(document).ready(function() {
|
||||
"info": true,
|
||||
"autoWidth": true,
|
||||
"pageLength": 10,
|
||||
"lengthMenu": [10, 25, 50, 100]
|
||||
"lengthMenu": [10, 25, 50, 100],
|
||||
|
||||
});
|
||||
|
||||
// Initialize the datepickers
|
||||
|
||||
Loading…
Reference in New Issue
Block a user