From a4c584468c8d2250d0e6c40e1fb891b6d9adca38 Mon Sep 17 00:00:00 2001
From: NguyenND <ngodanguyen@gmail.com>
Date: Fri, 31 Oct 2025 09:44:04 -0400
Subject: [PATCH] Fixed skip duplicate records review button functionality

---
 .gitignore                                      |  2 ++
 app.py                                          | 12 +++++++-----
 templates/time_attendance_duplicate_review.html |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e8fece7..60d53c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,6 +82,8 @@ target/
 profile_default/
 ipython_config.py
 
+.stignore
+
 # pyenv
 #   For a library or package, you might want to ignore these files since the code is
 #   intended to run in multiple environments; otherwise, check them in:
diff --git a/app.py b/app.py
index 31ee42c..893cfa1 100644
--- a/app.py
+++ b/app.py
@@ -6605,11 +6605,13 @@ def import_time_attendance():
         try:
             # Check if this is coming from invalid review (file is already in session)
             coming_from_invalid_review = request.form.get('from_invalid_review', 'false').lower() == 'true'
-            
+            coming_from_duplicate_review = request.form.get('from_duplicate_review', 'false').lower() == 'true'
+
             print(f"\n🔍 IMPORT FLOW DEBUG:")
             print(f"   Coming from invalid review: {coming_from_invalid_review}")
-            
-            if coming_from_invalid_review:
+            print(f"   Coming from duplicate review: {coming_from_duplicate_review}")
+
+            if coming_from_invalid_review or coming_from_duplicate_review:
                 # Retrieve file from session
                 if 'pending_import_file' not in session or 'pending_import_filename' not in session:
                     flash('Session expired. Please upload the file again.', 'error')
@@ -6678,8 +6680,8 @@ def import_time_attendance():
                 # Check if this is coming from duplicate review
                 force_import_hashes = request.form.getlist('force_import_hashes[]')
                 
-                # If analyzing for duplicates, show review page (but not if coming from invalid review)
-                if analyze_duplicates and not force_import_hashes and not coming_from_invalid_review:
+                # If analyzing for duplicates, show review page (but not if coming from invalid/duplicate review)
+                if analyze_duplicates and not force_import_hashes and not coming_from_invalid_review and not coming_from_duplicate_review:
                     print("🔍 Analyzing for duplicates...")
                     duplicate_analysis = import_service.analyze_for_duplicates(temp_path)
                     
diff --git a/templates/time_attendance_duplicate_review.html b/templates/time_attendance_duplicate_review.html
index b0abdc9..6af1fad 100644
--- a/templates/time_attendance_duplicate_review.html
+++ b/templates/time_attendance_duplicate_review.html
@@ -371,6 +371,7 @@
     <input type="hidden" name="skip_duplicates" value="true">
     <input type="hidden" name="import_source" value="Import with Duplicates - {{ filename }}">
     <input type="hidden" name="project_id" value="{{ project_id }}">
+    <input type="hidden" name="from_duplicate_review" value="true">
     
     <div class="duplicates-container">
       {% for duplicate in analysis.duplicates %}