code Merge

This commit is contained in:
VE10-Sanjeev 2025-04-24 04:00:13 +00:00
commit 5c22d82c34
4 changed files with 303 additions and 314 deletions

View File

@ -1185,10 +1185,12 @@ class Report extends BaseController
$ab = $this->request->getPost('financialyear');
$data['ab'] = $ab;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
$m = $this->request->getPost('month');
$data['m'] = $m;
//print_r($prod);
@ -1214,7 +1216,7 @@ class Report extends BaseController
$day = array();
$DateofJoiningInString = $Employee->DateofJoining;
$DateofJoiningInString = $Employee->DateofJoining;
$DateofJoining = date_create($DateofJoiningInString);
// print_r($DateofJoining);
// $doj_month = date_format($DateofJoining, "n");

View File

@ -79,40 +79,34 @@ if (!function_exists('get_date_format')) {
// }
if (!function_exists('format_date')) {
function format_date($dateString, $days = 0,$format = 'Y-m-d')
function format_date($dateString, $days = 0, $format = 'Y-m-d')
{
// Check if the input is already a Unix timestamp
if (is_numeric($dateString) && (string) (int) $dateString === $dateString) {
$date = strtotime($dateString);
} else {
// Use date_create() to create a DateTime object
// If already a DateTime object
if ($dateString instanceof DateTime) {
$date = $dateString;
}
// If Unix timestamp
elseif (is_numeric($dateString) && (string) (int) $dateString === (string) $dateString) {
$date = new DateTime();
$date->setTimestamp((int) $dateString);
}
// If string
else {
$date = date_create($dateString);
}
// If $date is false, meaning parsing failed, return null
if (!$date) {
return null;
}
// Subtract the specified number of days from the date if $days is provided
// Modify date
if ($days != 0) {
// If $date is a Unix timestamp, modify it using strtotime()
if (is_numeric($dateString) && (string) (int) $dateString === $dateString) {
$date = strtotime("-$days day", $date);
} else {
// If $date is a DateTime object, modify it using DateTime::modify()
date_modify($date, "-$days day");
}
}
// If $date is a Unix timestamp, format it using date()
if (is_numeric($dateString) && (string) (int) $dateString === $dateString) {
return date($format, $date);
} else {
// If $date is a DateTime object, format it using DateTime::format()
return date_format($date, $format);
$date->modify("-{$days} days");
}
return $date->format($format);
}
}
if (!function_exists('get_financial_year')) {

View File

@ -1,303 +1,297 @@
<script>
$(document).ready(function() {
$("#client_name").select2();
$("#item_name").select2();
$("#purchaseorder_number").select2();
});
</script>
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
<style>
.dataTables_filter input {padding: 4px;}
.dataTables_filter {
width: 50%;
float: right;
text-align: right;
}
.dataTables_paginate {
width: 50%;
float: right;
text-align: right;
}
div.dt-buttons {
position: relative;
float: right;
<style>
table{
width:auto;
}
}
.btn-success {
background-color: #00d976;;
border-color: #00d976;;
}
.col-md-offset-1 {
margin-left: 2.333333%;
padding-top: 5px;
}
</style>
<div class="content-wrapper">
<section class="content">
<div class="row" style="min-height: 600px;">
<!-- Left col -->
<div class="col-md-12">
<!-- TABLE: LATEST ORDERS -->
<div class="box box-info">
<div class="box-header with-border">
<center><h3 class="box-title"><p style="color: #00d976;"><b>Employee Performance</b><br>
<?php
if($this->input->post('financialyear')){
$ab=$this->input->post('financialyear');
echo '('.$ab.')';
echo ' ';
}
if($this->input->post('month')){
$m=$this->input->post('month');
echo '('.$m.')';
echo ' ';
}
?>
</p></h3></center>
</div>
<!-- /.box-header -->
<div class="panel-body">
.dataTables_filter input {
padding: 4px;
}
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
.dataTables_filter {
/* width: 50%; */
float: right;
text-align: right;
}
<div class="form-group has-feedback">
<div class="col-md-2">
<label for="to_date">
<?php echo 'Year'; ?>
</label>
<div class="input-group">
<select class="form-control" id="financialyear" name="financialyear" required>
<option value="">Select Year</option>
<?php
foreach($fy as $item):
{?>
<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ; ?></option>
<?php } endforeach; ?>
</select>
</div>
.dataTables_paginate {
width: 50%;
float: right;
text-align: right;
}
div.dt-buttons {
position: relative;
/* float: right; */
}
</style>
<div class="content-page">
<div class="content">
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div>
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<div class="page-title-right">
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
<li class="breadcrumb-item"><a href="javascript: void(0);"></a> Attendance</li>
<li class="breadcrumb-item active">
<h4 class="page-title"><b> Employee Performance </b></h4>
</li>
</ol>
</div>
<div class="col-md-2">
<label for="to_date">
<?php echo 'Month'; ?>
</label>
<div class="input-group">
<select class="form-control" id="month" name="month" required>
<option value="">Select Month</option>
<option value="April">April</option>
<option value="May">May</option>
<option value="June">June</option>
<option value="July">July</option>
<option value="August">August</option>
<option value="September">September</option>
<option value="October">October</option>
<option value="November">November</option>
<option value="December">December</option>
<option value="January">January</option>
<option value="February">February</option>
<option value="March">March</option>
</select>
</div>
</div>
<div class="col-md-2 col-md-offset-1"><br>
<input type="submit" class="btn btn-success" name="btn_submit"
value="View Report">
</div>
</form>
</div>
</div>
<div class="box-body">
<div>
<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
<thead>
<tr>
<th rowspan="2">EmpID</th>
<th rowspan="2">Employee Name </th>
<th rowspan="2">Status</th>
<th colspan="3"><center>Month</center></th>
<th colspan="3"><center>Year</center></th>
</tr>
<tr>
<th>Total Days</th>
<th>Present Days</th>
<th>Percentage</th>
<th>Total Days</th>
<th>Present Days</th>
<th>Percentage</th>
</tr>
</thead>
<tbody>
<?php if(!empty($per)){
$tr3=0;
$tr4=0;
$last = $this->uri->total_segments();
$ab=$this->uri->segment($last);
foreach($per as $index =>$rel)
{
//echo $index;
//echo
?>
<tr>
<td><span>
<?php echo $rel->Eid;?>
</span></td>
<td><span><?php echo $rel->ename;?></span></td>
<td style="text-align:right"><span><?php
if($rel->active == 1){
echo 'Active';
}else
{
echo 'In Active';
}
?></span></td>
<td style="text-align:right"><span><?php
echo $cur_month;?></span></td>
<td style="text-align:right"><span><?php echo $rel->monthworked;?></span></td>
<td style="text-align:right"><span><?php echo $rel->monthpercentage;?></span></td>
<td style="text-align:right"><span><?php echo $yeardays[$index];?></span></td>
<td style="text-align:right"><span><?php echo $dayworked[$index];?></span></td>
<td style="text-align:right"><span><?php echo $yearpercentage[$index];?></span></td>
</tr>
<?php
}
?>
</tbody>
<tfoot width="100%">
</tfoot>
<?php
}
?>
</table>
</div>
</div>
</div>
<!-- /.box -->
</div>
<!-- /.col -->
</div>
</section>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="card">
<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
<div class="card-body">
<form method="post" action="<?php echo base_url('Empperform') ?>">
<div class="form-group has-feedback">
<div class="row">
<div class="col-3">
<label for="to_date">
<?php echo 'Year'; ?>
</label>
<div class="input-group">
<select class="form-control" id="financialyear" name="financialyear" required>
<option value="">Select Year</option>
<?php
foreach($fy as $item):
{?>
<option
<?php echo isset($ab) && $ab == $item->financial_year ? "selected" : ""?>
value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ; ?></option>
<?php } endforeach; ?>
</select>
</div>
</div>
<div class="col-md-3">
<label for="to_date">
<?php echo 'Month'; ?>
</label>
<div class="input-group">
<select class="form-control" id="month" name="month" required>
<option value="">Select Month</option>
<?php
$months=[
"April",
"May",
"June",
"July",
"August",
"September",
"October",
"November",
"December",
"January",
"February",
"March",
]
?>
<?php
foreach($months as $month){ ?>
<option
<?php echo isset($m) && $m == $month ? "selected" : "" ?>
value="<?=$month?>">
<?=$month?>
</option>
<?php }
?>
</select>
</div>
</div>
<div class="col-md-6 text-right"><br>
<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Empperform') ?>';">
<input type="submit" class="btn btn-success" name="btn_submit"
value="View Report">
</div>
</div>
</form>
<table id="cc" class="table table-bordered table-hover wrap" style="background-color:#fff;width: 100% !important;">
<!-- <table class="table table-bordered table-hover" id="asset_list_table" style="background-color:#fff;font-size:12px;"> -->
<thead>
<tr>
<th rowspan="2">EmpID</th>
<th rowspan="2">Employee Name </th>
<th rowspan="2">Status</th>
<th colspan="3"><center>Month</center></th>
<th colspan="3"><center>Year</center></th>
</tr>
<tr>
<th>Total Days</th>
<th>Present Days</th>
<th>Percentage</th>
<th>Total Days</th>
<th>Present Days</th>
<th>Percentage</th>
</tr>
</thead>
<tbody>
<tbody>
<?php if(!empty($per)){
$tr3=0;
$tr4=0;
foreach($per as $index =>$rel)
{
//echo $index;
//echo
?>
<tr>
<td><span>
<?php echo $rel->Eid;?>
</span></td>
<td><span><?php echo $rel->ename;?></span></td>
<td style="text-align:right"><span><?php
if($rel->active == 1){
echo 'Active';
}else
{
echo 'In Active';
}
?></span></td>
<td style="text-align:right"><span><?php
echo $cur_month;?></span></td>
<td style="text-align:right"><span><?php echo $rel->monthworked;?></span></td>
<td style="text-align:right"><span><?php echo $rel->monthpercentage;?></span></td>
<td style="text-align:right"><span><?php echo $yeardays[$index];?></span></td>
<td style="text-align:right"><span><?php echo $dayworked[$index];?></span></td>
<td style="text-align:right"><span><?php echo $yearpercentage[$index];?></span></td>
</tr>
<?php
}
}
?>
</tbody>
<tfoot width="100%">
</tfoot>
</table>
</div> <!-- end card body-->
</div> <!-- end card -->
</div><!-- end col-->
</div>
</div>
</div> <!-- container -->
</div> <!-- content -->
</div>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
<script>
// Bootstrap datepicker
// Set up your table
$(document).ready(function() {
table = $('#cc').DataTable( {
"language": {
"emptyTable": "<center> Data Not Found ! </center>"
},
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
"<'row'<'col-md-6'><'col-md-6'>>" +
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
buttons: [
{
extend: 'excelHtml5',
footer: 'true',
//messageTop: $('h3').text(),
title: $('h3').text(),
exportOptions: {
columns: ':visible'
}
},
'colvis'
]
} );
} );
$('#mySelect').on('change',function(){
table
// Initialize the DataTable with only pagination enabled
var table = $('#cc').DataTable({
dom: 'Blfrtip',
buttons: [
{
extend: 'excel',
text: 'Excel',
}
],
paging: true, // Enable pagination
searching: true, // Disable search
ordering: false, // Disable column sorting
info: false, // Disable table information
lengthChange: false, // Disable page length options
pageLength: 10, // Default rows per page
responsive: true, // Keep responsive design
language: {
paginate: {
next: '<i class="fas fa-angle-right"></i>', // Next button icon
previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
}
}
});
});
$('#mySelect').on('change',function(){
table
.column(4)
.search(this.value)
.draw();
});
$( function() {
//var dateFormat = "mm/dd/yy",
from = $( "#min-date" )
.datepicker({
dateFormat: "dd-mm-yy",
defaultDate: "+0d",
changeMonth: true,
//numberOfMonths: 1
})
.on( "change", function() {
to.datepicker("option", "minDate", getDate( this ) );
}),
to = $( "#max-date" ).datepicker({
dateFormat: "dd-mm-yy",
defaultDate: "+0d",
changeMonth: true,
//numberOfMonths: 1
})
.on( "change", function() {
from.datepicker( "option", "maxDate", getDate( this ) );
});
function getDate( element ) {
var date;
try {
date = $.datepicker.parseDate( dateFormat, element.value );
} catch( error ) {
date = null;
}
return date;
}
} );
function Reset()
{
$('#mySelect').val('');
}
{
$('#mySelect').val('');
}
</script>

View File

@ -40,15 +40,15 @@
</div>
<div class="col-md-3">
<h4><span class="fa fa-truck">&nbsp; Inward</span></h4>
<a href="<?php echo base_url(); ?>Report_purchase_inward" target="_blank" >Inward Details<p class="uk-text uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_purchase_attach" target="_blank" >Inward Summary<p class="uk-text uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_year_wise_inward" target="_blank" >Year Wise-Inward<p class="uk-text-meta uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_supplier_inward" target="_blank" >Inward-Supplier Wise<p class="uk-text uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_consolidate_inward" target="_blank" >Consolidate Report-Inward<p class="uk-text-meta uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_cumulative_inward" target="_blank" >Cumulative Report-Inward<p class="uk-text uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_cumulative_raw" target="_blank" >Cumulative Report - Category Wise-Inward<p class="uk-text uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_purchase_inward" target="_blank" >Inward Details<p class="uk-text uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_purchase_attach" target="_blank" >Inward Summary<p class="uk-text uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_year_wise_inward" target="_blank" >Year Wise-Inward<p class="uk-text-meta uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_supplier_inward" target="_blank" >Inward-Supplier Wise<p class="uk-text uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_consolidate_inward" target="_blank" >Consolidate Report-Inward<p class="uk-text-meta uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_cumulative_inward" target="_blank" >Cumulative Report-Inward<p class="uk-text uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_cumulative_raw" target="_blank" >Cumulative Report - Category Wise-Inward<p class="uk-text uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>Report_consolidate_category" target="_blank" >Consolidate Report - Category Wise-Inward<p class="uk-text-meta uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>DeliveryPerformance" target="_blank" > Report - DeliveryPerformance<p class="uk-text-meta uk-margin-remove"></p></a>
<a href="<?php echo base_url(); ?>DeliveryPerformance" target="_blank" > Report - DeliveryPerformance<p class="uk-text-meta uk-margin-remove"></p></a>
</div>
</div>
<hr>
@ -56,7 +56,7 @@
<div class="col-md-3">
<h4><span class="fa fa-money-bill-alt">&nbsp; Finance Reports </span></h4>
<a href="<?php echo base_url(); ?>Report_costcenter" target="_blank"><p class="uk-text uk-margin-remove">Cost Center</p></a>
<p class="uk-text uk-margin-remove">Production Salary Cost</p>
<!-- <p class="uk-text uk-margin-remove">Production Salary Cost</p> -->
</div>
@ -88,8 +88,7 @@
<div class="col-md-3">
<h4><span class="fa fa-calendar">&nbsp; Attendance </span></h4>
<p class="uk-text uk-margin-remove" target="_blank">Employee Attendance</p>
<p class="uk-text uk-margin-remove" target="_blank">Employee Performance</p>
<a href="<?php echo base_url(); ?>Empperform" target="_blank"><p class="uk-text uk-margin-remove">Employee Performance</p></a>
<a href="<?php echo base_url(); ?>leavereports" target="_blank"><p class="uk-text uk-margin-remove">Leave Report</p></a>
</div>
</div>