From a7ffbfe74136db364ad877a29a5757a88d071f92 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Fri, 9 Aug 2024 10:03:04 +0530 Subject: [PATCH 1/2] DateRange filter in requisition : GWM --- app/Views/requisitionlisting.php | 464 +++++++++++++++++++++---------- 1 file changed, 317 insertions(+), 147 deletions(-) diff --git a/app/Views/requisitionlisting.php b/app/Views/requisitionlisting.php index 848e3948..487fe3af 100644 --- a/app/Views/requisitionlisting.php +++ b/app/Views/requisitionlisting.php @@ -11,182 +11,352 @@ } //echo $ReqNo; }?> - + + +
- +
- +
-
-
-

Requisition Listing

- -
- 0 ) {?>

- The Requisition No is in Draft status. Please act on the requisition.Then only you can raise New Requisition. -

-
-
-
- - Raise New Requisition - -
-
-
- - - - - - - - - - - - - - - +
+ +
+
+

Requisition Listing

+
+ +
+ + 0 ) {?>

+ The Requisition No is in Draft + status. Please act on the requisition.Then only you can raise + New Requisition. +

+ +
+
+
+ +
+
+ + + + + + + + + +
+ +
+ +
+ + Raise New Requisition + +
+
+
+
+ +
Requisted DateRequisition NoRequisition TypeTot No.OfLineItem Po CreatedLineItemPartially PoCreatedLineItemNewLine ItemStatusAction
+ + + + + + + + + + + + + + - - - + - - - - - - + + + + + + + - - - - - - StatusName ?> + + + + + -
Requisted DateRequisition NoRequisition TypeTot No.OfLineItem Po CreatedLineItemPartially PoCreatedLineItemNewLine ItemStatusAction
CreatedDate ); +
CreatedDate ); $PODate = $Pdt->format('d-m-Y'); echo $PODate ?> - ReqNo ?>ReqType ?>TotalNoofLineItems ?>PolineItems ?>PartilallyLineItems ?> newLineItem ?>ReqNo ?>ReqType ?>TotalNoofLineItems ?>PolineItems ?>PartilallyLineItems ?> newLineItem ?>StatusName ?>    
    + +
- - + + +
-
-
-
-
- - + + + + + + + + \ No newline at end of file From 04cd715c947b896fc337dceae9d9caac913b863a Mon Sep 17 00:00:00 2001 From: bitbucket Date: Tue, 13 Aug 2024 09:05:45 +0530 Subject: [PATCH 2/2] payslip : GWM --- app/Controllers/Payslip.php | 36 +++++++++---------- app/Views/attendance.php | 2 +- app/Views/includes/header.php | 35 +++++++++--------- app/Views/requisitionlisting.php | 61 ++------------------------------ 4 files changed, 37 insertions(+), 97 deletions(-) diff --git a/app/Controllers/Payslip.php b/app/Controllers/Payslip.php index daa58d69..14a03a0e 100644 --- a/app/Controllers/Payslip.php +++ b/app/Controllers/Payslip.php @@ -1067,25 +1067,25 @@ class Payslip extends BaseController $filename = " "; $html = ""; $All = $this->request->getPost('All'); - if ($All == '') { - $this->validator->setRules([ - 'Employee' => [ - 'label' => 'Employee', - 'rules' => 'trim|callback_Employee_validate', - ] - ]); - } + // if ($All == '') { + // $this->validator->setRules([ + // 'Employee' => [ + // 'label' => 'Employee', + // 'rules' => 'trim|callback_Employee_validate', + // ] + // ]); + // } - $this->validator->setRules([ - 'PayOn' => [ - 'label' => 'PayOn', - 'rules' => 'trim|callback_PayOn_validate', - ] - ]); + // $this->validator->setRules([ + // 'PayOn' => [ + // 'label' => 'PayOn', + // 'rules' => 'trim|callback_PayOn_validate', + // ] + // ]); - if ($this->validator->run() == FALSE) { - $this->viewGenerator(); - } else { + // if ($this->validator->run() == FALSE) { + // $this->viewGenerator(); + // } else { $Payon = $this->request->getPost('PayOn'); $m = date("M", mktime(0, 0, 0, (int)$Payon, 10)); @@ -1193,7 +1193,7 @@ class Payslip extends BaseController $mpdf->SetTitle('Resico:Payslip'); $mpdf->Output("Payslip-" . $filename . ".pdf", 'D'); - } + // } } function updatePayslip() diff --git a/app/Views/attendance.php b/app/Views/attendance.php index dbea9491..768ef067 100644 --- a/app/Views/attendance.php +++ b/app/Views/attendance.php @@ -341,7 +341,7 @@ $currentday = date('d'); EmpID;?> - FirstName.'-'.$a->LastName;?> + FirstName;?>

HR

-
  • - - - Employee - - - - - +
    • +
  • + + + Attendance + +
    • + @@ -878,11 +875,11 @@