Refactor document index handling in evaluation process to use 1-based indexing. Update logging for document navigation actions and ensure proper session management. Adjust form action in evaluate.html for consistency.

app.py

@@ -421,21 +421,25 @@ 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
+    
     # Check for jump_to parameter to jump to a specific document number
     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 - 1  # Convert to 0-based index
-            log_error(f"Jumping to document number: {jump_to} (index: {jump_to - 1})")
+            session['current_document_index'] = jump_to  # Store as 1-based index
+            log_error(f"JUMP: Setting document index to {jump_to} (document #{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}")
-    
-    # Initialize current document index if not set (start fresh each session)
-    if 'current_document_index' not in session:
-        session['current_document_index'] = 0
+    else:
+        # Log current position when not jumping
+        current_idx = session.get('current_document_index', 1)
+        log_error(f"CONTINUE: Current document index is {current_idx} (document #{current_idx})")
     
     # Generate session ID if not set
     if 'session_id' not in session:
@@ -458,10 +462,10 @@ def evaluate():
                     if has_criteria_data and has_note_origin:
                         # Get all documents
                         all_documents = load_documents()
-                        current_index = session.get('current_document_index', 0)
+                        current_index = session.get('current_document_index', 1)
                         
-                        if current_index < len(all_documents):
-                            document = all_documents[current_index]
+                        if current_index <= len(all_documents):
+                            document = all_documents[current_index - 1]  # Convert to 0-based for array access
                             
                             # Prepare evaluation data
                             evaluation_data = {
@@ -502,9 +506,11 @@ def evaluate():
             
             # Handle "Skip" action
             if action == 'skip':
-                session['current_document_index'] = session.get('current_document_index', 0) + 1
+                old_index = session.get('current_document_index', 1)
+                session['current_document_index'] = old_index + 1
+                log_error(f"SKIP: Moving from document {old_index} to document {session['current_document_index']}")
                 flash("Document skipped.")
-                return redirect(url_for('evaluate'))
+                return redirect(url_for('evaluate'))  # No jump_to parameter, continue from current position
             
             # Handle regular evaluation submission
             # Get all documents
@@ -515,12 +521,12 @@ def evaluate():
                 flash("No documents available for evaluation.")
                 return redirect(url_for('index'))
             
-            current_index = session.get('current_document_index', 0)
-            if current_index >= len(all_documents):
+            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]
+            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
@@ -551,13 +557,14 @@ def evaluate():
                 
                 # Move to next document
                 session['current_document_index'] = current_index + 1
+                log_error(f"SUBMIT: Moving from document {current_index} to document {session['current_document_index']}")
                 
                 # Check if all documents have been processed
-                if session['current_document_index'] >= len(all_documents):
+                if session['current_document_index'] > len(all_documents):
                     flash("All documents have been evaluated. Thank you!")
                     return redirect(url_for('results'))
                 
-                # Redirect to next document
+                # Redirect to next document (no jump_to parameter, continue from current position)
                 return redirect(url_for('evaluate'))
             else:
                 flash("Error saving evaluation. Please try again.")
@@ -579,21 +586,21 @@ def evaluate():
             log_error("No documents found, redirecting")
             return render_template('no_documents.html')
         
-        # Get current document index
-        current_index = session.get('current_document_index', 0)
+        # 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):
+        if current_index > len(all_documents):
             flash("All documents have been processed in this session.")
             return redirect(url_for('results'))
         
         # Get the current document
-        document = all_documents[current_index]
-        log_error(f"Selected document at index {current_index} (note #{current_index + 1}): {document.get('filename')}")
+        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
+        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}%)")
@@ -611,7 +618,7 @@ def evaluate():
                             total_docs=total_docs,
                             evaluated_docs=current_progress,
                             progress=progress,
-                            current_note_number=current_index + 1)
+                            current_note_number=current_index)
     
     except Exception as e:
         log_error(f"Error in evaluate route: {str(e)}")

templates/evaluate.html

@@ -77,7 +77,7 @@
             </div>
         </div>
 
-        <form method="POST">
+        <form method="POST" action="{{ url_for('evaluate') }}">
             <div class="criteria-container">
                 {% for i in range(criteria|length) %}
                 <div class="criteria-group">