diff --git a/app/Config/Routes.php b/app/Config/Routes.php index b87741c7..fe8150a7 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -545,3 +545,6 @@ $routes->post('updateTrpProductionDetails', 'StockController::updateTrpProductio $routes->post('updateAbstractDetails','StockController::updateAbstractDetails'); +//Reports Module + +$routes->get('allReports','Report::allReports'); \ No newline at end of file diff --git a/app/Controllers/Payslip.php b/app/Controllers/Payslip.php index a53dc65f..0e8ed2db 100755 --- a/app/Controllers/Payslip.php +++ b/app/Controllers/Payslip.php @@ -2033,20 +2033,34 @@ class Payslip extends BaseController public function leaveReport() { - $fyr = get_financial_year(); - if ($this->request->getMethod() == 'POST') { - $fyr = $this->request->getPost('fyr'); - } - // $fiscalYears = get_financial_year_list(); - $fiscalYears = get_financial_year_list(date('Y'), 8); + + $report = []; + + if ($this->request->getMethod(true) === 'POST' && $this->request->getPost('btn_submit')) { + + + $data['from_date'] = $this->request->getPost('from_date'); + $data['to_date'] = $this->request->getPost('to_date'); + $data['EmpID'] = $this->request->getPost('emp'); + + + + $report = $this->monthlypay_model->leave_report($data['from_date'], $data['to_date'], $data['EmpID']); + + + } + + $data['EmpData'] = $this->monthlypay_model->getActiveEmployee(); + + + $data['data'] = $report; +// dd($data); + // Load the view - $data['fiscalyears'] = $fiscalYears; - $data['selectedfiscalyears'] = $fyr; - $data['leaverecords'] = $this->payroll_model->getEmpDetailsforLeave($fyr); - // echo ''; $this->global['pageTitle'] = 'Leave Reports'; $this->loadViews("leavereports", $this->global, $data, NULL); } + function monthwiseLeaveReport($param1,$param2) { $EmployeeID = $param1; diff --git a/app/Models/Dashboard_model.php b/app/Models/Dashboard_model.php index 82e2cd67..3bfa49d0 100755 --- a/app/Models/Dashboard_model.php +++ b/app/Models/Dashboard_model.php @@ -1065,11 +1065,11 @@ pm.Status != 'ST030' and pm.Status != 'ST056' and pm.Status != 'ST027' "; $sql = "SELECT - CASE WHEN MONTH(PODate)>=4 THEN - concat(YEAR(PODate), '-',YEAR(PODate)+1) - ELSE concat(YEAR(PODate)-1,'-', YEAR(PODate)) END AS financial_year - FROM t_purchaseorder_master -GROUP BY financial_year"; + CASE WHEN MONTH(PODate)>=4 THEN + concat(YEAR(PODate), '-',YEAR(PODate)+1) + ELSE concat(YEAR(PODate)-1,'-', YEAR(PODate)) END AS financial_year + FROM t_purchaseorder_master + GROUP BY financial_year"; $query = $this->db->query($sql); return $query->getResult(); } diff --git a/app/Models/Monthlypay_model.php b/app/Models/Monthlypay_model.php index 12903b92..3a6548ab 100755 --- a/app/Models/Monthlypay_model.php +++ b/app/Models/Monthlypay_model.php @@ -663,5 +663,45 @@ where Month_Year = ? and att.EmpID in (select EmpID from t_attendance)"; // return [$current]; } + function getActiveEmployee() + { + $array = $this->db->table('t_employee_details') + ->select("FirstName,LastName,Gender,EmpID") + ->where('IsActive', 1) + ->get() + ->getResultArray(); + + return $array; + + } + + function leave_report($from_date, $to_date, $empID) + { + $builder = $this->db->table('t_monthly_pay_inputs MPI'); + $builder->selectSum('MPI.LOP_Days'); + $builder->selectSum('MPI.Paid_leave'); + $builder->selectSum('MPI.OT_Hrs_Worked'); + $builder->selectSum('MPI.OTSalary'); + $builder->select('MPI.EmpID, ED.FirstName , ED.LastName'); + $builder->join('t_employee_details ED', 'MPI.EmpID = ED.EmpID', 'left'); + + // Filter by EmpID if set + if (!empty($empID)) { + $builder->where('MPI.EmpID', $empID); + } + + // Filter by date range if both dates are provided + if (!empty($from_date) && !empty($to_date)) { + $builder->where("MPI.Month_Year >=", $from_date); + $builder->where("MPI.Month_Year <=", $to_date); + } + + $builder->groupBy('MPI.EmpID'); + + $query = $builder->get(); + return $query->getResultArray(); + } + + } \ No newline at end of file diff --git a/app/Views/Report_pending_purchase.php b/app/Views/Report_pending_purchase.php index 24582bf8..913a9c29 100755 --- a/app/Views/Report_pending_purchase.php +++ b/app/Views/Report_pending_purchase.php @@ -125,6 +125,7 @@ +
diff --git a/app/Views/leavereports.php b/app/Views/leavereports.php index 1f9eed8b..c40e0a91 100755 --- a/app/Views/leavereports.php +++ b/app/Views/leavereports.php @@ -1,17 +1,37 @@ - - - - - - - - @@ -22,97 +42,132 @@
-
+
-
    +
    1. HR
      2. -
    2. Leave
      3. +
    3. Leave
    4. -

      -
      Leave Report
      -

      +

      Reports

-
+
-
-
-
- -
+ -
- - -
-
-
- + + "> +
+ +
+
+ +
+ + +
+
+
+ +
+ +
+ +
+
+ + + + +
+ +
+ +
+ +
+ +
+ + + + +
+ +
+
+
+ +
+ + + +
+ + - - - - - + + + + + + - - - - NoofAbsentDays != 0) { ?> - - - - + + + - - - - - - - + + + + + + + + + + + + +
S.NoEmployee NameLeave TakenPaid Leave TakenEmplayee NameLOP DaysPaid LeavesTotal Leaves
EmpID . '/' . $selectedfiscalyears . '">' . $rec->EmpID . '-' . $rec->FullName . ''; ?>EmpID . '-' . $rec->FullName; ?>
NoofAbsentDays)) { - echo number_format((int)$rec->NoofAbsentDays, 0, '.', ''); - } else { - echo "0"; - } ?>NoofPaidLeaveDays)) { - echo number_format((int)$rec->NoofPaidLeaveDays, 0, '.', ''); - } else { - echo "0"; - } ?>
@@ -122,47 +177,78 @@
- - + + + + + + + - \ No newline at end of file diff --git a/app/Views/reportslink.php b/app/Views/reportslink.php index f2840762..c03055cd 100755 --- a/app/Views/reportslink.php +++ b/app/Views/reportslink.php @@ -26,7 +26,7 @@

  Purchase

