04/28 Updated sprint 4 & 5

routes/time_attendance.py

@@ -9,7 +9,7 @@ Routes: /time-attendance, /time-attendance/import/*,
         /time-attendance/record/<id>, /time-attendance/delete/<id>,
         /api/time-attendance/*
 """
-from flask import Blueprint, render_template, request, redirect, flash, session, jsonify, send_file, Response, g, current_app, url_for
+from flask import abort, Blueprint, render_template, request, redirect, flash, session, jsonify, send_file, Response, g, current_app, url_for
 from datetime import datetime, date, timedelta, time
 import io, os, json, re, uuid, traceback
 import time as _time
@@ -1570,7 +1570,9 @@ def time_attendance_records():
 def time_attendance_record_detail(record_id):
     """Display detailed view of a time attendance record"""
     try:
-        record = TimeAttendance.query.get_or_404(record_id)
+        record = db.session.get(TimeAttendance, record_id)
+        if record is None:
+            abort(404)
         return render_template('time_attendance_record_detail.html', record=record)
         
     except Exception as e:
@@ -1584,7 +1586,9 @@ def time_attendance_record_detail(record_id):
 def delete_time_attendance_record(record_id):
     """Delete a time attendance record"""
     try:
-        record = TimeAttendance.query.get_or_404(record_id)
+        record = db.session.get(TimeAttendance, record_id)
+        if record is None:
+            abort(404)
         
         # Store record info for logging
         employee_info = f"{record.employee_name} (ID: {record.employee_id})"