fix: improve saving
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
from flask import Blueprint, render_template, redirect, url_for, flash, request, jsonify
|
||||
from flask import Blueprint, render_template, redirect, url_for, flash, request, jsonify, current_app
|
||||
from models import db, Assessment, Student, Grade, GradingElement, Exercise
|
||||
from app_config import config_manager
|
||||
|
||||
@@ -36,66 +36,124 @@ def assessment_grading(assessment_id):
|
||||
def save_grades(assessment_id):
|
||||
assessment = Assessment.query.get_or_404(assessment_id)
|
||||
errors = []
|
||||
saved_count = 0
|
||||
|
||||
try:
|
||||
# Traitement des notes avec protection contre les cas edge
|
||||
for key, value in request.form.items():
|
||||
if key.startswith('grade_'):
|
||||
# Parse key: grade_<student_id>_<element_id>
|
||||
parts = key.split('_')
|
||||
if len(parts) == 3:
|
||||
if len(parts) != 3:
|
||||
errors.append(f'Format de clé invalide: {key}')
|
||||
continue
|
||||
|
||||
try:
|
||||
student_id = int(parts[1])
|
||||
element_id = int(parts[2])
|
||||
|
||||
# Find or create grade
|
||||
except (ValueError, IndexError) as e:
|
||||
errors.append(f'Identifiants invalides dans {key}: {str(e)}')
|
||||
continue
|
||||
|
||||
# Protection contre les valeurs None ou vides
|
||||
if value is None:
|
||||
continue
|
||||
|
||||
# Vérifier que l'étudiant et l'élément existent avec protection
|
||||
try:
|
||||
student = Student.query.get(student_id)
|
||||
grading_element = GradingElement.query.get(element_id)
|
||||
except Exception as e:
|
||||
errors.append(f'Erreur DB pour {key}: {str(e)}')
|
||||
continue
|
||||
|
||||
if not student:
|
||||
errors.append(f'Étudiant non trouvé: {student_id}')
|
||||
continue
|
||||
|
||||
if not grading_element:
|
||||
errors.append(f'Élément de notation non trouvé: {element_id}')
|
||||
continue
|
||||
|
||||
# Find or create grade avec protection
|
||||
try:
|
||||
grade = Grade.query.filter_by(
|
||||
student_id=student_id,
|
||||
grading_element_id=element_id
|
||||
).first()
|
||||
|
||||
if value.strip(): # If value is not empty
|
||||
# Validation unifiée selon le nouveau système
|
||||
grading_element = GradingElement.query.get(element_id)
|
||||
if grading_element:
|
||||
# Passer max_points pour la validation des notes
|
||||
max_points = grading_element.max_points if grading_element.grading_type == 'notes' else None
|
||||
|
||||
# Normaliser virgule en point pour les notes avant sauvegarde
|
||||
normalized_value = value.strip()
|
||||
if grading_element.grading_type == 'notes' and ',' in normalized_value:
|
||||
normalized_value = normalized_value.replace(',', '.')
|
||||
|
||||
if config_manager.validate_grade_value(normalized_value, grading_element.grading_type, max_points):
|
||||
if not grade:
|
||||
grade = Grade(
|
||||
student_id=student_id,
|
||||
grading_element_id=element_id,
|
||||
value=normalized_value
|
||||
)
|
||||
db.session.add(grade)
|
||||
else:
|
||||
grade.value = normalized_value
|
||||
# Passer max_points pour la validation des notes
|
||||
max_points = grading_element.max_points if grading_element.grading_type == 'notes' else None
|
||||
|
||||
# Normaliser virgule en point pour les notes avant sauvegarde
|
||||
normalized_value = value.strip()
|
||||
if grading_element.grading_type == 'notes' and ',' in normalized_value:
|
||||
normalized_value = normalized_value.replace(',', '.')
|
||||
|
||||
if config_manager.validate_grade_value(normalized_value, grading_element.grading_type, max_points):
|
||||
if not grade:
|
||||
grade = Grade(
|
||||
student_id=student_id,
|
||||
grading_element_id=element_id,
|
||||
value=normalized_value
|
||||
)
|
||||
db.session.add(grade)
|
||||
else:
|
||||
errors.append(f'Valeur invalide pour {grading_element.label if grading_element else "cet élément"}: {value}')
|
||||
grade.value = normalized_value
|
||||
saved_count += 1
|
||||
else:
|
||||
errors.append(f'Élément de notation non trouvé: {element_id}')
|
||||
errors.append(f'Valeur invalide pour {grading_element.label}: "{value}"')
|
||||
elif grade: # If value is empty but grade exists, delete it
|
||||
db.session.delete(grade)
|
||||
saved_count += 1
|
||||
|
||||
except Exception as e:
|
||||
errors.append(f'Erreur traitement grade pour {key}: {str(e)}')
|
||||
continue
|
||||
|
||||
# Handle comments
|
||||
# Traitement des commentaires avec protection
|
||||
for key, value in request.form.items():
|
||||
if key.startswith('comment_'):
|
||||
parts = key.split('_')
|
||||
if len(parts) == 3:
|
||||
if len(parts) != 3:
|
||||
continue # Skip malformed keys
|
||||
|
||||
try:
|
||||
student_id = int(parts[1])
|
||||
element_id = int(parts[2])
|
||||
|
||||
except (ValueError, IndexError):
|
||||
continue # Skip invalid IDs
|
||||
|
||||
# Protection contre les valeurs None
|
||||
if value is None:
|
||||
continue
|
||||
|
||||
try:
|
||||
grade = Grade.query.filter_by(
|
||||
student_id=student_id,
|
||||
grading_element_id=element_id
|
||||
).first()
|
||||
|
||||
if grade:
|
||||
grade.comment = value.strip() if value.strip() else None
|
||||
# Créer une note avec commentaire uniquement si nécessaire
|
||||
if value.strip():
|
||||
if not grade:
|
||||
grade = Grade(
|
||||
student_id=student_id,
|
||||
grading_element_id=element_id,
|
||||
value=None,
|
||||
comment=value.strip()
|
||||
)
|
||||
db.session.add(grade)
|
||||
else:
|
||||
grade.comment = value.strip()
|
||||
elif grade:
|
||||
grade.comment = None
|
||||
|
||||
except Exception as e:
|
||||
# Log l'erreur mais ne pas faire planter la sauvegarde
|
||||
print(f"Erreur commentaire pour {key}: {str(e)}")
|
||||
continue
|
||||
|
||||
db.session.commit()
|
||||
|
||||
@@ -104,29 +162,117 @@ def save_grades(assessment_id):
|
||||
if errors:
|
||||
return jsonify({
|
||||
'success': False,
|
||||
'message': 'Certaines notes n\'ont pas pu être sauvegardées',
|
||||
'errors': errors
|
||||
})
|
||||
'message': f'Certaines notes n\'ont pas pu être sauvegardées ({len(errors)} erreurs)',
|
||||
'errors': errors,
|
||||
'saved_count': saved_count
|
||||
}), 400
|
||||
else:
|
||||
return jsonify({
|
||||
'success': True,
|
||||
'message': 'Notes sauvegardées avec succès !'
|
||||
'message': f'{saved_count} notes sauvegardées avec succès !',
|
||||
'saved_count': saved_count
|
||||
})
|
||||
else:
|
||||
# Traditional form submission
|
||||
if errors:
|
||||
for error in errors:
|
||||
flash(error, 'warning')
|
||||
flash('Notes sauvegardées avec succès !', 'success')
|
||||
flash(f'{saved_count} notes sauvegardées avec succès !', 'success')
|
||||
return redirect(url_for('grading.assessment_grading', assessment_id=assessment_id))
|
||||
|
||||
except Exception as e:
|
||||
import traceback
|
||||
db.session.rollback()
|
||||
|
||||
# Log détaillé de l'erreur
|
||||
error_details = traceback.format_exc()
|
||||
print(f"=== ERREUR SAUVEGARDE ASSESSMENT {assessment_id} ===")
|
||||
print(f"Exception: {type(e).__name__}: {str(e)}")
|
||||
print(f"Traceback:\n{error_details}")
|
||||
print("=" * 50)
|
||||
|
||||
error_msg = f'Erreur lors de la sauvegarde: {str(e)}'
|
||||
|
||||
if request.headers.get('X-Requested-With') == 'XMLHttpRequest':
|
||||
return jsonify({
|
||||
'success': False,
|
||||
'message': f'Erreur lors de la sauvegarde: {str(e)}'
|
||||
'message': error_msg,
|
||||
'saved_count': 0,
|
||||
'debug': error_details if current_app.debug else None
|
||||
}), 500
|
||||
else:
|
||||
flash(f'Erreur lors de la sauvegarde: {str(e)}', 'error')
|
||||
return redirect(url_for('grading.assessment_grading', assessment_id=assessment_id))
|
||||
flash(error_msg, 'error')
|
||||
return redirect(url_for('grading.assessment_grading', assessment_id=assessment_id))
|
||||
|
||||
|
||||
@bp.route('/assessments/<int:assessment_id>/grading/save-single', methods=['POST'])
|
||||
def save_single_grade(assessment_id):
|
||||
"""Sauvegarde incrémentale d'une seule note"""
|
||||
assessment = Assessment.query.get_or_404(assessment_id)
|
||||
|
||||
try:
|
||||
data = request.get_json()
|
||||
student_id = int(data.get('student_id'))
|
||||
element_id = int(data.get('element_id'))
|
||||
value = data.get('value', '').strip()
|
||||
comment = data.get('comment', '').strip()
|
||||
|
||||
# Vérifications
|
||||
student = Student.query.get(student_id)
|
||||
grading_element = GradingElement.query.get(element_id)
|
||||
|
||||
if not student or not grading_element:
|
||||
return jsonify({
|
||||
'success': False,
|
||||
'message': 'Étudiant ou élément de notation non trouvé'
|
||||
}), 404
|
||||
|
||||
# Find or create grade
|
||||
grade = Grade.query.filter_by(
|
||||
student_id=student_id,
|
||||
grading_element_id=element_id
|
||||
).first()
|
||||
|
||||
if value:
|
||||
# Validation
|
||||
max_points = grading_element.max_points if grading_element.grading_type == 'notes' else None
|
||||
normalized_value = value.replace(',', '.') if grading_element.grading_type == 'notes' else value
|
||||
|
||||
if not config_manager.validate_grade_value(normalized_value, grading_element.grading_type, max_points):
|
||||
return jsonify({
|
||||
'success': False,
|
||||
'message': f'Valeur invalide: "{value}"'
|
||||
}), 400
|
||||
|
||||
if not grade:
|
||||
grade = Grade(
|
||||
student_id=student_id,
|
||||
grading_element_id=element_id,
|
||||
value=normalized_value,
|
||||
comment=comment if comment else None
|
||||
)
|
||||
db.session.add(grade)
|
||||
else:
|
||||
grade.value = normalized_value
|
||||
grade.comment = comment if comment else None
|
||||
elif grade:
|
||||
# Supprimer si valeur vide
|
||||
if comment:
|
||||
grade.value = None
|
||||
grade.comment = comment
|
||||
else:
|
||||
db.session.delete(grade)
|
||||
|
||||
db.session.commit()
|
||||
|
||||
return jsonify({
|
||||
'success': True,
|
||||
'message': 'Note sauvegardée'
|
||||
})
|
||||
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
return jsonify({
|
||||
'success': False,
|
||||
'message': f'Erreur: {str(e)}'
|
||||
}), 500
|
||||
Reference in New Issue
Block a user