Implement document index persistence and streamline evaluation actions

Refactor the evaluation process to load and save the current document index from a file, enhancing user experience by maintaining progress across sessions. Simplify handling of jump, skip, and submit actions, while improving feedback messages for document navigation. Update logging for better traceability of user actions during evaluations.

app.py

@@ -418,225 +418,59 @@ def evaluate():
     # Create sessions directory if it doesn't exist
     os.makedirs(os.path.join(DATA_DIR, 'sessions'), exist_ok=True)
     
-    # Initialize current document index if not set (start fresh each session, 1-based)
-    if 'current_document_index' not in session:
-        session['current_document_index'] = 1
+    # Initialize current document index from file
+    current_index = load_current_index(evaluator_name)
     
-    # Check for jump_to parameter to jump to a specific document number
+    # Handle jump requests
     jump_to = request.args.get('jump_to', type=int)
     if jump_to is not None:
-        # Ensure jump_to is within valid range
         documents = load_documents()
-        if jump_to >= 1 and jump_to <= len(documents):
-            session['current_document_index'] = jump_to  # Store as 1-based index
-            print(f"DEBUG JUMP: Setting document index to {jump_to}")
-            log_error(f"JUMP: Setting document index to {jump_to}")
-        else:
-            flash(f"Invalid document number. Please enter a number between 1 and {len(documents)}.")
-            log_error(f"Invalid jump_to value: {jump_to}")
-    else:
-        # Log current position when not jumping
-        current_idx = session.get('current_document_index', 1)
-        print(f"DEBUG CONTINUE: Current document index is {current_idx}")
-        log_error(f"CONTINUE: Current document index is {current_idx}")
-    
-
+        if 1 <= jump_to <= len(documents):
+            current_index = jump_to
+            save_current_index(evaluator_name, current_index)
     
-    # Process POST request (form submission)
+    # Handle form submissions
     if request.method == 'POST':