-

Purchase

+

Purchase

Year Wise

Pending

Purchase Supplier - Wise

diff --git a/app/Views/stock/CoatingMachineDetail.php b/app/Views/stock/CoatingMachineDetail.php index ae106fe5..1d1a29a4 100644 --- a/app/Views/stock/CoatingMachineDetail.php +++ b/app/Views/stock/CoatingMachineDetail.php @@ -365,9 +365,7 @@ " class="form-control " - data-provide="datepicker" - data-date-format="M-yyyy" - data-date-min-view-mode="1" readonly> + readonly>
@@ -1713,8 +1711,7 @@ $('#changeMonthForm').submit(); }); - $(document).ready(function(){ - $('#month').datepicker({ + $('#month').datepicker({ format: 'M-yyyy', viewMode: 'months', minViewMode: 'months', @@ -1723,7 +1720,6 @@ startDate: new Date(2025, 0), // Jan is month 0 endDate: new Date() // current date as max }); - }) diff --git a/app/Views/stock/drierMachineDetails.php b/app/Views/stock/drierMachineDetails.php index 1e958eec..e990901d 100644 --- a/app/Views/stock/drierMachineDetails.php +++ b/app/Views/stock/drierMachineDetails.php @@ -327,9 +327,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); " class="form-control " - data-provide="datepicker" - data-date-format="M-yyyy" - data-date-min-view-mode="1" readonly> + readonly>
@@ -1585,11 +1583,23 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); diff --git a/app/Views/stock/trpProductionStockDetails.php b/app/Views/stock/trpProductionStockDetails.php index 50e0d485..18e1c5c2 100644 --- a/app/Views/stock/trpProductionStockDetails.php +++ b/app/Views/stock/trpProductionStockDetails.php @@ -315,6 +315,8 @@ display: none; } + + @@ -1216,7 +1218,7 @@ $timeOtions[] = "12:00 AM"; $summary['ebReading'] += is_numeric($trpProductionDetail['ebReading']) ? $trpProductionDetail['ebReading'] : 0; $summary['ebReadingPerUnitTon'] += is_numeric($trpProductionDetail['ebReadingPerUnitTon']) ? $trpProductionDetail['ebReadingPerUnitTon'] : 0; $summary['noOfEbReadingDays'] += is_numeric($trpProductionDetail['ebReading']) - && $trpProductionDetail['ebReading'] != 0 ? 1 : 0 ; + && $trpProductionDetail['ebReading'] != 0 ? 1 : 0 ; $summary['workingPersonEngineers'] += is_numeric($trpProductionDetail['workingPersonEngineers']) ? $trpProductionDetail['workingPersonEngineers'] : 0; $summary['workingPersonSupervisiors'] += is_numeric($trpProductionDetail['workingPersonSupervisiors']) ? $trpProductionDetail['workingPersonSupervisiors'] : 0; $summary['workingPersonOperators'] += is_numeric($trpProductionDetail['workingPersonOperators']) ? $trpProductionDetail['workingPersonOperators'] : 0; @@ -1445,7 +1447,7 @@ $timeOtions[] = "12:00 AM"; - + @@ -1705,7 +1707,7 @@ $timeOtions[] = "12:00 AM"; [ 'absDate' => $trpAbstract["Power Consumption"]['date'], 'absParticulars' => "Power Consumption", - 'absRunningHrs' => $summary['ebReadingPerUnitTon'] / ($summary['noOfEbReadingDays'] ?? 1 ) == 0 ? " " : number_format($summary['ebReadingPerUnitTon'] / ($summary['noOfEbReadingDays'] ?? 1 ),2), + 'absRunningHrs' => $summary['ebReadingPerUnitTon'] / ($summary['noOfEbReadingDays'] == 0 ? 1 : $summary['noOfEbReadingDays'] ) == 0 ? " " : number_format($summary['ebReadingPerUnitTon'] / ($summary['noOfEbReadingDays'] == 0 ? 1 : $summary['noOfEbReadingDays'] ),2), 'absPerHour' => "", 'absOpeningStock' => (int)$trpAbstract["Power Consumption"]['opening_stock'] == 0 ? " " : (int)$trpAbstract["Power Consumption"]['opening_stock'], 'absReceipt' => '', @@ -1865,7 +1867,7 @@ $timeOtions[] = "12:00 AM"; [ 'absParticulars' => "Power Consumption", - 'absRunningHrs' => $summary['ebReadingPerUnitTon'] / ($summary['noOfEbReadingDays'] ?? 1 ) == 0 ? " " : number_format($summary['ebReadingPerUnitTon'] / ($summary['noOfEbReadingDays'] ?? 1 ) , 2), + 'absRunningHrs' => $summary['ebReadingPerUnitTon'] / ($summary['noOfEbReadingDays'] == 0 ? 1 : $summary['noOfEbReadingDays'] ) == 0 ? " " : number_format($summary['ebReadingPerUnitTon'] / ($summary['noOfEbReadingDays'] == 0 ? 1 : $summary['noOfEbReadingDays'] ) , 2), 'absPerHour' => "", 'absOpeningStock' => '', 'absReceipt' => '', diff --git a/app/Views/stock/trpSandUseStockDetails.php b/app/Views/stock/trpSandUseStockDetails.php index 66d41a47..3767b999 100644 --- a/app/Views/stock/trpSandUseStockDetails.php +++ b/app/Views/stock/trpSandUseStockDetails.php @@ -353,9 +353,7 @@ " class="form-control " - data-provide="datepicker" - data-date-format="M-yyyy" - data-date-min-view-mode="1" readonly + readonly style="max-width: 175px;"> @@ -1035,13 +1033,11 @@