RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HR issue : GWM

Browse Source
This commit is contained in:
Smart 2024-09-18 15:01:43 +05:30
parent 24e02fc3be
commit 452e0746b5
5 changed files with 69 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controllers/Payslip.php
View File

@ -69,6 +69,7 @@ class Payslip extends BaseController
$EmpId = $this->request->getPost('employee'); $EmpId = $this->request->getPost('employee');
$res = $this->payroll_model->getMonthlyPayDetails($EmpId, $PayOn); $res = $this->payroll_model->getMonthlyPayDetails($EmpId, $PayOn);
// print_r($res);die;
$result = $res[0]; $result = $res[0];
$loan = []; $loan = [];
$loanHistory = []; $loanHistory = [];

6
app/Views/attendance.php
View File

@ -519,7 +519,8 @@ $currentday = date('d');
var currentdate = '01-' + currentmonth + '-' + currentyear; var currentdate = '01-' + currentmonth + '-' + currentyear;
var totaldata = 0; var totaldata = 0;
// $('.content').loader('show');
$('#loader').show();
$.ajax({ $.ajax({
data: { data: {
param1: alldata, param1: alldata,
@ -532,7 +533,8 @@ $currentday = date('d');
success: function(data) { success: function(data) {
if (data) { if (data) {
// $('.content').loader('hide');
$('#loader').hide();
alert(data); alert(data);
//totaldata = totaldata + parseFloat(data); //totaldata = totaldata + parseFloat(data);
//console.log(data); //console.log(data);

3
app/Views/includes/new_footer.php
View File

@ -119,6 +119,9 @@
// todayHighlight: true, // todayHighlight: true,
// clearBtn: true // clearBtn: true
// }); // });
</script> </script>
</body> </body>

59
app/Views/includes/new_header.php
View File

@ -354,6 +354,61 @@
/* This CSS is for Table Cell Expend*/ /* This CSS is for Table Cell Expend*/
</style> </style>
<!-- loader css code start -->
<div id="loader" style="display:none;"><div class="lds-hourglass"></div></div>
<style>
#loader {
display: flex;
justify-content: center;
align-items: center;
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
background: #00000014;
z-index: 9999;
}
.lds-hourglass {
display: inline-block;
position: relative;
width: 80px;
height: 80px;
}
.lds-hourglass:after {
content: " ";
display: block;
border-radius: 50%;
width: 0;
height: 0;
margin: 6px;
box-sizing: border-box;
border: 26px solid #333;
border-color: #d86935 transparent #616bac transparent;
animation: lds-hourglass 1.2s infinite;
}
@keyframes lds-hourglass {
0% {
transform: rotate(0);
animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
}
50% {
transform: rotate(900deg);
animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
}
100% {
transform: rotate(1800deg);
}
}
</style>
<!-- loader css code end -->
</head> </head>
<body class="loading" data-layout-mode="horizontal" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": true}'> <body class="loading" data-layout-mode="horizontal" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": true}'>
@ -367,11 +422,11 @@
<ul class="list-unstyled topnav-menu float-right mb-0"> <ul class="list-unstyled topnav-menu float-right mb-0">
<!-- <li class="dropdown d-none d-lg-inline-block"> <li class="dropdown d-none d-lg-inline-block">
<a class="nav-link dropdown-toggle arrow-none waves-effect waves-light" data-toggle="fullscreen" href="#"> <a class="nav-link dropdown-toggle arrow-none waves-effect waves-light" data-toggle="fullscreen" href="#">
<i class="fe-maximize noti-icon"></i> <i class="fe-maximize noti-icon"></i>
</a> </a>
</li> --> </li>
<li class="dropdown notification-list topbar-dropdown"> <li class="dropdown notification-list topbar-dropdown">
<a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false"> <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">

6
app/Views/monthlypayinputs.php
View File

@ -598,7 +598,8 @@
// Convert the filtered array back to a JSON string if needed // Convert the filtered array back to a JSON string if needed
alldata = JSON.stringify(alldata); alldata = JSON.stringify(alldata);
var month = $('#monthyear').val(); var month = $('#monthyear').val();
// $('.content').loader('show');
$('#loader').show();
$.ajax({ $.ajax({
data: { data: {
param1: alldata, param1: alldata,
@ -611,7 +612,8 @@
console.log(data); console.log(data);
if (data) { if (data) {
// $('.content').loader('hide');
$('#loader').hide();
alert(data); alert(data);
//console.log(data); //console.log(data);