diff --git a/app/Controllers/Payslip.php b/app/Controllers/Payslip.php index d1beec02..52e84ee8 100755 --- a/app/Controllers/Payslip.php +++ b/app/Controllers/Payslip.php @@ -69,6 +69,7 @@ class Payslip extends BaseController $EmpId = $this->request->getPost('employee'); $res = $this->payroll_model->getMonthlyPayDetails($EmpId, $PayOn); + // print_r($res);die; $result = $res[0]; $loan = []; $loanHistory = []; diff --git a/app/Views/attendance.php b/app/Views/attendance.php index b267f23d..62779526 100755 --- a/app/Views/attendance.php +++ b/app/Views/attendance.php @@ -519,7 +519,8 @@ $currentday = date('d'); var currentdate = '01-' + currentmonth + '-' + currentyear; var totaldata = 0; - // $('.content').loader('show'); + + $('#loader').show(); $.ajax({ data: { param1: alldata, @@ -532,7 +533,8 @@ $currentday = date('d'); success: function(data) { if (data) { - // $('.content').loader('hide'); + + $('#loader').hide(); alert(data); //totaldata = totaldata + parseFloat(data); //console.log(data); diff --git a/app/Views/includes/new_footer.php b/app/Views/includes/new_footer.php index 67b9e516..206e2c53 100755 --- a/app/Views/includes/new_footer.php +++ b/app/Views/includes/new_footer.php @@ -119,6 +119,9 @@ // todayHighlight: true, // clearBtn: true // }); + + + diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php index 55d69e6b..a2bba4ba 100755 --- a/app/Views/includes/new_header.php +++ b/app/Views/includes/new_header.php @@ -354,6 +354,61 @@ /* This CSS is for Table Cell Expend*/ + + + + + + + + @@ -367,11 +422,11 @@