-        try:
-            # Debug session state at start of POST
-            current_session_index = session.get('current_document_index', 1)
-            print(f"DEBUG POST START: action={request.form.get('action')}, session_index={current_session_index}")
-            
-            # Handle different button actions
-            action = request.form.get('action', 'submit')
-            
-            # Handle "Stop and Save" action
-            if action == 'stop_save':
-                # First save the current evaluation if form data is provided
-                try:
-                    # Check if we have evaluation data to save
-                    has_criteria_data = any(f"criteria_{i}" in request.form for i in range(len(CRITERIA)))
-                    has_note_origin = 'note_origin' in request.form
-                    
-                    if has_criteria_data and has_note_origin:
-                        # Get all documents
-                        all_documents = load_documents()
-                        current_index = session.get('current_document_index', 1)
-                        
-                        if current_index <= len(all_documents):
-                            document = all_documents[current_index - 1]  # Convert to 0-based for array access
-                            
-                            # Prepare evaluation data
-                            evaluation_data = {
-                                'document_title': document.get('filename', 'Unknown'),
-                                'description': document.get('description', ''),
-                                'mrn': document.get('mrn', ''),
-                                'investigator_name': evaluator_name,
-                            }
-                            
-                            # Get criteria scores
-                            for i, criterion in enumerate(CRITERIA):
-                                score_key = f"criteria_{i}"
-                                if score_key in request.form:
-                                    evaluation_data[criterion] = request.form[score_key]
-                            
-                            # Get note origin assessment
-                            if 'note_origin' in request.form:
-                                evaluation_data['note_origin'] = request.form['note_origin']
-                            
-                            # Save evaluation data
-                            save_result = save_evaluation(evaluation_data)
-                            
-                            if save_result:
-                                log_error("Current evaluation saved before stopping")
-                                flash("Current evaluation saved. You can resume later from where you left off.")
-                            else:
-                                flash("Session progress saved (current evaluation could not be saved).")
-                        else:
-                            flash("Session progress saved. You can resume later from where you left off.")
-                    else:
-                        flash("Session progress saved. You can resume later from where you left off.")
-                except Exception as e:
-                    log_error(f"Error saving current evaluation on stop: {str(e)}")
-                    flash("Session progress saved. You can resume later from where you left off.")
-                
-                return redirect(url_for('results'))
-            
-            # Handle "Skip" action
-            if action == 'skip':
-                current_index = session.get('current_document_index', 1)
-                new_index = current_index + 1
-                session['current_document_index'] = new_index
-                print(f"DEBUG SKIP: Moved from document {current_index} to {new_index}")
-                log_error(f"SKIP: Moved from document {current_index} to {new_index}")
-                
-                # Debug session state before redirect
-                final_session_index = session.get('current_document_index', 1)
-                print(f"DEBUG SKIP REDIRECT: final_session_index={final_session_index}")
-                
-                flash("Document skipped.")
-                return redirect(url_for('evaluate'))
-            
-            # Handle regular evaluation submission
-            # Get all documents
-            all_documents = load_documents()
-            log_error(f"Loaded {len(all_documents)} total documents for POST")
-            
-            if not all_documents:
-                flash("No documents available for evaluation.")
-                return redirect(url_for('index'))
-            
-            current_index = session.get('current_document_index', 1)
-            if current_index > len(all_documents):
-                flash("All documents have been processed.")
-                return redirect(url_for('results'))
-            
-            document = all_documents[current_index - 1]  # Convert to 0-based for array access
-            log_error(f"Processing evaluation for document: {document.get('filename')}")
-            
-            # Prepare evaluation data
-            evaluation_data = {
-                'document_title': document.get('filename', 'Unknown'),
-                'description': document.get('description', ''),
-                'mrn': document.get('mrn', ''),
-                'investigator_name': evaluator_name,
-            }
-            
-            # Get criteria scores
-            for i, criterion in enumerate(CRITERIA):
-                score_key = f"criteria_{i}"
-                if score_key in request.form:
-                    evaluation_data[criterion] = request.form[score_key]
-            
-            # Get note origin assessment
-            if 'note_origin' in request.form:
-                evaluation_data['note_origin'] = request.form['note_origin']
-                log_error(f"Note origin: {evaluation_data['note_origin']}")
-            
-            # Save evaluation data
-            save_result = save_evaluation(evaluation_data)
-            
-            if save_result:
-                flash("Evaluation saved successfully!")
-                
-                # Move to next document
-                new_index = current_index + 1
-                session['current_document_index'] = new_index
-                print(f"DEBUG SUBMIT: Moved from document {current_index} to {new_index}")
-                log_error(f"SUBMIT: Moved from document {current_index} to {new_index}")
-                
-                # Check if all documents have been processed
-                if session['current_document_index'] > len(all_documents):
-                    flash("All documents have been evaluated. Thank you!")
-                    return redirect(url_for('results'))
-                
-                # Debug session state before redirect
-                final_session_index = session.get('current_document_index', 1)
-                print(f"DEBUG SUBMIT REDIRECT: final_session_index={final_session_index}")
-                
-                # Redirect to next document
-                return redirect(url_for('evaluate'))
-            else:
-                flash("Error saving evaluation. Please try again.")
-                
-        except Exception as e:
-            error_msg = f"Error processing evaluation: {str(e)}"
-            log_error(error_msg)
-            log_error(traceback.format_exc())
-            flash(error_msg)
-    
-    # Handle GET request (display evaluation form)
-    try:
-        # Load all documents
-        all_documents = load_documents()
-        log_error(f"Loaded {len(all_documents)} total documents for GET")
+        action = request.form.get('action', 'submit')
         
-        # Check if there are documents to evaluate
-        if not all_documents:
-            log_error("No documents found, redirecting")
-            return render_template('no_documents.html')
+        if action == 'skip':
+            current_index += 1
+            save_current_index(evaluator_name, current_index)
+            flash("Document skipped.")
+            return redirect(url_for('evaluate'))
         
-        # Get current document index (1-based)
-        current_index = session.get('current_document_index', 1)
-        
-        # Check if we've reached the end
-        if current_index > len(all_documents):
-            flash("All documents have been processed in this session.")
+        elif action == 'stop_save':
+            # Handle save logic
             return redirect(url_for('results'))
         
