monthly payment listing screen changes
This commit is contained in:
parent
08a321ff73
commit
77a4228156
@ -498,7 +498,7 @@ function phpAlert($msg) {
|
|||||||
$current = date("m-Y");
|
$current = date("m-Y");
|
||||||
$data['month'] = $this-> monthlypay_model->monthlyListing($current);
|
$data['month'] = $this-> monthlypay_model->monthlyListing($current);
|
||||||
// $data['fresh'] = $this-> monthlypay_model->getEmpPayDetails($current);
|
// $data['fresh'] = $this-> monthlypay_model->getEmpPayDetails($current);
|
||||||
|
$data['dropdownvalue'] = $current;
|
||||||
$data['fresh'] = $this-> monthlypay_model->getEmpPayDetailsforMonthInputs($current);
|
$data['fresh'] = $this-> monthlypay_model->getEmpPayDetailsforMonthInputs($current);
|
||||||
$this->global['pageTitle'] = 'Siddharth : Payroll Monthly Inputs';
|
$this->global['pageTitle'] = 'Siddharth : Payroll Monthly Inputs';
|
||||||
$this->loadViews("monthlypayinputs", $this->global,$data,NULL);
|
$this->loadViews("monthlypayinputs", $this->global,$data,NULL);
|
||||||
@ -509,12 +509,15 @@ function phpAlert($msg) {
|
|||||||
function changeMonth()
|
function changeMonth()
|
||||||
{
|
{
|
||||||
|
|
||||||
$current = $this->input->post('param1');
|
$current = $this->input->post('monthyear');
|
||||||
// echo $current;die();
|
|
||||||
$month = $this-> monthlypay_model->monthlyListing($current);
|
$data['month'] = $this-> monthlypay_model->monthlyListing($current);
|
||||||
$fresh = $this-> monthlypay_model->getEmpPayDetailsforMonthInputs($current);
|
|
||||||
$data = json_encode(array_merge($month,$fresh));
|
$data['dropdownvalue'] = $current;
|
||||||
echo $data;
|
$data['fresh'] = $this-> monthlypay_model->getEmpPayDetailsforMonthInputs($current);
|
||||||
|
|
||||||
|
$this->global['pageTitle'] = 'Siddharth : Payroll Monthly Inputs';
|
||||||
|
$this->loadViews("monthlypayinputs", $this->global,$data,NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -49,8 +49,9 @@ class monthlypay_model extends CI_Model
|
|||||||
//echo $current;
|
//echo $current;
|
||||||
$current = date_create($current);
|
$current = date_create($current);
|
||||||
$current = date_format($current,'Y-m-d');
|
$current = date_format($current,'Y-m-d');
|
||||||
$sql = "select T_Emp_Pay_Data.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.DateofJoining,T_Attendance.Days_Worked as Days_worked,T_Attendance.Absent as LOP_Days,T_Attendance.Paid_Leave as Paid_leave,T_Attendance.Total_OTHrs as OT_Hrs_Worked,T_Attendance.NoofDays,T_Loan_Master.Loan_ID from T_Emp_Pay_Data
|
$sql = "select T_Emp_Pay_Data.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.DateofJoining,T_Attendance.Days_Worked as Days_worked,T_Attendance.Absent as LOP_Days,T_Attendance.Paid_Leave as Paid_leave,T_Attendance.Total_OTHrs as OT_Hrs_Worked,T_Attendance.NoofDays,T_Loan_Master.Loan_ID,T_Payroll.Key from T_Emp_Pay_Data
|
||||||
left join T_Employee_Details on T_Employee_Details.EmpID = T_Emp_Pay_Data.EmpID
|
left join T_Employee_Details on T_Employee_Details.EmpID = T_Emp_Pay_Data.EmpID
|
||||||
|
left join T_Payroll on T_Employee_Details.EmpID = T_Payroll.EmpID
|
||||||
left join T_Attendance on T_Emp_Pay_Data.EmpID = T_Attendance.EmpID
|
left join T_Attendance on T_Emp_Pay_Data.EmpID = T_Attendance.EmpID
|
||||||
left join T_Loan_Master on T_Emp_Pay_Data.EmpID = T_Loan_Master.EmpID and T_Loan_Master.is_Active = 1
|
left join T_Loan_Master on T_Emp_Pay_Data.EmpID = T_Loan_Master.EmpID and T_Loan_Master.is_Active = 1
|
||||||
where T_Employee_Details.DateofJoining <= CURRENT_DATE
|
where T_Employee_Details.DateofJoining <= CURRENT_DATE
|
||||||
|
|||||||
@ -1,4 +1,23 @@
|
|||||||
<?php $sample = array_merge($month,$fresh); ?>
|
<?php
|
||||||
|
$sample = array_merge($month,$fresh);
|
||||||
|
$ex = explode('-',$dropdownvalue);
|
||||||
|
|
||||||
|
if(strlen($ex[0])== '2')
|
||||||
|
{
|
||||||
|
if($ex[0] < 10)
|
||||||
|
{
|
||||||
|
$ex1 = substr($ex[0],1);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
$ex1 = $ex[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
$ex1 = $ex[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
$drop = $ex1.'-'.$ex[1];
|
||||||
|
?>
|
||||||
|
|
||||||
<script src="<?php echo base_url()?>assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
|
<script src="<?php echo base_url()?>assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
|
||||||
<script src="<?php echo base_url()?>assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
|
<script src="<?php echo base_url()?>assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
|
||||||
@ -115,7 +134,9 @@ $('html').bind('keypress', function(e)
|
|||||||
?>
|
?>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<?php echo form_dropdown('name="monthyear"',$ot,set_value('monthyear',$currentselection),'id="monthyear"' ,'class="form-control select2');?>
|
<form id="formid">
|
||||||
|
<?php echo form_dropdown('monthyear',$ot,set_value('monthyear',$currentselection),'id="monthyear"' ,'class="form-control select2');?>
|
||||||
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
@ -211,22 +232,20 @@ $('html').bind('keypress', function(e)
|
|||||||
</div>
|
</div>
|
||||||
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
|
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
// $(function () {
|
$(function () {
|
||||||
|
|
||||||
|
|
||||||
// $('#monthlylisting').DataTable({
|
/* $('#monthlylisting').DataTable({
|
||||||
// "paging": true,
|
"paging": true,
|
||||||
// "lengthChange": true,
|
"lengthChange": true,
|
||||||
// "searching": true,
|
"searching": true,
|
||||||
// "ordering": true,
|
"ordering": true,
|
||||||
// "aaSorting": [[ 0, "asc" ]],
|
"aaSorting": [[ 0, "asc" ]],
|
||||||
// "info": true,
|
"info": true,
|
||||||
// "autoWidth": true
|
"autoWidth": true
|
||||||
|
|
||||||
// });
|
}); */
|
||||||
|
|
||||||
|
|
||||||
$(document).ready(function() {
|
|
||||||
var t = $('#monthlylistings').DataTable( {
|
var t = $('#monthlylistings').DataTable( {
|
||||||
"columnDefs": [ {
|
"columnDefs": [ {
|
||||||
"searchable": false,
|
"searchable": false,
|
||||||
@ -236,6 +255,7 @@ $(document).ready(function() {
|
|||||||
"searching": true,
|
"searching": true,
|
||||||
"lengthChange": true,
|
"lengthChange": true,
|
||||||
"info": true,
|
"info": true,
|
||||||
|
"paging": false,
|
||||||
"autoWidth": true,
|
"autoWidth": true,
|
||||||
"order": [[ 1, 'asc' ]]
|
"order": [[ 1, 'asc' ]]
|
||||||
} );
|
} );
|
||||||
@ -245,7 +265,13 @@ $(document).ready(function() {
|
|||||||
cell.innerHTML = i+1;
|
cell.innerHTML = i+1;
|
||||||
} );
|
} );
|
||||||
} ).draw();
|
} ).draw();
|
||||||
} );
|
|
||||||
|
var s = "<?php echo $drop; ?>";
|
||||||
|
$('#monthyear').val(s);
|
||||||
|
|
||||||
|
savebuttonvalidation();
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -277,156 +303,80 @@ $(document).ready(function() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$("#monthyear").change(function(){
|
$("#monthyear").change(function(){
|
||||||
|
|
||||||
|
$s = $('#monthyear').val();
|
||||||
|
//echo $dropdownvalue;
|
||||||
|
//$('#monthyear').attr('selected',true);
|
||||||
|
//alert($s);
|
||||||
|
|
||||||
|
$("#formid").attr("method", "post");
|
||||||
|
//alert($s);
|
||||||
|
$("#formid").attr("action", "<?php echo base_url() ?>payslip/changeMonth");
|
||||||
|
|
||||||
|
$('#formid').submit();
|
||||||
|
|
||||||
|
|
||||||
|
});
|
||||||
|
function savebuttonvalidation()
|
||||||
|
{
|
||||||
var curselection = $("#monthyear").val();
|
var curselection = $("#monthyear").val();
|
||||||
// alert('current selection'+curselection);
|
//alert('current selection'+curselection);
|
||||||
var currentdate = new Date();
|
var currentdate = new Date();
|
||||||
var currentmonth = currentdate.getMonth();
|
var currentmonth = currentdate.getMonth();
|
||||||
|
var currentyear = currentdate.getFullYear();
|
||||||
currentmonth++;
|
currentmonth++;
|
||||||
//alert('currentmonth'+currentmonth);
|
//alert('currentmonth'+currentmonth);
|
||||||
var res = curselection.split("-");
|
var res = curselection.split("-");
|
||||||
var selmonth = res[0];
|
var selmonth = res[0];
|
||||||
//alert('current selec month '+ selmonth);
|
var selyear = res[1];
|
||||||
|
//alert('current selec month '+ selmonth + 'current selec year '+ selyear);
|
||||||
var savebuttonstatus = currentmonth - selmonth;
|
var savebuttonstatus = currentmonth - selmonth;
|
||||||
//alert('status'+savebuttonstatus);
|
var year = currentyear - selyear ;
|
||||||
|
//alert(selyear + currentyear);
|
||||||
if(savebuttonstatus >= 2)
|
if(savebuttonstatus >= 2)
|
||||||
{
|
{
|
||||||
$("#savebutton").hide();
|
if(year == 1)
|
||||||
}
|
|
||||||
|
|
||||||
else if(savebuttonstatus < 0)
|
|
||||||
{
|
{
|
||||||
$("#savebutton").hide();
|
$("#savebutton").hide();
|
||||||
}
|
}
|
||||||
else if(savebuttonstatus == 0)
|
|
||||||
{
|
|
||||||
$("#savebutton").show();
|
|
||||||
}
|
|
||||||
else if(savebuttonstatus == 1)
|
|
||||||
{
|
|
||||||
$("#savebutton").show();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$("#monthlyListings tbody tr").remove();
|
|
||||||
|
|
||||||
var zero = '0';
|
|
||||||
var month='';
|
|
||||||
var hyphan = '-';
|
|
||||||
var currentselection = $("#monthyear").val();
|
|
||||||
//alert(currentselection);
|
|
||||||
var res = currentselection.split("-");
|
|
||||||
month = res[0];
|
|
||||||
if(res[0] <10)
|
|
||||||
{
|
|
||||||
var month = zero.concat(res[0]);
|
|
||||||
}
|
|
||||||
var finaldate = month.concat(hyphan);
|
|
||||||
var finaldate = finaldate.concat(res[1]);
|
|
||||||
//alert(finaldate);
|
|
||||||
$('.content').loader('show');
|
|
||||||
$.ajax({
|
|
||||||
data:{param1:finaldate},
|
|
||||||
|
|
||||||
type:"POST",
|
|
||||||
url:"<?php echo base_url() ?>payslip/changeMonth",
|
|
||||||
success:function(data)
|
|
||||||
{
|
|
||||||
//alert(data);
|
|
||||||
if(data)
|
|
||||||
{
|
|
||||||
$('#content').loader('hide');
|
|
||||||
// alert(data);
|
|
||||||
var trHTML="";
|
|
||||||
var obj =JSON.parse(data);
|
|
||||||
var temparray = [];
|
|
||||||
var j=0;
|
|
||||||
jQuery.each(obj, function(i, val) {
|
|
||||||
function checkExist(emp) {
|
|
||||||
return emp == val.EmpID;
|
|
||||||
}
|
|
||||||
//++i;
|
|
||||||
var tmp= temparray.find(checkExist);
|
|
||||||
if(tmp != null)
|
|
||||||
{
|
|
||||||
j++;
|
|
||||||
|
|
||||||
|
|
||||||
}else{
|
|
||||||
//alert(val.EmpID + "First");
|
|
||||||
temparray.push(val.EmpID);
|
|
||||||
++i
|
|
||||||
i=i-j;
|
|
||||||
|
|
||||||
var Days_Worked = val.Days_worked;
|
|
||||||
if(Days_Worked == null){ Days_Worked="0.00";}
|
|
||||||
var LOP_Days = val.LOP_Days;
|
|
||||||
if(LOP_Days == null){ LOP_Days="0.00";}
|
|
||||||
var Paid_leave = val.Paid_leave;
|
|
||||||
if(Paid_leave == null){ Paid_leave = "0.00";}
|
|
||||||
var OT_Hrs_Worked = val.OT_Hrs_Worked;
|
|
||||||
if(OT_Hrs_Worked == null){ OT_Hrs_Worked = "0.00";}
|
|
||||||
var Loan_Recovered = val.Loan_Recovered;
|
|
||||||
if(Loan_Recovered == null){ Loan_Recovered = "0.00";}
|
|
||||||
var Incentives = val.Incentives;
|
|
||||||
if(Incentives == null){ Incentives = "0.00";}
|
|
||||||
var Other_Deductions = val.Other_Deductions;
|
|
||||||
if(Other_Deductions == null){ Other_Deductions = "0.00";}
|
|
||||||
|
|
||||||
if(val.Key)
|
|
||||||
{
|
|
||||||
|
|
||||||
trHTML += '<tr>' +
|
|
||||||
'<td style="text-align:right;">' + (i) + '</td>' +
|
|
||||||
'<td style="text-align:right;">' + val.EmpID + '</td>' +
|
|
||||||
'<td>' + val.FirstName+" "+ val.LastName + '</td>' +
|
|
||||||
'<td contenteditable="false" title="Payslip Calculated" style="text-align:right;color:blue;">' + Days_Worked + '</td>' +
|
|
||||||
'<td contenteditable="false" title="Payslip Calculated" style="text-align:right;color:blue;">' + LOP_Days + '</td>' +
|
|
||||||
'<td contenteditable="false" title="Payslip Calculated" style="text-align:right;color:blue;">' + Paid_leave + '</td>' +
|
|
||||||
'<td contenteditable="false" title="Payslip Calculated" style="text-align:right;color:blue;">' + OT_Hrs_Worked + '</td>' +
|
|
||||||
'<td contenteditable="false" title="Payslip Calculated" style="text-align:right;color:blue;">' + Loan_Recovered + '</td>' +
|
|
||||||
'<td contenteditable="false" title="Payslip Calculated" style="text-align:right;color:blue;">' + Incentives + '</td>' +
|
|
||||||
'<td contenteditable="false" title="Payslip Calculated" style="text-align:right;color:blue;">' + Other_Deductions+ '</td>' +
|
|
||||||
'</tr>';
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
trHTML += '<tr>' +
|
$("#savebutton").hide();
|
||||||
'<td style="text-align:right;">' + (i) + '</td>' +
|
}
|
||||||
'<td style="text-align:right;">' + val.EmpID + '</td>' +
|
}
|
||||||
'<td>' + val.FirstName+" "+ val.LastName + '</td>' +
|
else if(savebuttonstatus < 0 )
|
||||||
'<td contenteditable="false" style="text-align:right;">' + Days_Worked + '</td>' +
|
{
|
||||||
'<td contenteditable="false" style="text-align:right;">' + LOP_Days + '</td>' +
|
|
||||||
'<td contenteditable="false" style="text-align:right;">' + Paid_leave + '</td>' +
|
if(year == 1)
|
||||||
'<td contenteditable="false" style="text-align:right;">' + OT_Hrs_Worked + '</td>' ;
|
{
|
||||||
if(val.Loan_ID){
|
$("#savebutton").show();
|
||||||
trHTML += '<td contenteditable="true" title="Loan Pending" style="background-color:#ffcccc;text-align:right;">' + Loan_Recovered + '</td>';
|
}
|
||||||
}
|
else if(year == 0)
|
||||||
else{
|
{
|
||||||
trHTML += '<td contenteditable="false" style="text-align:right;">' + Loan_Recovered + '</td>';
|
$("#savebutton").hide();
|
||||||
}
|
}
|
||||||
trHTML += '<td contenteditable="true" style="text-align:right;">' + Incentives + '</td>' +
|
else
|
||||||
'<td contenteditable="true" style="text-align:right;">' + Other_Deductions+ '</td>' +
|
{
|
||||||
'</tr>';
|
$("#savebutton").hide();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
else if(savebuttonstatus == 0 && year == 0)
|
||||||
}
|
{
|
||||||
|
$("#savebutton").hide();
|
||||||
|
}
|
||||||
});
|
else if(savebuttonstatus == 1)
|
||||||
// //alert(trHTML);
|
{
|
||||||
//alert(temparray);
|
if(year == 0 || year == 1)
|
||||||
$('#monthlyListings > tbody').append(trHTML);
|
{
|
||||||
$('.content').loader('hide');
|
$("#savebutton").show();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$("#savebutton").show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
Loading…
Reference in New Issue
Block a user