Merge pull request 'change emp id to dtr emp id in dtr uploading' (#46) from paulcortezl5 into main

Reviewed-on: #46

app/Controllers/HRController.php

@@ -231,6 +231,7 @@ class HRController extends BaseController
                              '" data-emp_status_id="'.$employee->emp_status_id.
                              '" data-pay_group_id="'.$employee->pay_group_id.
                              '" data-company_issued_id="'.$employee->company_issued_id.
+                             '" data-dtr_emp_id="'.$employee->dtr_emp_id.
                              '" data-last_name="'.$employee->last_name.
                              '" data-first_name="'.$employee->first_name.
                              '" data-middle_name="'.$employee->middle_name.

app/Controllers/TKController.php

@@ -62,15 +62,15 @@ class TKController extends BaseController
 
                 foreach($employeeWorkDates as $employeeWorkDate)
                 {
-                    if(!isset($employeeWorkDayCount[$employeeWorkDate->company_issued_id]))
-                        $employeeWorkDayCount[$employeeWorkDate->company_issued_id] = [
+                    if(!isset($employeeWorkDayCount[$employeeWorkDate->dtr_emp_id]))
+                        $employeeWorkDayCount[$employeeWorkDate->dtr_emp_id] = [
                             'employee_id' => $employeeWorkDate->employee_id,
-                            'company_issued_id' => $employeeWorkDate->company_issued_id,
+                            'dtr_emp_id' => $employeeWorkDate->dtr_emp_id,
                             'employee_name' => $employeeWorkDate->first_name . ' ' . $employeeWorkDate->last_name,
                             'att_work_days' => 0
                         ];
 
-                    $employeeWorkDayCount[$employeeWorkDate->company_issued_id]['att_work_days']++;
+                    $employeeWorkDayCount[$employeeWorkDate->dtr_emp_id]['att_work_days']++;
                 }
 
                 $data['employeeWorkDayCount'] = $employeeWorkDayCount;
@@ -82,7 +82,7 @@ class TKController extends BaseController
                 foreach($empSummaries as $empSummary)
                     $employeeWorkDayCount[] = [
                         'employee_id' => $empSummary->employee_id,
-                        'company_issued_id' => $empSummary->company_issued_id,
+                        'dtr_emp_id' => $empSummary->dtr_emp_id,
                         'employee_name' => $empSummary->employee_name,
                         'att_work_days' => $empSummary->att_work_days
                     ];
@@ -108,7 +108,7 @@ class TKController extends BaseController
                 'paytrans_id' => $payTransId,
                 'pay_group_id' => $payGroupId,
                 'employee_id' => $empSummary[0],
-                'company_issued_id' => $empSummary[1],
+                'dtr_emp_id' => $empSummary[1],
                 'employee_name' => $empSummary[2],
                 'att_work_days' => $empSummary[3]
             ];
@@ -156,7 +156,7 @@ class TKController extends BaseController
                 $attLogHTMLTable->setHeading('Employee ID', 'Log Date', 'Log Time', 'In/Out', 'Branch');
                 foreach($data['attendanceLog'] as $attLog)
                 {
-                    $attLogHTMLTable->addRow($attLog->company_issued_id, $attLog->log_date, $attLog->log_time, ($attLog->log_type) ? 'Out' : 'In', $attLog->branch_code);
+                    $attLogHTMLTable->addRow($attLog->dtr_emp_id, $attLog->log_date, $attLog->log_time, ($attLog->log_type) ? 'Out' : 'In', $attLog->branch_code);
                 }
 
                 $data['tblAttLog'] = $attLogHTMLTable->generate();
@@ -212,7 +212,7 @@ class TKController extends BaseController
                         }
 
                         $batchRawAttLog[] = [
-                            'company_issued_id' => trim(substr($line, 8, 4)),
+                            'dtr_emp_id' => trim(substr($line, 8, 4)),
                             'log_date' => $dateFromFile,
                             'log_time' => $dateTime[1],
                             'log_type' => (trim(substr($line, 38, 2)) == "23") ? 0 : 1,
@@ -249,7 +249,7 @@ class TKController extends BaseController
                         }
 
                         $batchRawAttLog[] = [
-                            'company_issued_id' => trim(substr($line, 0, 9)),
+                            'dtr_emp_id' => trim(substr($line, 0, 9)),
                             'log_date' => substr($line, 10, 10),
                             'log_time' => substr($line, 21, 8),
                             'log_type' => substr($line, 32, 1),

app/Database/Migrations/2025-03-15-084814_AddDTREmpIDOnEmployee.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddDTREmpIDOnEmployee extends Migration
+{
+    public function up()
+    {
+        $fields = [
+            'dtr_emp_id' => [
+                'type' => 'VARCHAR',
+                'constraint' => 25,
+                'null' => true,
+                'after' => 'company_issued_id',
+            ],
+        ];
+
+        $this->forge->addColumn('employee', $fields);
+    }
+
+    public function down()
+    {
+        $this->forge->dropColumn('employee', 'dtr_emp_id');
+    }
+}

app/Database/Migrations/2025-03-15-091357_RenameCompIssuedIDTodtrempidOnattlogsummary.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class RenameCompIssuedIDTodtrempidOnattlogsummary extends Migration
+{
+    public function up()
+    {
+        $fields = [
+            'company_issued_id' => [
+                'name' => 'dtr_emp_id',
+                'type' => 'VARCHAR',
+                'constraint' => 25,
+                'null' => true,
+            ],
+        ];
+
+        $this->forge->modifyColumn('att_log_summary', $fields);
+    }
+
+    public function down()
+    {
+        $fields = [
+            'dtr_emp_id' => [
+                'name' => 'company_issued_id',
+                'type' => 'VARCHAR',
+                'constraint' => 25,
+                'null' => true,
+            ],
+        ];
+
+        $this->forge->modifyColumn('att_log_summary', $fields);
+    }
+}

app/Database/Migrations/2025-03-15-091417_RenameCompIssuedIDTodtrempidOnrawattlog.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class RenameCompIssuedIDTodtrempidOnrawattlog extends Migration
+{
+    public function up()
+    {
+        $fields = [
+            'company_issued_id' => [
+                'name' => 'dtr_emp_id',
+                'type' => 'VARCHAR',
+                'constraint' => 25,
+                'null' => true,
+            ],
+        ];
+
+        $this->forge->modifyColumn('raw_att_log', $fields);
+    }
+
+    public function down()
+    {
+        $fields = [
+            'dtr_emp_id' => [
+                'name' => 'company_issued_id',
+                'type' => 'VARCHAR',
+                'constraint' => 25,
+                'null' => true,
+            ],
+        ];
+
+        $this->forge->modifyColumn('raw_att_log', $fields);
+    }
+}

app/Entities/AttendanceSummary.php

@@ -11,7 +11,7 @@ class AttendanceSummary extends Entity
         'paytrans_id' => null,
         'pay_group_id' => null,
         'employee_id' => null,
-        'company_issued_id' => null,
+        'dtr_emp_id' => null,
         'employee_name' => null,
         'att_work_days' => null,
     ];