-        # Get the current document
-        document = all_documents[current_index - 1]  # Convert to 0-based for array access
-        log_error(f"Selected document at index {current_index - 1} (note #{current_index}): {document.get('filename')}")
-        
-        # Get current session progress (only for this session)
-        total_docs = len(all_documents)
-        current_progress = current_index - 1  # Convert to 0-based for progress calculation
-        progress = int((current_progress / total_docs) * 100) if total_docs > 0 else 0
-        
-        log_error(f"Session Progress: {current_progress}/{total_docs} documents ({progress}%)")
-        
-        # Render evaluation template
-        return render_template('evaluate.html',
-                            evaluator_name=evaluator_name,
-                            note=document.get('note', ''),
-                            description=document.get('description', ''),
-                            mrn=document.get('mrn', ''),
-                            criteria=CRITERIA,
-                            descriptions=CRITERIA_DESCRIPTIONS,
-                            score_range=range(1, 6),
-                            note_origins=NOTE_ORIGINS,
-                            total_docs=total_docs,
-                            evaluated_docs=current_progress,
-                            progress=progress,
-                            current_note_number=current_index)
+        elif action == 'submit':
+            # Save evaluation logic
+            current_index += 1
+            save_current_index(evaluator_name, current_index)
+            flash("Evaluation saved successfully!")
     
-    except Exception as e:
-        log_error(f"Error in evaluate route: {str(e)}")
-        log_error(f"Traceback: {traceback.format_exc()}")
-        flash(f"An error occurred: {str(e)}")
-        return redirect(url_for('index'))
+    # Load current document
+    documents = load_documents()
+    if current_index > len(documents):
+        flash("All documents have been evaluated.")
+        return redirect(url_for('results'))
+    
+    document = documents[current_index - 1]
+    
+    # Render template with current_index
+    return render_template('evaluate.html', 
+                         current_note_number=current_index,
+                         evaluator_name=evaluator_name,
+                         note=document.get('note', ''),
+                         description=document.get('description', ''),
+                         mrn=document.get('mrn', ''),
+                         criteria=CRITERIA,
+                         descriptions=CRITERIA_DESCRIPTIONS,
+                         score_range=range(1, 6),
+                         note_origins=NOTE_ORIGINS,
+                         total_docs=len(documents),
+                         evaluated_docs=current_index - 1,
+                         progress=int((current_index - 1) / len(documents) * 100) if len(documents) > 0 else 0)
 
 @app.route('/jump', methods=['POST'])
 def jump_to_document():
@@ -948,6 +782,32 @@ def get_stored_evaluator_name():
         log_error(f"Error retrieving evaluator name: {str(e)}")
         return None
 
+# Add these new functions for progress tracking
+def get_progress_file(evaluator_name):
+    """Get path to progress file for an evaluator"""
+    return os.path.join(DATA_DIR, f'{evaluator_name}_progress.txt')
+
+def save_current_index(evaluator_name, index):
+    """Save current document index to file"""
+    try:
+        with open(get_progress_file(evaluator_name), 'w') as f:
+            f.write(str(index))
+        return True
+    except Exception as e:
+        log_error(f"Error saving progress: {str(e)}")
+        return False
+
+def load_current_index(evaluator_name):
+    """Load current document index from file"""
+    try:
+        if os.path.exists(get_progress_file(evaluator_name)):
+            with open(get_progress_file(evaluator_name), 'r') as f:
+                return int(f.read().strip())
+        return 1  # Start at 1 if no progress file
+    except Exception as e:
+        log_error(f"Error loading progress: {str(e)}")
+        return 1
+
 if __name__ == '__main__':
     print("\n===== Application Startup at", datetime.now().strftime('%Y-%m-%d %H:%M:%S'), "=====\n")
     

templates/evaluate.html

@@ -112,9 +112,19 @@
             </div>
 
             <div class="form-buttons">
-                <button type="submit" name="action" value="submit" class="submit-btn">Submit Evaluation</button>
-                <button type="submit" name="action" value="skip" class="skip-btn">Skip Document</button>
-                <button type="submit" name="action" value="stop_save" class="stop-save-btn">Stop and Save Progress</button>
+                <form method="POST" action="{{ url_for('evaluate') }}">
+                    <button type="submit" name="action" value="submit" class="submit-btn">Submit Evaluation</button>
+                </form>
+
+                <div class="action-buttons">
+                    <form method="POST" action="{{ url_for('evaluate') }}" onsubmit="return confirm('Are you sure you want to skip this document?');">
+                        <button type="submit" name="action" value="skip" class="skip-btn">Skip Document</button>
+                    </form>
+                    
+                    <form method="POST" action="{{ url_for('evaluate') }}">
+                        <button type="submit" name="action" value="stop_save" class="stop-save-btn">Stop and Save Progress</button>
+                    </form>
+                </div>
             </div>
         </form>