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 @@ +
{% for duplicate in analysis.duplicates %}