rejection 2 step implementation in phase 2

components/review_dashboard_page.py

@@ -162,7 +162,7 @@ class ReviewDashboardPage:
                         log.error(f"Target annotator {target_annotator} not found in database")
                         return [], 0, f"Review Target Error: Annotator '{target_annotator}' not found.", "", "", "", "", "", "", "", gr.update(value=None, autoplay=False), gr.update(visible=False, value=""), False, gr.update(value="❌ Reject")
                     
-                    log.info(f"Found target annotator '{target_annotator}' with ID: {target_annotator_obj.id}")
+                    log.info(f"Found target annotator with ID: {target_annotator_obj.id}")
 
                     # Get all annotations by target annotator
                     annotations = db.query(Annotation).join(TTSData).filter(
@@ -174,7 +174,7 @@ class ReviewDashboardPage:
                         orm.joinedload(Annotation.annotator)
                     ).order_by(Annotation.id).all() # Added order_by for consistency
 
-                    log.info(f"Fetched {len(annotations)} annotations for target annotator ID {target_annotator_obj.id} ({target_annotator})")
+                    log.info(f"Fetched {len(annotations)} annotations for target annotator ID {target_annotator_obj.id}")
 
                     items = []
                     for annotation in annotations:
@@ -355,11 +355,17 @@ class ReviewDashboardPage:
 
         def handle_rejection_fn(items, idx, session, rejection_reason, rejection_mode_active):
             """Handle rejection button click - two-step process"""
+            if not items or idx >= len(items):
+                return items, "Error: Invalid item", gr.update(visible=False), False, gr.update(value="❌ Reject")
+                
+            current_item = items[idx]
+            current_status = current_item["validation_status"]
+            
             if not rejection_mode_active:
                 # First click - show rejection reason input and change button text
                 return (
                     items,  # items unchanged
-                    "Current Status",  # validation status unchanged
+                    current_status,  # Keep current validation status
                     gr.update(visible=True, value=""),  # Show rejection reason input, clear any existing value
                     True,  # Set rejection mode active
                     gr.update(value="⚠️ Confirm Reject")  # Change button text
@@ -370,7 +376,7 @@ class ReviewDashboardPage:
                     gr.Warning("Rejection reason cannot be empty. Please provide a reason before confirming rejection.")
                     return (
                         items,  # items unchanged
-                        "Current Status",  # validation status unchanged  
+                        current_status,  # Keep current validation status
                         gr.update(visible=True, value=rejection_reason),  # Keep input visible
                         True,  # Keep rejection mode active
                         gr.update(value="⚠️ Confirm Reject")  # Keep button text
@@ -487,8 +493,20 @@ class ReviewDashboardPage:
             inputs=[self.items_state, self.idx_state, self.rejection_mode_active],
             outputs=[self.idx_state]
         ).then(
-            fn=show_current_review_item_fn,
-            inputs=[self.items_state, self.idx_state, session_state],
+            fn=lambda items, idx, session, rejection_mode: show_current_review_item_fn(items, idx, session) if not rejection_mode else (
+                str(items[idx]["tts_id"]) if items and idx < len(items) else "",
+                items[idx]["filename"] if items and idx < len(items) else "",
+                items[idx]["sentence"] if items and idx < len(items) else "",
+                items[idx]["annotated_sentence"] if items and idx < len(items) else "",
+                items[idx]["annotated_at"] if items and idx < len(items) else "",
+                items[idx]["validation_status"] if items and idx < len(items) else "",
+                "",  # annotator placeholder
+                gr.update(value=None, autoplay=False),  # audio
+                gr.update(),  # rejection_reason_input - don't change
+                rejection_mode,  # keep rejection mode as is
+                gr.update()   # btn_reject - don't change
+            ),
+            inputs=[self.items_state, self.idx_state, session_state, self.rejection_mode_active],
             outputs=review_display_outputs
         )