app/Entities/Employee.php

@@ -15,6 +15,7 @@ class Employee extends Entity
         'emp_status_id' => null,
         'pay_group_id' => null,
         'company_issued_id' => null,
+        'dtr_emp_id' => null, 
         'last_name' => null,
         'first_name' => null,
         'middle_name' => null,

app/Entities/RawAttLog.php

@@ -7,7 +7,7 @@ use CodeIgniter\Entity\Entity;
 class RawAttLog extends Entity
 {
     protected $attributes = [
-        'company_issue_id' => null,
+        'dtr_emp_id' => null,
         'log_date'         => null,
         'log_time'         => null,
         'log_type'         => null,

app/Models/AttendanceSummaryModel.php

@@ -15,7 +15,7 @@ class AttendanceSummaryModel extends Model
     protected $allowedFields    = ['paytrans_id', 
                                    'pay_group_id', 
                                    'employee_id', 
-                                   'company_issued_id',
+                                   'dtr_emp_id',
                                    'employee_name',
                                    'att_work_days'];
 

app/Models/EmployeeModel.php

@@ -19,6 +19,7 @@ class EmployeeModel extends Model
                                    'emp_status_id', 
                                    'pay_group_id',
                                    'company_issued_id', 
+                                   'dtr_emp_id', 
                                    'last_name', 
                                    'first_name', 
                                    'middle_name', 

app/Models/RawAttLogModel.php

@@ -7,12 +7,12 @@ use CodeIgniter\Model;
 class RawAttLogModel extends Model
 {
     protected $table            = 'raw_att_log';
-    protected $primaryKey       = ['company_issued_id', 'log_date', 'log_time', 'log_type'];
+    protected $primaryKey       = ['dtr_emp_id', 'log_date', 'log_time', 'log_type'];
     protected $useAutoIncrement = false;
     protected $returnType       = \App\Entities\RawAttLog::class;
     protected $useSoftDeletes   = false;
     protected $protectFields    = true;
-    protected $allowedFields    = ['company_issued_id', 
+    protected $allowedFields    = ['dtr_emp_id', 
                                    'log_date', 
                                    'log_time', 
                                    'log_type', 
@@ -62,8 +62,8 @@ class RawAttLogModel extends Model
     public function getEmployeeDaysCount($logDataFrom, $logDataTo)
     {
         $builder = $this->db->table('raw_att_log');
-        $builder->distinct()->select(['raw_att_log.company_issued_id', 'employee.employee_id', 'employee.last_name', 'employee.first_name', 'raw_att_log.log_date']);
-        $builder->join('employee', 'employee.company_issued_id = raw_att_log.company_issued_id');
+        $builder->distinct()->select(['raw_att_log.dtr_emp_id', 'employee.employee_id', 'employee.last_name', 'employee.first_name', 'raw_att_log.log_date']);
+        $builder->join('employee', 'employee.dtr_emp_id = raw_att_log.dtr_emp_id');
         return $builder->getWhere(['raw_att_log.log_date >='=>$logDataFrom, 'raw_att_log.log_date <='=>$logDataTo])->getResult();
     }
 }

app/Views/hr/employeeview.php

@@ -141,6 +141,10 @@
                     <label for="txtCompanyIssuedID">ID Number</label>
                     <input class="form-control" type="text" id="txtCompanyIssuedID" name="company_issued_id" value="<?= old('company_issued_id') ?>">
                   </div>
+                  <div class="form-group">
+                    <label for="txtDTRIDNo">ID Number used in DTR</label>
+                    <input class="form-control" type="text" id="txtDTRIDNo" name="dtr_emp_id" value="<?= old('dtr_emp_id') ?>">
+                  </div>
                   <div class="form-group">
                     <label for="txtLastname">Last Name</label>
                     <input class="form-control" type="text" id="txtLastname" name="last_name" value="<?= old('last_name') ?>">
@@ -284,6 +288,10 @@
                     <label for="txtEditCompanyIssuedID">ID Number</label>
                     <input class="form-control" type="text" id="txtEditCompanyIssuedID" name="company_issued_id">
                   </div>
+                  <div class="form-group">
+                    <label for="txtEditDTRIDNo">ID Number used in DTR</label>
+                    <input class="form-control" type="text" id="txtEditDTRIDNo" name="dtr_emp_id">
+                  </div>
                   <div class="form-group">
                     <label for="txtEditLastname">Last Name</label>
                     <input class="form-control" type="text" id="txtEditLastname" name="last_name">
@@ -380,6 +388,7 @@ function editEmployee(data)
   $("#cmbEditEmploymentStatus").val($(data).data("emp_status_id"));
   $("#cmbEditPayGroup").val($(data).data("pay_group_id"));
   $("#txtEditCompanyIssuedID").val($(data).data("company_issued_id"));
+  $("#txtEditDTRIDNo").val($(data).data("dtr_emp_id"));
   $("#txtEditLastname").val($(data).data("last_name"));
   $("#txtEditFirstName").val($(data).data("first_name"));
   $("#txtEditMiddleName").val($(data).data("middle_name"));

app/Views/timekeeping/attsummaryview.php

@@ -149,8 +149,8 @@
                 <?php foreach($employeeWorkDayCount as $value): ?>
                   <tr>
                     <td>
-                      <?= $value['company_issued_id'] ?>
-                      <input type="hidden" name="emp_work_day_count[]" value="<?= $value['employee_id'].'|'.$value['company_issued_id'].'|'.$value['employee_name'].'|'.$value['att_work_days'] ?>">
+                      <?= $value['dtr_emp_id'] ?>
+                      <input type="hidden" name="emp_work_day_count[]" value="<?= $value['employee_id'].'|'.$value['dtr_emp_id'].'|'.$value['employee_name'].'|'.$value['att_work_days'] ?>">
                     </td>
                     <td><?= ($value['employee_name'] == '') ? 'Unkown ID' : $value['employee_name'] ?></td>
                     <td>