Merge pull request 'Added description to SSG's request [WRONG DESCRIPTION]' (#35) from paulcortezl5 into main

Reviewed-on: #35

app/Config/Routes.php

@@ -100,4 +100,8 @@ $routes->get('tk/attsummary', 'TKController::attendanceSummary');
 $routes->post('tk/attsumsave/(:any)/(:any)', 'TKController::attendanceSummarySave/$1/$2');
 $routes->get('tk/attsumdel/(:any)/(:any)', 'TKController::attendanceSummaryDelete/$1/$2');
 
+
+// Regular Employee Routes
+$routes->get('remp', 'RegularEmployeeController::index');
+
 service('auth')->routes($routes);

app/Controllers/PayrollController.php

@@ -978,6 +978,7 @@ class PayrollController extends BaseController
 
             foreach($inDedList as $inDedId)
             {
+                // Extract Income Deduction ID from this string example --> [1] Allowance.
                 preg_match_all('/\[(.*?)\]/', $inDedId, $matches);
 
                 if(isset($empInDedList[$empPayTrans->employee_id.':'.$matches[1][0]]))

app/Controllers/RegularEmployeeController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class RegularEmployeeController extends BaseController
+{
+    public function index()
+    {
+        return redirect()->to(base_url('/login'));
+    }
+}

app/Views/templates/adminlte/generalcontent.php

@@ -154,6 +154,45 @@
             </a>
           </li>
 
+          <?php if(auth()->user()->inGroup('admin', 'superadmin', 'user')): ?>
+          <li class="nav-header">REGULAR EMP</li>
+          <li class="nav-item">
+            <a href="#" class="nav-link">
+              <i class="nav-icon fas fa-calendar-alt"></i>
+              <p>
+                Attendance
+                <i class="right fas fa-angle-left"></i>
+              </p>
+            </a>
+            <ul class="nav nav-treeview">
+              <li class="nav-item">
+                <a href="/tk/rawattlogupload" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>
+                    Attendance Uploading
+                  </p>
+                </a>
+              </li>
+              <li class="nav-item">
+                <a href="/tk/attsummary" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>
+                    Attendance Summary
+                  </p>
+                </a>
+              </li>
+            </ul>
+          </li>
+          <li class="nav-item">
+            <a href="/tk/rawattlogupload" class="nav-link">
+              <i class="far fa-circle nav-icon"></i>
+              <p>
+                View Payslip
+              </p>
+            </a>
+          </li>
+          <?php endif; ?>
+
           <?php if(auth()->user()->inGroup('admin', 'superadmin', 'hr')): ?>
           <li class="nav-header">HUMAN RESOURCES</li>
           <li class="nav-item">