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

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
aadhavan valli 2024-09-18 16:19:09 +05:30
commit e6817e4df6
7 changed files with 93 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/Controllers/Payslip.php
View File

@ -69,7 +69,9 @@ class Payslip extends BaseController
$EmpId = $this->request->getPost('employee');
$res = $this->payroll_model->getMonthlyPayDetails($EmpId, $PayOn);
$result = $res[0];
$loan = [];
$loanHistory = [];
$loan_id = 0;
@ -126,7 +128,6 @@ class Payslip extends BaseController
'ESINumber' => $result->ESINO,
'UANNO' => $result->PFNO,
];
$insert = $this->payroll_model->insertPayroll($data);
if($insert){
@ -895,16 +896,16 @@ class Payslip extends BaseController
$Created_By = $this->session->get('userId');
if (!is_numeric($DaysWorked) || ($DaysWorked > 31) || (strlen((string)$DaysWorked)) > 5) {
//echo $EmpID . "-LOP_Days Invalid Data!";
// echo $EmpID . "-LOP_Days Invalid Data!";
$ErrorFlag++;
}
if (!is_numeric($LOP_Days) || ($LOP_Days > 31) || (strlen((string)$LOP_Days)) > 5) {
//echo $EmpID . "-LOP_Days Invalid Data!";
// echo $EmpID . "-LOP_Days Invalid Data!";
$ErrorFlag++;
}
if (!is_numeric($Paid_leave) || ($Paid_leave > 31) || (strlen((string)$Paid_leave)) > 5) {
//echo $EmpID . "-Paid Leave Invalid Data!";
// echo $EmpID . "-Paid Leave Invalid Data!";
$ErrorFlag++;
}
@ -914,7 +915,7 @@ class Payslip extends BaseController
$OT_Hrs_Worked_first = explode(".", $OT_Hrs_Worked);
if (!is_numeric($OT_Hrs_Worked) || (strlen((string)$OT_Hrs_Worked)) > 6 || (strlen((string)$OT_Hrs_Worked_first[0])) >= 4) // || (strlen((string)$OT_Hrs_Worked_first[1]))> 3 )
{
//echo $EmpID . "-OT Hrs Invalid Data!";
// echo $EmpID . "-OT Hrs Invalid Data!";
$ErrorFlag++;
}
@ -923,14 +924,14 @@ class Payslip extends BaseController
$Loan_Recovered_first = explode(".", $Loan_Recovered);
if ((strlen((string)$Loan_Recovered)) > 8 || (strlen((string)$Loan_Recovered_first[0])) > 5) {
//echo $EmpID . "-Loan Recoverd Invalid Data!";
// echo $EmpID . "-Loan Recoverd Invalid Data!";
$ErrorFlag++;
}
} else if (is_string($Loan_Recovered)) {
//echo "STRING";
// echo "STRING";
if (strcasecmp($Loan_Recovered, 'NA')) {
//echo "NOT NA";
// echo "NOT NA";
$ErrorFlag++;
}
}
@ -939,18 +940,21 @@ class Payslip extends BaseController
$Festivalbonus_first = explode(".", $Festival_Bonus);
if (!is_numeric($Festival_Bonus) || (strlen((string)$Festival_Bonus)) > 8 || (strlen((string)$Festivalbonus_first[0])) > 5) {
// echo $EmpID . "-Festival bonus Invalid Data!";
$ErrorFlag++;
}
$Other_Deductions_first = explode(".", $Other_Deductions);
if (!is_numeric($Other_Deductions) || (strlen((string)$Other_Deductions)) > 8 || (strlen((string)$Other_Deductions_first[0])) > 5) {
//echo $EmpID . "-Loan Recoverd Invalid Data!";
// echo $EmpID . "-Other Deductions Invalid Data!";
$ErrorFlag++;
}
$Estimate_first = explode(".", $Estimate);
if (!is_numeric($Estimate) || (strlen((string)$Estimate)) > 8 || (strlen((string)$Estimate_first[0])) > 5) {
//echo $EmpID . "-Loan Recoverd Invalid Data!";
if (!is_numeric($Estimate) || (strlen((string)$Estimate)) > 8 || (strlen((string)$Estimate_first[0])) > 6) {
// echo $Estimate_first[0];
// echo $EmpID . "-Estimate Invalid Data!";
$ErrorFlag++;
}

2
app/Models/Payroll_model.php
View File

@ -494,7 +494,7 @@ class Payroll_model extends Model
function getMonthlyPayDetails($EmpId, $PayOn)
{
$builder = $this->db->table('t_monthly_pay_inputs MonthlyPay ')
->select('MonthlyPay.*, E.BankAccountNo , E.PFNO , E.ESI as ESINO , L.*')
->select('MonthlyPay.*, E.BankAccountNo , E.PFNO , E.ESI as ESINO , L.Loan_ID, L.Loan_Amount, L.Loan_Issued_Date, L.Monthly_Due, L.Due_Start_Date, L.No_of_Dues, L.Paid_Due, L.Remaining_Due, L.Paid_Amount')
->join('t_employee_details as E', 'MonthlyPay.EmpID = E.EmpID', 'left')
->join('t_loan_master as L', 'MonthlyPay.EmpID = L.EmpID and L.is_Active = 1', 'left')
->where('MonthlyPay.EmpID', $EmpId)

6
app/Views/attendance.php
View File

@ -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);

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

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

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

@ -354,6 +354,61 @@
/* This CSS is for Table Cell Expend*/
</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>
<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">
<!-- <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="#">
<i class="fe-maximize noti-icon"></i>
</a>
</li> -->
</li>
<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">

6
app/Views/monthlypayinputs.php
View File

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

17
app/Views/payslipgenerate.php
View File

@ -16,7 +16,7 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr
$('#PayOn').change(function() {
var id = $('#PayOn').val();
if (id != '-1') {
// $('#content').loader('show');
$('#loader').show();
$.ajax({
data: {
id1: id
@ -26,7 +26,7 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr
success: function(result) {
if (result) {
$("#Employee").empty();
// $('#content').loader('hide');
$('#loader').hide();
$("#Employee").append(result);
}
}
@ -49,7 +49,7 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr
$('#Employee').find('option').each(function() {
c++;
var employee = $(this).val();
// $('#content').loader('show');
$('#loader').show();
$.ajax({
data: {
payon: payon,
@ -68,7 +68,8 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr
type: "POST",
url: "<?php echo base_url(); ?>payslip/callsp",
success: function(result) {
// $('#content').loader('hide');
console.log(result);
$('#loader').hide();
}
});
}
@ -81,11 +82,11 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr
alert(c + '-Employees Salary Added Successfully!');
$('form#PayslipGenerator').submit();
alert("Please wait while Payslip Downloading...!");
// $('#content').loader('hide');
$('#loader').hide();
}, time);
} // else for select all not selected
else {
// $('#content').loader('show');
$('#loader').show();
$.ajax({
data: {
payon: payon,
@ -100,7 +101,7 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr
if (result == 1) {
$('form#PayslipGenerator').submit();
// $('#content').loader('hide');
$('#loader').hide();
alert("Payslip Downloaded Successfully..!");
} else {
@ -113,7 +114,7 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr
url: "<?php echo base_url(); ?>payslip/callsp",
success: function(result) {
$('form#PayslipGenerator').submit();
// $('#content').loader('hide');
$('#loader').hide();
alert("Salary Calculated Successfully..!");
}
});