merge : GWM

This commit is contained in:
bitbucket 2024-09-02 15:57:17 +05:30
commit 55d49266e5
13 changed files with 1906 additions and 2020 deletions

View File

@ -78,12 +78,6 @@ class Emppaydate extends BaseController
function addNewemppay()
{
$EmpID = $this->request->getPost('EmpID');
$Loan_Amount = $this->request->getPost('Loan_Amount');
$Load_Issued_date = $this->request->getPost('loan_issued_date');
@ -97,12 +91,8 @@ class Emppaydate extends BaseController
$Paid_Amount = $this->request->getPost('Paid_Amount');
$CreateBy = $this->session->get('userId');
$loandetails = array('EmpID' => $EmpID, 'Loan_Amount' => $Loan_Amount, 'Loan_Issued_Date' => $Load_Issued_date, 'Monthly_Due' => $Due_Amount, 'Due_Start_Date' => $Due_Started, 'No_of_Dues' => $No_Of_Dues, 'Paid_Due' => $Paid_due, 'Remaining_Due' => $Remaining_Due, 'Paid_Amount' => $Paid_Amount, 'is_Active' => 1, 'Created_By' => $CreateBy);
if ($Loan_Amount != 0) {
$result2 = $this->emppaydate_model->addLoanInfo($loandetails, 'add');
if ($result2 > 0) {
@ -112,7 +102,7 @@ class Emppaydate extends BaseController
}
}
return redirect()->to('/emppayListings');
}
/**
@ -123,6 +113,7 @@ class Emppaydate extends BaseController
$data['emppay'] = $this->emppaydate_model->getUserInfo($paydataid);
// print_r($data);die;
$this->global['pageTitle'] = 'Edit Employee Pay Monthly Details ';
@ -152,15 +143,8 @@ class Emppaydate extends BaseController
$Paid_Amount = $this->request->getPost('Paid_Amount');
$Last_Mod_By = $this->session->get('userId');
$loandetails = array('Loan_ID' => $loan_ID, 'EmpID' => $EmpID, 'Loan_Amount' => $Loan_Amount, 'Loan_Issued_Date' => $Load_Issued_date, 'Monthly_Due' => $Due_Amount, 'Due_Start_Date' => $Due_Started, 'No_of_Dues' => $No_Of_Dues, 'Paid_Due' => $Paid_due, 'Remaining_Due' => $Remaining_Due, 'Paid_Amount' => $Paid_Amount, 'is_Active' => 1, 'Last_Mod_By' => $Last_Mod_By);
if ($Loan_Amount != 0 and $loan_ID != '') {
$result2 = $this->emppaydate_model->addLoanInfo($loandetails, 'update');
if ($result2 > 0) {
@ -177,19 +161,16 @@ class Emppaydate extends BaseController
echo "<script>alert('Something Went Wrong..! Loan Information Not Saved. Try later..!');</script>";
}
}
return redirect()->to('/emppayListings');
}
function deleteEmpPay()
{
$EmpID = $this->request->getPost('id');
$LoanID = $this->request->getPost('id');
//echo $EmpID;
$result = $this->emppaydate_model->deleteEmployeePay($EmpID);
$result = $this->emppaydate_model->deleteEmployeePay($LoanID);
if ($result == 1) {
echo "Deleted Sucessfully..!";
} else {

View File

@ -1,4 +1,5 @@
<?php
namespace App\Models;
use CodeIgniter\Model;
@ -24,11 +25,10 @@ class Emppaydate_model extends Model
return $result;
}
function deleteEmployeePay($EmpID)
function deleteEmployeePay($Loan_ID)
{
$query = $this->db->table('t_emp_pay_data')->delete(['EmpID' => $EmpID]);
$query = $this->db->table('t_loan_master')->delete(['Loan_ID' => $Loan_ID]);
return $query;
}
@ -55,9 +55,7 @@ class Emppaydate_model extends Model
$loanid = $this->db->affectedRows();
return $loanid;
}
else if($string == 'update')
{
} else if ($string == 'update') {
$loanid = $dataarray['Loan_ID'];
$this->db->table('t_loan_master')
@ -113,7 +111,4 @@ class Emppaydate_model extends Model
return TRUE;
}
}
?>

View File

@ -28,46 +28,35 @@ $(document).ready(function() {
}
</style>
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<center><b>
<h3 class="box-title">Add Employee Pay</h3>
</b></center>
</section>
<section class="content">
<div style="text-align:right;">
<a href="<?php echo base_url() ?>emppayListings" class="btn btn-success" value="Back" />Back</a>
<div class="content-page">
<div class="content">
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Add Employee Pay</h4>
</div>
<br>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>emppayListings"><span class="bold">Back</span></a>
</div>
</div>
<!-- end page title -->
<div class="row">
<!-- left column -->
<div class="col-md-12">
<!-- general form elements -->
<div class="box box-success">
<!-- form start -->
<form role="form" id="addemppaydate" action="<?php echo base_url() ?>emppaydate/addNewemppay"
method="post" name="addform">
<div class="col-12">
<div class="card">
<div class="card-body">
<h4 class="header-title">Loan Details</h4>
<div class="row">
<div class="col-12">
<div class="p-2">
<form role="form" id="addemppaydate" action="<?php echo base_url() ?>emppaydate/addNewemppay" method="post" name="addform">
<div class="box-body">
<div class="col-md-12">
<legend>Loan Details</legend>
</div>
<!-- Supplier Information -->
<div class="col-md-12" style="margin-bottom: 27px;">
<div class="row">
<div class="col-md-3">
<div class="form-group">
<span for="EmpID">Employee ID</span>
@ -81,7 +70,6 @@ $(document).ready(function() {
foreach ($empdetails as $emp) {
$EmpID = $emp->EmpID;
$Employee += array($EmpID => $emp->EmpID . "-" . $emp->FirstName);
}
}
@ -92,13 +80,9 @@ $(document).ready(function() {
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<span for="Pay_Data_ID">Loan Amount</span>
<input type="text" class="form-control num" id="Loan_Amount"
name="Loan_Amount" value="0.00" pattern="([0-9]{1,7}([.][0-9]{1,2})?)"
@ -106,10 +90,6 @@ $(document).ready(function() {
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
@ -119,8 +99,6 @@ $(document).ready(function() {
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
@ -131,6 +109,8 @@ $(document).ready(function() {
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
@ -161,57 +141,64 @@ $(document).ready(function() {
</div>
</div>
</div>
</div>
<input type="hidden" id="remaining_due" name="remaining_due" value="0">
<input type="hidden" id="paid_due" name="paid_due" value="0">
</div>
<div class="box-footer" style="text-align:right">
<input type="submit" class="btn btn-success" value="Submit"
onmouseover="finalCheck();" />
<input type="reset" class="btn btn-success" value="Reset" />
</div>
<div class="col-md-12 text-right">
<input type="reset" id="reset" class="btn btn-reset" style="background-color: red;color: white; margin-right: 15px;width: 80px;" value="Reset" />
<input type="submit" onmouseover="finalCheck();" value="Submit" class="btn btn-success">
</div>
</div>
</form>
</div>
</div>
<?php
$listErrors = session()->getFlashdata('listErrors');
if ($listErrors) {
?>
<div class="row">
<div class="col-md-12">
<div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<?php echo session()->getFlashdata('listErrors'); ?>
</div>
</div>
</div>
<?php } ?>
</div><!-- /.box-body -->
</form><!-- form closed -->
</div><!-- -->
</div><!-- -->
<div class="col-md-4">
</div>
<?php
helper('form');
$error = session()->getFlashdata('error');
if($error)
{
if ($error) {
?>
<div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<?php echo session()->getFlashdata('error'); ?>
</div>
<?php } ?>
<?php
$success = session()->getFlashdata('success');
if($success)
{
if ($success) {
?>
<div class="alert alert-success alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<?php echo session()->getFlashdata('success'); ?>
</div>
<?php } ?>
<!-- end row -->
</div>
</div> <!-- end card -->
</div><!-- end col -->
</div>
<!-- end row -->
</div> <!-- container -->
</div> <!-- content -->
<div class="row">
<div class="col-md-12">
<?php // \Config\Services::validation()->listErrors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'); ?>
</div>
</div>
</div>
</div> <!-- first row closed-->
</section>
</div>
<!--content-wrapper closed-->
<script src="<?php echo base_url(); ?>public/assets/js/addUser.js" type="text/javascript"></script>
<script>

View File

@ -5,13 +5,19 @@ $(document).ready(function(){
$("#loan_issued_date").datepicker({
minDate: 'now',
// maxDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
dateFormat: 'dd-mm-yy',
changeMonth: true,
changeYear: true,
yearRange: '-100:+0'
});
$("#due_started").datepicker({
minDate: 'now',
//maxDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+1'
dateFormat: 'dd-mm-yy',
changeMonth: true,
changeYear: true,
yearRange: '-100:+1'
});
});
@ -77,12 +83,10 @@ $("#due_started").datepicker({
$loanid = '';
if(!empty($emppay))
{
if (!empty($emppay)) {
// print_r($emppay);
// die();
foreach ($emppay as $ep)
{
foreach ($emppay as $ep) {
@ -101,33 +105,47 @@ if(!empty($emppay))
$Food_Allowances = $ep->Food_Allowances;
$Incentives = $ep->Incentives;
$Loan_Amount = $ep->Loan_Amount;
if(empty($Loan_Amount)){$Loan_Amount = 0.00;}
if (empty($Loan_Amount)) {
$Loan_Amount = 0.00;
}
if (!empty($ep->Loan_Issued_Date)) {
$Loan_issued_date = new DateTime($ep->Loan_Issued_Date, new DateTimeZone('Asia/Kolkata'));
$Loan_issued_date=$Loan_issued_date->format('d-m-Y');}
else{$Loan_issued_date=null;}
$Loan_issued_date = $Loan_issued_date->format('d-m-Y');
} else {
$Loan_issued_date = null;
}
$Monthly_due = $ep->Monthly_Due;
if(empty($Monthly_due)){$Monthly_due = 0.00;}
if (empty($Monthly_due)) {
$Monthly_due = 0.00;
}
if (!empty($ep->Due_Start_Date)) {
$Due_start_date = new DateTime($ep->Due_Start_Date, new DateTimeZone('Asia/Kolkata'));
$Due_start_date=$Due_start_date->format('d-m-Y');}
else{$Due_start_date=null;}
$Due_start_date = $Due_start_date->format('d-m-Y');
} else {
$Due_start_date = null;
}
$No_of_dues = $ep->No_of_Dues;
if(empty($No_of_dues)){$No_of_dues = 0.00;}
if (empty($No_of_dues)) {
$No_of_dues = 0.00;
}
$Paid_Due = $ep->Paid_Due;
if(empty($Paid_Due)){$Paid_Due = 0.00;}
if (empty($Paid_Due)) {
$Paid_Due = 0.00;
}
$Remaining_Due = $ep->Remaining_Due;
if(empty($Remaining_Due)){$Remaining_Due = 0.00;}
if (empty($Remaining_Due)) {
$Remaining_Due = 0.00;
}
$Paid_Amount = $ep->Paid_Amount;
if(empty($Paid_Amount)){$Paid_Amount = 0.00;}
if (empty($Paid_Amount)) {
$Paid_Amount = 0.00;
}
$Created_By = $ep->Created_By;
$Created_Time = $ep->Created_Time;
$Last_Mod_By = $ep->Last_Mod_By;
$Last_Mod_Time = $ep->Last_Mod_Time;
$loanid = $ep->Loan_ID;
}
}
@ -140,40 +158,40 @@ if(!empty($emppay))
}
</style>
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<!--title-->
<center>Edit Loan Details</center>
</h1>
</section>
<section class="content">
<div style="text-align:right;">
<a href="<?php echo base_url() ?>emppayListings" class="btn btn-success" value="Back">Back</a>
<div class="content-page">
<div class="content">
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Loan Details</h4>
</div>
<br/>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>emppayListings"><span class="bold">Back</span></a>
</div>
</div>
<!-- end page title -->
<div class="row">
<!-- left column -->
<div class="col-md-12">
<!-- general form elements -->
<div class="box box-success">
<!-- form start-->
<div class="col-12">
<div class="card">
<div class="card-body">
<h4 class="header-title">Loan Details</h4>
<div class="row">
<div class="col-12">
<div class="p-2">
<form role="form" id="edit" action="<?php echo base_url() ?>emppaydate/editemppay" method="post">
<div class="box-body">
<div class="col-md-12">
<legend>Loan Details</legend>
</div>
<div class="row">
<!-- Supplier Information -->
<div class="col-md-12" style="margin-bottom: 27px;">
<input type="hidden" class="form-control required" id="Last_Modified_Time" name="Last_Modified_Time" value="<?php echo $Last_Mod_Time; ?>">
<input type="hidden" class="form-control required" id="LastModifiedBy" name="LastModifiedBy" value="<?php echo $name; ?>">
<input type="hidden" class="form-control required" id="Created_Time" name="Created_Time" value="<?php echo $Created_Time; ?>">
<input type="hidden" class="form-control required" id="CreatedBy" name="CreatedBy" value="<?php echo $Created_By; ?>">
<input type="hidden" readonly id="Pay_Data_ID" name="Pay_Data_ID" value="<?php echo $Pay_Data_ID; ?>">
<div class="row">
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
@ -182,7 +200,6 @@ if(!empty($emppay))
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
@ -193,10 +210,6 @@ if(!empty($emppay))
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
@ -205,8 +218,6 @@ if(!empty($emppay))
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
@ -215,6 +226,8 @@ if(!empty($emppay))
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
@ -231,7 +244,6 @@ if(!empty($emppay))
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
@ -240,119 +252,62 @@ if(!empty($emppay))
</div>
</div>
</div>
</div>
<input type="hidden" id="remaining_due" name="remaining_due" value="<?php echo $Remaining_Due; ?>">
<input type="hidden" id="paid_due" name="paid_due" value="<?php echo $Paid_Due; ?>">
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<div class="form-group">
<!--<span for ="CreatedBy">Created By:</span>-->
<input type="hidden" class="form-control required" id="CreatedBy" name="CreatedBy" value="<?php echo $Created_By; ?>">
</div>
<div class="col-md-12 text-right">
<input type="button" class="btn btn-success" value="Delete" id="deleteemp" style="background-color:red ;color: white; margin-right: 15px;width: 80px;" />
<input type="submit" onmouseover="finalCheck();" value="Submit" class="btn btn-success">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<div class="form-group">
<!--<span for ="Created_Time">Created Time:</span>-->
<input type="hidden" class="form-control required" id="Created_Time" name="Created_Time" value="<?php echo $Created_Time; ?>">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<div class="form-group">
<!--<span for ="Last_Mod_By">Last Modified By:</span>-->
<input type="hidden" class="form-control required" id="LastModifiedBy" name="LastModifiedBy" value="<?php echo $name; ?>">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<div class="form-group">
<!--<span for ="Last_Mod_Time">Last Modified Time:</span>-->
<input type="hidden" class="form-control required" id="Last_Modified_Time" name="Last_Modified_Time" value="<?php echo $Last_Mod_Time; ?>">
</div>
</div>
</div>
</div>
</div><!--row completed div-->
<div id="content">
<div class="box-footer" style="text-align:right">
<input type="submit" class="btn btn-success" value="Submit" onmouseover="finalCheck();"/>
<input type="button" class="btn btn-success" value="Delete" id="deleteemp"/>
<input type="reset" class="btn btn-success" value="Reset" />
</div>
</div>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
<?php
$listErrors = session()->getFlashdata('listErrors');
if ($listErrors) {
?>
<div class="row">
<div class="col-md-12">
<div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<?php echo session()->getFlashdata('listErrors'); ?>
</div>
</div>
</div>
<?php } ?>
<div class="col-md-4">
</div>
<?php
helper('form');
$error = session()->getFlashdata('error');
if($error)
{
if ($error) {
?>
<div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true"><EFBFBD></button>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<?php echo session()->getFlashdata('error'); ?>
</div>
<?php } ?>
<?php
$success = session()->getFlashdata('success');
if($success)
{
if ($success) {
?>
<div class="alert alert-success alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true"><EFBFBD></button>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<?php echo session()->getFlashdata('success'); ?>
</div>
<?php } ?>
<div class="row">
<div class="col-md-12">
<?php // echo validation_errors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true"><3E></button></div>'); ?>
<!-- end row -->
</div>
</div> <!-- end card -->
</div><!-- end col -->
</div>
</div>
</section>
</div>
<!-- end row -->
</div> <!-- container -->
</div> <!-- content -->
<script>
function calculateBasic()
@ -366,8 +321,7 @@ function calculateBasic()
} else if (Totalsalary == '') {
alert("Please Enter Total Salary..");
document.getElementById('Total_Salary').focus();
}
else{
} else {
var temp = (Totalsalary * (HRA / 100));
var basic = Totalsalary - temp;
document.getElementById('Basic_Pay').value = basic;
@ -380,30 +334,23 @@ function calculateBasic()
function duecalculation()
{
function duecalculation() {
var totaldue = 0;
var loan = document.getElementById('Loan_Amount').value;
var due = document.getElementById('monthly_due').value;
if(loan != 0)
{
if(due == 0)
{
if (loan != 0) {
if (due == 0) {
alert("Enter Monthly Due Amount....!");
$('#monthly_due').focus();
}
else
{
} else {
totaldue = loan / due;
if(totaldue < 1)
{
if (totaldue < 1) {
alert("Please Enter Correct Due Amount..!");
$('#monthly_due').focus();
}
else{
} else {
document.getElementById('no_of_due').value = Math.ceil(totaldue);
var noofdues = document.getElementById('no_of_due').value;
$('#remaining_due').val(noofdues);
@ -420,12 +367,10 @@ function duecalculation()
}
function dateCalulation()
{
function dateCalulation() {
//alert('j');
var loanamount = document.getElementById('Loan_Amount').value;
if(loanamount == 0.00 || loanamount == "")
{
if (loanamount == 0.00 || loanamount == "") {
$('#loan_issued_date').val("");
$('#due_started').val("");
$('#monthly_due').val("0.00");
@ -440,15 +385,13 @@ function dateCalulation()
}
function finalCheck()
{
function finalCheck() {
//alert("final check");
var loanamount = document.getElementById('Loan_Amount').value;
if(loanamount != "" && loanamount != 0.00)
{
if (loanamount != "" && loanamount != 0.00) {
var idate = document.getElementById('loan_issued_date').value;
var due = document.getElementById('monthly_due').value;
var dsdate = document.getElementById('due_started').value;
@ -458,8 +401,7 @@ function finalCheck()
}
}
if($('#Total_Salary').val() == '' || $('#HRA_Rate').val() == '' || $('#Allowances').val() == '' ||$('#PF_Rate').val() == '' ||$('#ESI_Rate').val() == '' || $('#Food_Allowances').val() == ''|| $('#Incentives').val()=='')
{
if ($('#Total_Salary').val() == '' || $('#HRA_Rate').val() == '' || $('#Allowances').val() == '' || $('#PF_Rate').val() == '' || $('#ESI_Rate').val() == '' || $('#Food_Allowances').val() == '' || $('#Incentives').val() == '') {
alert("Please Enter All Information Correctly..!");
return false;
@ -467,24 +409,24 @@ function finalCheck()
}
$("#deleteemp").click(function() {
var empid = "<?php echo $EmpID;?>";
var i = confirm("Do You want to delete "+empid+" from Pay Master?");
var loanid = "<?php if(isset($Loan_ID)){ echo $Loan_ID; }else{
echo $emppay[0]->Loan_ID;
} ?>";
var i = confirm("Do You want to delete " + loanid + " from Loan Master?");
// alert(i);s
if(i)
{
$('#content').loader('show');
if (i) {
// $('#content').loader('show');
$.ajax({
data:{id:empid},
data: {
id: loanid
},
type: "POST",
url: "<?php echo base_url(); ?>emppaydate/deleteEmpPay",
success: function(result) {
if(result)
{
if (result) {
alert(result);
$('#content').loader('hide');
// $('#content').loader('hide');
window.location.href = "<?php echo base_url(); ?>emppayListings";
}

View File

@ -1,29 +1,25 @@
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center>Employee Loan Details</center>
</h1>
</section>
<section class="content">
<div class="content-page">
<div class="content">
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div>
<div class="row">
<div class="col-xs-12 text-right">
<div class="form-group">
<div class="col-6">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Employee Loan Details</h4>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-success" href="<?php echo base_url(); ?>emppaydate/addemppaydate">Create New Loan</a>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="box">
<div class="box-header">
</div><!-- /.box-header -->
<div class="box-body">
<table id="datatable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;text-align: right;" >
<thead style="background-color: #ddd;">
<div class="col-12">
<div class="card">
<div class="card-body">
<table id="datatable" class="table dt-responsive nowrap w-100 ria_data_table">
<thead>
<tr>
<th width="15%">Employee</th>
<th width="7%"> Total Sal in </th>
@ -37,10 +33,10 @@
<th width="7%">Action</th>
</tr>
</thead>
<tbody>
<?php
if(!empty($userRecords)) { foreach($userRecords as $record) { ?>
if (!empty($userRecords)) {
foreach ($userRecords as $record) { ?>
<tr>
<td style="text-align: left;"><?php echo $record->EmpID ?>-<?php echo $record->FirstName; ?></td>
<td><?php echo $record->TotalSalary; ?></td>
@ -51,38 +47,20 @@
<td><?php echo $record->Paid_Due; ?></td>
<td><?php echo $record->Remaining_Due; ?></td>
<td><?php echo $record->Paid_Amount; ?></td>
<td>
<a href="<?php echo base_url().'emppaydate/editOldemppay/'.$record->Pay_Data_ID; ?>"><i class="btn btn-success">EDIT</i></a>
<a href="<?php echo base_url() . 'emppaydate/editOldemppay/' . $record->Pay_Data_ID; ?>"><i class="fas fa-pencil-alt"></i></a>
</td>
</tr>
<?php } }?>
<?php }
} ?>
</tbody>
</table>
</div><!-- /.box-body -->
<!-- <div class="box-footer clearfix">
</div> -->
</div><!-- /.box -->
</div> <!-- end card body-->
</div> <!-- end card -->
</div><!-- end col-->
</div>
</div>
</section>
</div> <!-- container -->
</div> <!-- content -->
</div>
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
<script type="text/javascript">
$(function () {
$('#datatable').DataTable({
"paging": true,
"lengthChange": true,
"searching": true,
"ordering": true,
"aaSorting": [[ 0, "asc" ]],
"info": true,
"autoWidth": true
});
});
</script>

View File

@ -1,6 +1,3 @@
<!-- ============================================================== -->
<!-- End Page content -->
<!-- ============================================================== -->
@ -15,15 +12,6 @@
<div class="col-md-7">
<div class="text-md-right footer-links d-none d-sm-block">
</div>
</div>
</div>
</div>
</footer>
<!-- end Footer -->
</div>
<!-- END wrapper -->
@ -64,6 +52,83 @@
<script src="<?php echo base_url(); ?>public/new_assets/libs/select2/js/select2.min.js"></script>
<!-- <script src="<?php echo base_url(); ?>public/new_assets/js/validation.js" type="text/javascript"></script> -->
</div>
</div>
</div>
</div>
</footer>
<!-- end Footer -->
</div>
<!-- END wrapper -->
<script>
$(document).ready(function() {
var table = $('.ria_data_table').DataTable({
dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
buttons: [
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
],
pageLength: 10, // Default rows per page
lengthMenu: [
[10, 20, 30, 50, -1],
[10, 20, 30, 50, "All"]
], // Rows per page options
responsive: true, // Responsive table
order: [], // Default ordering (column index 0, descending)
language: {
paginate: {
next: '<i class="fas fa-angle-right"></i>', // Next button icon
previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
}
}
});
$('#hdate').addClass('form-control');
$('#hname').addClass('form-control');
});
</script>
<!-- Vendor js -->
<script src="<?php echo base_url(); ?>public/new_assets/js/vendor.min.js"></script>
<!-- third party js -->
<script src="<?php echo base_url(); ?>public/new_assets/libs/datatables.net/js/jquery.dataTables.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-bs4/js/dataTables.bootstrap4.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-responsive/js/dataTables.responsive.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-buttons/js/dataTables.buttons.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-buttons/js/buttons.html5.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-buttons/js/buttons.flash.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-buttons/js/buttons.print.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-keytable/js/dataTables.keyTable.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-select/js/dataTables.select.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/pdfmake/build/pdfmake.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/pdfmake/build/vfs_fonts.js"></script>
<!-- third party js ends -->
<!-- Datatables init -->
<script src="<?php echo base_url(); ?>public/new_assets/js/pages/datatables.init.js"></script>
<!-- App js -->
<script src="<?php echo base_url(); ?>public/new_assets/js/app.min.js"></script>
<!--Morris Chart-->
<script src="<?php echo base_url(); ?>public/new_assets/libs/morris.js06/morris.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/raphael/raphael.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/js/pages/morris.init.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/c3/c3.min.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/js/pages/c3.init.js"></script>
<script src="<?php echo base_url(); ?>public/new_assets/libs/select2/js/select2.min.js"></script>
<!-- <script src="<?php echo base_url(); ?>public/new_assets/js/validation.js" type="text/javascript"></script> -->
@ -74,4 +139,5 @@
</script>
</body>
</html>

View File

@ -1,4 +1,3 @@
<script src="<?php echo base_url() ?>public/assets/tabletoexport/jquery.tableexport.v2.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/js/bootstrap-datepicker.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/css/bootstrap-datepicker.css" rel="stylesheet">
@ -15,25 +14,31 @@
text-align: center !important;
}
</style>
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center>Leave Report <?php if(!empty($selectedfiscalyears)) {echo " ( ". $selectedfiscalyears." )";} ?></center>
</h1>
</section>
<section class="content">
<div class="content-page">
<div class="content">
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div>
<div class="row">
<div class="col-xs-12">
<div class="box">
<div class="box-header">
<div class="col-6">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">
<center>Leave Report <?php if (!empty($selectedfiscalyears)) {
echo " ( " . $selectedfiscalyears . " )";
} ?></center>
</h4>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="card">
<form action="<?php echo base_url() ?>leavereports" method="POST" id="searchList">
<div class="col-md-3">
<?php if(!empty($fiscalyears))
{
<div class="row">
<div class="col-md-3" style="margin: 10px;">
<?php if (!empty($fiscalyears)) {
foreach ($fiscalyears as $fy):
$options[$fy] = $fy;
endforeach;
@ -45,14 +50,11 @@
<input type="button" value="View Report" class="btn btn-success" id="report">
</div>
</div>
</form>
<br>
</div>
</div>
<div class="box-body">
<table id="leavelistings" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
<thead style="background-color: #ddd;">
<div class="card-body">
<table id="leavelistings" class="table dt-responsive nowrap w-100">
<thead>
<tr>
<th>S.No</th>
<th>Employee Name</th>
@ -77,9 +79,18 @@
<td><?php echo $rec->EmpID . '-' . $rec->FullName; ?></td>
<?php } ?>
<!-- <td style="text-align:right;"><?php // if (!empty($rec->NoofWorkedDays)) { echo number_format((int)$rec->NoofWorkedDays, 0, '.', ''); } else { echo "0"; } ?></td> -->
<td style="text-align:right;"><?php if (!empty($rec->NoofAbsentDays)) { echo number_format((int)$rec->NoofAbsentDays, 0, '.', ''); } else { echo "0"; } ?></td>
<td style="text-align:right;"><?php if (!empty($rec->NoofPaidLeaveDays)) { echo number_format((int)$rec->NoofPaidLeaveDays, 0, '.', ''); } else { echo "0"; } ?></td>
<!-- <td style="text-align:right;"><?php // if (!empty($rec->NoofWorkedDays)) { echo number_format((int)$rec->NoofWorkedDays, 0, '.', ''); } else { echo "0"; }
?></td> -->
<td style="text-align:left;"><?php if (!empty($rec->NoofAbsentDays)) {
echo number_format((int)$rec->NoofAbsentDays, 0, '.', '');
} else {
echo "0";
} ?></td>
<td style="text-align:left;"><?php if (!empty($rec->NoofPaidLeaveDays)) {
echo number_format((int)$rec->NoofPaidLeaveDays, 0, '.', '');
} else {
echo "0";
} ?></td>
</tr>
<?php
}
@ -93,11 +104,13 @@
?>
</tbody>
</table>
</div><!-- /.box-body -->
</div><!-- /.box -->
</div> <!-- end card body-->
</div> <!-- end card -->
</div><!-- end col-->
</div>
</div>
</section>
</div> <!-- container -->
</div> <!-- content -->
</div>
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
<script type="text/javascript">
@ -107,7 +120,9 @@
"lengthChange": true,
"searching": true,
"ordering": true,
"aaSorting": [[0, "asc"]],
"aaSorting": [
[0, "asc"]
],
"info": true,
"autoWidth": true,
"language": {
@ -118,10 +133,15 @@
$('#report').click(function() {
$("#searchList").submit();
});
$(document).ready(function() {
$('#fyr').addClass('form-control');
})
</script>
<script type="text/javascript">
// var name = "<?php // echo 'Leave Report for ' . $selectedfiscalyears;?>";
// var name = "<?php // echo 'Leave Report for ' . $selectedfiscalyears;
?>";
// $("#leavelistings").tableExport({
// bootstrap: true,
// separator: ",",
@ -135,8 +155,4 @@
// position: "bottom",
// stripQuotes: true
// });
</script>

View File

@ -1,4 +1,3 @@
<script src="<?php echo base_url() ?>public/assets/tabletoexport/jquery.tableexport.v2.js"></script>
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
@ -16,7 +15,7 @@
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center><strong>" <?php echo $MonthwiseReport[0]->EmpID ?> - <?php echo $MonthwiseReport[0]->FullName ?> "</strong> - Monthwise Leave Reports <?= ' ( '.$finyear.' )' ?></center>
<center></center>
</h1>
</section>
<section class="content" id="content">
@ -24,8 +23,50 @@
<div class="col-xs-12">
<div class="box">
<div class="box-body">
<table id="leavelistings" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
<table id="" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
<thead style="background-color: #ddd;">
<tr>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div><!-- /.box-body -->
</div><!-- /.box -->
</div><!-- /. col-xs-12 -->
</div><!-- /.inital row -->
</section><!-- /.content section closed -->
</div><!-- /.content wrapper -->
<div class="content-page">
<div class="content">
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div>
<div class="row">
<div class="col-6">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">
<center><strong>" <?php echo $MonthwiseReport[0]->EmpID ?> - <?php echo $MonthwiseReport[0]->FullName ?> "</strong> - Monthwise Leave Reports <?= ' ( ' . $finyear . ' )' ?></center>
</h4>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="card">
<form action="<?php echo base_url() ?>leavereports" method="POST" id="searchList">
<div class="row">
</div>
</form>
<div class="card-body">
<table id="leavelistingss" class="table dt-responsive nowrap w-100 ria_data_table">
<thead>
<tr>
<th>S.No</th>
<th>Employee Id</th>
@ -39,14 +80,14 @@
<tbody>
<?php
$index = 0;
if(!empty($MonthwiseReport))
{ foreach($MonthwiseReport as $record)
{ $index++;
if (!empty($MonthwiseReport)) {
foreach ($MonthwiseReport as $record) {
$index++;
?>
<tr>
<td style="text-align:right;"><?php echo $index; ?></td>
<td style="text-align:right;"><?php echo $record->EmpID ?></td>
<td style="text-align:left;"><?php echo $index; ?></td>
<td style="text-align:left;"><?php echo $record->EmpID ?></td>
<td><?php echo $record->FullName ?></td>
<td><?php
$split_val = explode('-', $record->Month_Year);
@ -55,9 +96,18 @@
$monthName = date("M", mktime(0, 0, 0, $month_val, 10));
echo $monthName . " , " . $year_val
?></td>
<!-- <td style="text-align:right;"><?php // if (!empty($record->NoofWorkedDays)) { echo number_format((int)$record->NoofWorkedDays, 0, '.', ''); } else { echo "0"; } ?></td> -->
<td style="text-align:right;"><?php if (!empty($record->NoofAbsentDays)) { echo number_format((int)$record->NoofAbsentDays, 0, '.', ''); } else { echo "0"; } ?></td>
<td style="text-align:right;"><?php if (!empty($record->NoofPaidLeaveDays)) { echo number_format((int)$record->NoofPaidLeaveDays, 0, '.', ''); } else { echo "0"; } ?></td>
<!-- <td style="text-align:right;"><?php // if (!empty($record->NoofWorkedDays)) { echo number_format((int)$record->NoofWorkedDays, 0, '.', ''); } else { echo "0"; }
?></td> -->
<td style="text-align:left;"><?php if (!empty($record->NoofAbsentDays)) {
echo number_format((int)$record->NoofAbsentDays, 0, '.', '');
} else {
echo "0";
} ?></td>
<td style="text-align:left;"><?php if (!empty($record->NoofPaidLeaveDays)) {
echo number_format((int)$record->NoofPaidLeaveDays, 0, '.', '');
} else {
echo "0";
} ?></td>
</tr>
<?php
}
@ -65,13 +115,14 @@
?>
</tbody>
</table>
</div><!-- /.box-body -->
</div><!-- /.box -->
</div><!-- /. col-xs-12 -->
</div><!-- /.inital row -->
</section><!-- /.content section closed -->
</div><!-- /.content wrapper -->
</div> <!-- end card body-->
</div> <!-- end card -->
</div><!-- end col-->
</div>
</div>
</div> <!-- container -->
</div> <!-- content -->
</div>
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
<script type="text/javascript">
/*-----------------on ready function ------------------------------- */
@ -91,11 +142,16 @@ $(function () {
"language": {
"emptyTable": "No data found"
},
"order": [[ 0, 'asc' ]]
"order": [
[0, 'asc']
]
});
/**---------------for table index value using datatable -------- */
t.on('order.dt search.dt', function() {
t.column(0, {search:'applied', order:'applied'}).nodes().each( function (cell, i) {
t.column(0, {
search: 'applied',
order: 'applied'
}).nodes().each(function(cell, i) {
cell.innerHTML = i + 1;
});
}).draw();
@ -129,6 +185,4 @@ var name = "<?php echo 'Leave Month Report for '.$MonthwiseReport[0]->EmpID.''.$
position: "bottom",
stripQuotes: true
});
</script>

