From fbc1606e7d91b1daff5bc986402294c1f1d58305 Mon Sep 17 00:00:00 2001
From: NguyenND <ngodanguyen@gmail.com>
Date: Fri, 23 Jan 2026 11:31:29 -0500
Subject: [PATCH] Update Hours Calculator with special work: parsing multiple
 cases. e.g.sp1234, sp 1234, 1234sp, 1234 sp

---
 templates/time_attendance_dashboard.html |  2 +-
 working_hours_calculator.py              | 38 +++++++++++++-----------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/templates/time_attendance_dashboard.html b/templates/time_attendance_dashboard.html
index 9853270..634e329 100644
--- a/templates/time_attendance_dashboard.html
+++ b/templates/time_attendance_dashboard.html
@@ -18,7 +18,7 @@
     </div>
     
     <div class="header-actions">
-      {% if session.role in ['admin', 'payroll'] %}
+      {% if session.role in ['admin', 'payroll', 'accounting'] %}
       <a href="{{ url_for('import_time_attendance') }}" class="btn btn-primary">
         <i class="fas fa-upload"></i>
         Import Excel Data
diff --git a/working_hours_calculator.py b/working_hours_calculator.py
index b9f8838..080045c 100644
--- a/working_hours_calculator.py
+++ b/working_hours_calculator.py
@@ -34,8 +34,14 @@ def parse_employee_id_for_work_type(employee_id: str) -> Tuple[str, str]:
     """
     Parse employee ID to extract base ID and work type (supports SP, PW, PT)
     
+    Handles multiple formats:
+    - Suffix with space: "1234 SP", "1234 PW", "1234 PT"
+    - Suffix without space: "1234SP", "1234PW", "1234PT"
+    - Prefix with space: "SP 1234", "PW 1234", "PT 1234"
+    - Prefix without space: "SP1234", "PW1234", "PT1234"
+    
     Args:
-        employee_id: Employee ID string (e.g., "1234", "1234 SP", "1234 PW", "1234 PT")
+        employee_id: Employee ID string in any of the above formats
         
     Returns:
         Tuple of (base_employee_id, work_type)
@@ -46,23 +52,21 @@ def parse_employee_id_for_work_type(employee_id: str) -> Tuple[str, str]:
     
     employee_id_clean = str(employee_id).strip().upper()
     
-    # Check for SP (Special Project)
-    sp_pattern = r'^(\d+)\s*SP$'
-    sp_match = re.match(sp_pattern, employee_id_clean)
-    if sp_match:
-        return sp_match.group(1), 'SP'
+    # Define work type codes
+    work_type_codes = ['SP', 'PW', 'PT']
     
-    # Check for PW (Periodic Work)
-    pw_pattern = r'^(\d+)\s*PW$'
-    pw_match = re.match(pw_pattern, employee_id_clean)
-    if pw_match:
-        return pw_match.group(1), 'PW'
-    
-    # Check for PT (Part-Time)
-    pt_pattern = r'^(\d+)\s*PT$'
-    pt_match = re.match(pt_pattern, employee_id_clean)
-    if pt_match:
-        return pt_match.group(1), 'PT'
+    for work_type in work_type_codes:
+        # Pattern 1: Suffix with optional space - "1234 SP" or "1234SP"
+        suffix_pattern = rf'^(\d+)\s*{work_type}$'
+        suffix_match = re.match(suffix_pattern, employee_id_clean)
+        if suffix_match:
+            return suffix_match.group(1), work_type
+        
+        # Pattern 2: Prefix with optional space - "SP 1234" or "SP1234"
+        prefix_pattern = rf'^{work_type}\s*(\d+)$'
+        prefix_match = re.match(prefix_pattern, employee_id_clean)
+        if prefix_match:
+            return prefix_match.group(1), work_type
     
     # Default to regular work
     return employee_id_clean, 'regular'