From 27f7e9a05279c57b2809148f3070c8860d707903 Mon Sep 17 00:00:00 2001
From: Nguyen Ngo <da.nguyen8744@gmail.com>
Date: Fri, 19 Sep 2025 13:28:33 -0400
Subject: [PATCH] Update Employee functionalities: display contract/project
 name in view details page

---
 app.py                         |  2 +-
 templates/employee_detail.html | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/app.py b/app.py
index c21063b..959cef9 100644
--- a/app.py
+++ b/app.py
@@ -6395,7 +6395,7 @@ def employee_detail(employee_index):
     """View employee details with attendance summary"""
     try:
         # Get employee by index (primary key)
-        employee = Employee.query.get_or_404(employee_index)
+        employee = Employee.query.outerjoin(Project, Employee.contractId == Project.id).filter(Employee.index == employee_index).first_or_404()
         
         # Get attendance statistics for this employee
         from models.attendance import AttendanceData
diff --git a/templates/employee_detail.html b/templates/employee_detail.html
index aeffa41..242b97f 100644
--- a/templates/employee_detail.html
+++ b/templates/employee_detail.html
@@ -359,7 +359,7 @@
             </div>
             <div class="meta-item">
               <i class="fas fa-file-contract"></i>
-              Contract ID: {{ employee.contractId }}
+              Contract: {{ employee.contract_name }}
             </div>
             {% if attendance_stats.latest_attendance %}
             <div class="meta-item">
@@ -370,16 +370,6 @@
           </div>
         </div>
       </div>
-      
-      {% if session.role == 'admin' %}
-      <div class="employee-actions">
-        <a href="{{ url_for('edit_employee', employee_index=employee.index) }}" 
-           class="btn btn-warning btn-sm">
-          <i class="fas fa-edit"></i>
-          Edit
-        </a>
-      </div>
-      {% endif %}
     </div>
 
     <div class="profile-body">
@@ -404,7 +394,7 @@
           <div class="info-value">
             <p><strong>Employee ID:</strong> {{ employee.id }}</p>
             <p><strong>Job Title:</strong> {{ employee.display_title }}</p>
-            <p><strong>Contract ID:</strong> {{ employee.contractId }}</p>
+            <p><strong>Contract ID:</strong> {{ employee.contract_name }}</p>
           </div>
         </div>