View File

@ -1,156 +1,119 @@
<?php
$monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr", "05" => "May", "06" => "June", "07" => "July", "08" => "Aug", "09" => "Sep", "10" => "Oct", "11" => "Nov", "12" => "Dec");
?>
<script>
$(function() {
$(".select2").select2();
$('#All').click(function() {
if ($('#All').prop('checked'))
{
if ($('#All').prop('checked')) {
$('#Employee').attr('disabled', 'true');
}
else
{
} else {
$('#Employee').removeAttr('disabled');
}
});
$('#PayOn').change(function() {
var id = $('#PayOn').val();
if(id != '-1')
{
$('#content').loader('show');
if (id != '-1') {
// $('#content').loader('show');
$.ajax({
data:{id1:id},
data: {
id1: id
},
type: "POST",
url: "<?php echo base_url(); ?>payslip/getEmployee",
success: function(result) {
if(result)
{
if (result) {
$("#Employee").empty();
$('#content').loader('hide');
// $('#content').loader('hide');
$("#Employee").append(result);
}
}
});
}
else
{
} else {
alert('Please select the PayOn');
return false;
}
});
$("#Calculate").click(function() {
var payon = $('#PayOn').val();
var employee = $('#Employee').val();
// alert(payon+employee);
if(payon != '-1' && employee !='-1')
{
if (payon != '-1' && employee != '-1') {
var check = $('#All').is(":checked");
if (check) {
var c = 0;
var time = 0;
$('#Employee').find('option').each(function() {
c++;
var employee = $(this).val();
$('#content').loader('show');
// $('#content').loader('show');
$.ajax({
data:{payon:payon,employee:employee},
data: {
payon: payon,
employee: employee
},
type: "POST",
url: "<?php echo base_url(); ?>payslip/checkExistPay",
success:function(result)
{
if(result != 1)
{
success: function(result) {
if (result != 1) {
$.ajax({
data:{payon:payon,employee:employee},
data: {
payon: payon,
employee: employee
},
type: "POST",
url: "<?php echo base_url(); ?>payslip/callsp",
success: function(result) {
$('#content').loader('hide');
// $('#content').loader('hide');
}
});
}
}
});
});
time = (c * 300);
// alert(time);
setTimeout(function(){alert(c + '-Employees Salary Added Successfully!');
setTimeout(function() {
alert(c + '-Employees Salary Added Successfully!');
$('form#PayslipGenerator').submit();
alert("Please wait while Payslip Downloading...!");
$('#content').loader('hide');
// $('#content').loader('hide');
}, time);
} // else for select all not selected
else {
$('#content').loader('show');
// $('#content').loader('show');
$.ajax({
data:{payon:payon,employee:employee},
data: {
payon: payon,
employee: employee
},
type: "POST",
url: "<?php echo base_url(); ?>payslip/checkExistPay",
success: function(result) {
if(result == 1)
{
if (result == 1) {
$('form#PayslipGenerator').submit();
$('#content').loader('hide');
// $('#content').loader('hide');
alert("Payslip Downloaded Successfully..!");
}
else{
} else {
$.ajax({
data:{payon:payon,employee:employee},
data: {
payon: payon,
employee: employee
},
type: "POST",
url: "<?php echo base_url(); ?>payslip/callsp",
success: function(result) {
$('form#PayslipGenerator').submit();
$('#content').loader('hide');
// $('#content').loader('hide');
alert("Salary Calculated Successfully..!");
}
});
@ -164,38 +127,23 @@ $(function() {
} // else for select all not selected
} // check payon select/not selected
else
{
else {
alert('Please select the PayOn');
return false;
}
});
});
</script>
<div class="content-wrapper">
<div class="content-page">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center> PaySlip Generator</center>
</h1>
</section>
<div class="page-title-box page-title-box-alt">
<h4 class="page-title"> Add Config Details</h4>
</div>
<section class="content">
<div class="row" style="border:2px dotted; padding:5%">
<form id="PayslipGenerator" action="<?php echo base_url() ?>PrintPdf" method="post" role="form" >
<div class="card">
<div class="card-body" style="padding: 1rem 2rem !important;">
<form id="PayslipGenerator" action="<?php echo base_url() ?>PrintPdf" method="post" role="form" style="border:2px dotted; padding:5%">
<div class="row">
<div class="col-md-4">
@ -203,54 +151,40 @@ $(function() {
<select id="PayOn" name="PayOn" class="form-control select2" style="width: 100%;">
<option value="-1">Select Payon Month</option>
<?php
if(!empty($Payon))
{
if (!empty($Payon)) {
foreach ($Payon as $rl)
{
foreach ($Payon as $rl) {
$m = substr($rl->Month_Year, 0, 2);
$y = substr($rl->Month_Year, 3);
$tot = $monthsoptions[$m] . "-" . $y;
echo "<option value=\"" . $rl->Month_Year . "\">" . $tot . "</option>";
}
}
?>
</select>
</div>
<div id="content"></div>
<div class="col-md-2">
</div>
<div class="col-md-4 col-md-offset-2">
<span>Employee</span>
<select id="Employee" name="Employee" class="form-control select2" type="text" class="form-control">
<option value="-1">Select Employee</option>
</select>
<br />
<input type="checkbox" name="All" id="All"> Select All<br>
</div>
<div class="col-md-6" align="right">
</div>
<div class="col-md-4 col-md-offset-6" align="right">
<input type="button" class="btn btn-info" id="Calculate" value="Calculate Pay" />
</div>
<div class="row">
<?php
helper('form');
$error = session()->getFlashdata('error');
if($error)
{
if ($error) {
?>
<div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true"><EFBFBD></button>
@ -259,23 +193,20 @@ $(function() {
<?php } ?>
<?php
$success = session()->getFlashdata('success');
if($success)
{
if ($success) {
?>
<div class="alert alert-success alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true"><EFBFBD></button>
<?php echo session()->getFlashdata('success'); ?>
</div>
<?php } ?>
<div class="row">
<div class="col-md-4">
<?php // echo validation_errors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true"><3E></button></div>'); ?>
<?php // echo validation_errors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true"><3E></button></div>');
?>
</div>
</div>
</div>
</div>
</section>
</div>

View File

@ -1,5 +1,3 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/js/bootstrap-datepicker.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/css/bootstrap-datepicker.css" rel="stylesheet">
<?php ?>
<style type="text/css">
@ -7,25 +5,30 @@
text-align: right;
}
</style>
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center>Employee Monthly Payslip </center>
</h1>
</section>
<section class="content">
<div class="content-page">
<div class="content">
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div>
<div class="row">
<div class="col-md-2">
<div class="col-6">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Employee Monthly Payslip </h4>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="card">
<div class="row">
<div class="col-md-2" style="padding: 10px;margin-left: 24px;">
<?php
$attributes = array('id' => 'paylist');
echo form_open('paysliplist', $attributes);
$today = date('m-Y');
$data = array('type' => 'text','name' => 'month','id' => 'month','value' => $today,'class' => 'form-control select2');
$data = array('type' => 'text', 'name' => 'month', 'id' => 'month', 'value' => $today, 'class' => 'form-control select2', ' data-provide' => 'datepicker', 'data-date-format' => 'M-yyyy', 'data-date-min-view-mode' => '1');
echo form_input($data);
?>
</div>
@ -33,20 +36,11 @@
<div class="col-md-2">
<input id="changemonth" value="Change Month" class="btn btn-success" title='click here to view payslip Data'>
</div>
<div class="col-xs-12">
<div class="box">
<div class="box-header">
<div class="box-tools">
</form>
</div><!--</h3></center>-->
</div><!-- /.box-header -->
<div class="box-body">
<table id="monthlylistings" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
</div>
<div class="card-body">
<table id="monthlylistingss" class="table dt-responsive nowrap w-100">
<thead>
<tr>
<th>Month Year</th>
<th>Employee Id</th>
@ -59,16 +53,12 @@
<th>Action</th>
</tr>
</thead>
<tbody id="tbody">
<?php
if(!empty($PayInfo))
{
if (!empty($PayInfo)) {
foreach($PayInfo as $record)
{
foreach ($PayInfo as $record) {
?>
<tr>
<td style="text-align:right;"><?php echo $record->PayOn ?></td>
<td><?php echo $record->EmpID ?></td>
@ -76,44 +66,39 @@
<td style="text-align:right;"><?php echo ($record->NoofDaysWorked + $record->Paid_Leave) ?></td>
<td style="text-align:right;"><?php echo $record->LessAdvance ?></td>
<td style="text-align:right;"><?php echo $record->TotalCompCon ?></td>
<td style="text-align:right;"><?php if(is_numeric($record->Advance)){echo number_format($record->Advance,2,'.','');}else {echo $record->Advance;} ?></td>
<td style="text-align:right;"><?php if (is_numeric($record->Advance)) {
echo number_format($record->Advance, 2, '.', '');
} else {
echo $record->Advance;
} ?></td>
<td style="text-align:right;"><?php echo $record->BalanceAdvance ?></td>
<td>
<a href="<?php echo base_url() . 'payslip/editPayslip/' . $record->EmpID . '/' . $record->PayOn; ?>"><i class="btn btn-success">EDIT</i></a>
</td>
</tr>
<?php
}
}
?>
</tbody>
</table>
</div> <!-- end card body-->
</div> <!-- end card -->
</div><!-- end col-->
</div>
</div>
</div> <!-- container -->
</div> <!-- content -->
</div>
</div><!-- /.box-body -->
<!-- <div class="box-footer clearfix">
<?php //echo $this->pagination->create_links(); ?>
</div> -->
</div><!-- /.box -->
</div>
</div>
</section>
</div>
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
<script type="text/javascript">
$(function() {
$("#month").datepicker({
minViewMode: 1,
format: 'mm-yyyy'
});
// $("#month").datepicker({
// minViewMode: 1,
// format: 'mm-yyyy'
// });
var dropdown = "<?php echo $dropdownvalue; ?>";
$('#month').val(dropdown);
@ -123,7 +108,9 @@
"lengthChange": true,
"searching": true,
"ordering": true,
"aaSorting": [[ 0, "desc" ]],
"aaSorting": [
[0, "desc"]
],
"info": true,
"autoWidth": true

View File

@ -1,34 +1,23 @@
<?php
// print_r($month);
// echo "-------------";
// print_r($days);
//$sample = array_merge($month,$fresh);
?>
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.13.6/underscore-min.js"></script>
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.min.js"></script>
<script>
$(function() {
$("#hdate").datepicker({
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
dateFormat: 'dd-mm-yy',
changeMonth: true,
changeYear: true,
yearRange: '-100:+0'
});
});
$('html').bind('keypress', function(e)
{
$('html').bind('keypress', function(e) {
//alert('Key Pressed');
if(e.keyCode == 13)
{
if (e.keyCode == 13) {
return false;
}
});
</script>
<style type="text/css">
@ -36,139 +25,100 @@ $('html').bind('keypress', function(e)
text-align: right;
}
</style>
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center>Public Holiday Information - <?php echo date('Y');?></center>
</h1>
</section>
<section class="content">
<div class="content-page">
<div class="content">
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div>
<div class="row">
<div class="col-xs-12">
<div class="box">
<div class="box-header">
<!--<center><h3 class="box-title">-->
<div class="box-tools">
</div><!--</h3></center>-->
</div><!-- /.box-header -->
<div class="col-md-12">
<div class="col-md-4">
<span>Holiday Name : </span>
<input type="text" name="hname" id="hname">
<div class="col-6">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title"> Public Holiday Information - <?php echo date('Y'); ?></h4>
</div>
<div class="col-md-4">
<span>Date : </span>
<input type="text" name="hdate" id="hdate">
</div>
</div>
<div class="row">
<div class="col-12">
<div class="card">
<div class="row" style="padding-left: 26px;">
<div class="col-md-3">
<span>Holiday Name : </span>
<input type="text" name="hname" id="hname" class="form-control">
</div>
<div class="col-md-3">
<input type="button" id="Add" value = "Add" class="btn btn-success" >
<span>Date : </span>
<input type="text" name="hdate" id="hdate" class="form-control">
</div>
<div class="col-md-3">
<input type="button" id="Add" value="Add" class="btn btn-success" class="form-control" style="margin-top: 20px;margin-bottom: 0px;">
</div>
</div>
<p>&nbsp;</p>
<div class="box-body">
<table id="phdays" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
<div class="card-body">
<table id="phdays" class="table dt-responsive nowrap w-100 ria_data_table">
<thead>
<tr>
<!-- <th>S.No</th> -->
<th>Holiday_Name</th>
<th>Date</th>
<th style="width:10%" ;>Action</th>
</tr>
</thead>
<tbody id="db">
<?php
$index = 0;
$testarray = array();
if(!empty($days))
{
foreach($days as $day)
{
if (!empty($days)) {
foreach ($days as $day) {
$index++;
$date = date_create($day->H_Date);
$date = date_format($date, 'd-m-Y');
?>
<tr id="<?php echo $index; ?>">
<!-- <td style="text-align:right;"><?php echo $index ?></td> -->
<td contenteditable='true' style="text-align:left;"><?php if(!empty($day->H_Name)){echo $day->H_Name;}else{echo "NO DATA";}?></td>
<td contenteditable='false' style="text-align:right;"><?php echo $date;?></td>
<td style="text-align:right;"><a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" id="Del" ><span class="glyphicon glyphicon-trash"></span></a></td>
<td contenteditable='true' style="text-align:left;"><?php if (!empty($day->H_Name)) {
echo $day->H_Name;
} else {
echo "NO DATA";
} ?></td>
<td contenteditable='false' style="text-align:left;"><?php echo $date; ?></td>
<td style="text-align:center;"><a href='#' onclick="DeleteRow(<?php echo $index; ?>)" id="Del"><span class="fas fa-trash"></span></a></td>
</tr>
<?php
}
}
?>
</tbody>
</table>
<p>&nbsp;</p>
<div class="row">
<div class="col-md-4" id="savebutton">
<input type="button" id="submit" value="Save" class="btn btn-success">
</div>
</div>
</div> <!-- end card body-->
</div> <!-- end card -->
</div><!-- end col-->
</div>
</div>
</div> <!-- container -->
</div> <!-- content -->
</div>
</div>
</div><!-- /.box-body -->
<!-- <div class="box-footer clearfix">
</div> -->
</div><!-- /.box -->
</div>
</div>
</section>
</div>
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
<script type="text/javascript">
$(function () {
$('#phdays').DataTable({
"paging": true,
"lengthChange": true,
"searching": true,
"ordering": false,
// "aaSorting": [[ 0, "asc" ]],
"info": true,
"autoWidth": true
});
});
</script>
<script type="text/html" id="addList">
<tr id="<%=index%>">
<tr>
<td style="text-align:left;" contenteditable="true"><%=Holiday_Name%></td>
<td style="text-align:right;" contenteditable="false"><%=Date%></td>
<td style="text-align:right;">
<a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
<td style="text-align:left;" contenteditable="false"><%=Date%></td>
<td style="text-align:center;">
<a href='#' onclick="DeleteRow(<?php echo $index; ?>)" id="Del"><span class="fas fa-trash"></span></a>
</td>
</tr>
</script>
<script>
function DeleteRow(rowid)
{
function DeleteRow(rowid) {
var d = '';
//alert(rowid);
var tr = document.getElementById(rowid);
@ -179,14 +129,16 @@ function DeleteRow(rowid)
}
});
// alert(d);
$('#content').loader('show');
// $('#content').loader('show');
$.ajax({
data:{param1:d},
data: {
param1: d
},
type: "POST",
url: "<?php echo base_url() ?>monthlypay/deletePublicHoliday",
success: function(data) {
$('#content').loader('hide');
// $('#content').loader('hide');
alert(data);
}
@ -194,26 +146,20 @@ function DeleteRow(rowid)
tr.parentNode.removeChild(tr);
}
$('#Add').click(function() {
var index = $('#phdays tr').length;
//alert(index);
var temp = index;
var H_name = $('#hname').val();
var H_date = $('#hdate').val();
if(H_name != '' && H_date != '')
{
if (H_name != '' && H_date != '') {
var template = jQuery("#addList").html();
index = parseInt(index);
$('#db').append(_.template(template,{index:temp,Holiday_Name:H_name,Date:H_date}));
var tablevalue = $('#phdays').tableToJSON(); // Convert the table into a javascript object
var value = JSON.stringify(tablevalue);
$('#db').append(_.template(template)({
index: index,
Holiday_Name: H_name,
Date: H_date
}));
$('#hname').val('');
$('#hdate').val('');
}
});
$('#submit').click(function() {
@ -223,7 +169,9 @@ $('#submit').click(function(){
$('#content').loader('show');
$.ajax({
data:{param1:jsondata},
data: {
param1: jsondata
},
type: "POST",
url: "<?php echo base_url() ?>monthlypay/savePublicHolidays",
@ -235,10 +183,4 @@ $('#submit').click(function(){
});
});
</script>

View File

@ -170,7 +170,10 @@
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
],
pageLength: 10, // Default rows per page
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
lengthMenu: [
[10, 20, 30, 50, -1],
[10, 20, 30, 50, "All"]
], // Rows per page options
responsive: true, // Responsive table
order: [], // Default ordering (column index 0, descending)
language: {

View File

@ -84,7 +84,8 @@
<div class="card-body">
<table id="user_list_table" class="table dt-responsive nowrap w-100">
<thead>
<tr> <th>Created Date</th>
<tr>
<th>Created Date</th>
<!-- <th>User Id</th> -->
<th>User Name</th>
<th>Email</th>
@ -192,7 +193,10 @@ $(document).ready(function() {
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
],
pageLength: 10, // Default rows per page
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
lengthMenu: [
[10, 20, 30, 50, -1],
[10, 20, 30, 50, "All"]
], // Rows per page options
responsive: true, // Responsive table
order: [], // Default ordering (column index 0, descending)
language: {