340 lines
14 KiB
Python
340 lines
14 KiB
Python
from flask_sqlalchemy import SQLAlchemy
|
|
from datetime import datetime
|
|
from sqlalchemy import CheckConstraint, Enum
|
|
from typing import Optional, Dict, Any
|
|
|
|
db = SQLAlchemy()
|
|
|
|
|
|
class GradingCalculator:
|
|
"""
|
|
Calculateur unifié pour tous types de notation utilisant le Pattern Strategy.
|
|
Version simplifiée après suppression des feature flags.
|
|
"""
|
|
|
|
@staticmethod
|
|
def calculate_score(grade_value: str, grading_type: str, max_points: float) -> Optional[float]:
|
|
"""
|
|
Point d'entrée unifié pour tous les calculs de score.
|
|
|
|
Args:
|
|
grade_value: Valeur de la note (ex: '15.5', '2', '.', 'd')
|
|
grading_type: Type de notation ('notes' ou 'score')
|
|
max_points: Points maximum de l'élément de notation
|
|
|
|
Returns:
|
|
Score calculé ou None pour les valeurs dispensées
|
|
"""
|
|
from services.assessment_services import UnifiedGradingCalculator
|
|
from providers.concrete_providers import ConfigManagerProvider
|
|
|
|
# Injection de dépendances pour éviter les imports circulaires
|
|
config_provider = ConfigManagerProvider()
|
|
unified_calculator = UnifiedGradingCalculator(config_provider)
|
|
|
|
return unified_calculator.calculate_score(grade_value, grading_type, max_points)
|
|
|
|
@staticmethod
|
|
def is_counted_in_total(grade_value: str, grading_type: str) -> bool:
|
|
"""
|
|
Détermine si une note doit être comptée dans le total.
|
|
|
|
Returns:
|
|
True si la note compte dans le total, False sinon (ex: dispensé)
|
|
"""
|
|
from services.assessment_services import UnifiedGradingCalculator
|
|
from providers.concrete_providers import ConfigManagerProvider
|
|
|
|
# Injection de dépendances pour éviter les imports circulaires
|
|
config_provider = ConfigManagerProvider()
|
|
unified_calculator = UnifiedGradingCalculator(config_provider)
|
|
|
|
return unified_calculator.is_counted_in_total(grade_value)
|
|
|
|
|
|
class ClassGroup(db.Model):
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
name = db.Column(db.String(100), nullable=False, unique=True)
|
|
description = db.Column(db.Text)
|
|
year = db.Column(db.String(20), nullable=False)
|
|
students = db.relationship('Student', backref='class_group', lazy=True)
|
|
assessments = db.relationship('Assessment', backref='class_group', lazy=True)
|
|
|
|
def get_trimester_statistics(self, trimester=None):
|
|
"""
|
|
Adapter vers ClassStatisticsService pour maintenir la compatibilité API.
|
|
|
|
Args:
|
|
trimester: Trimestre à filtrer (1, 2, 3) ou None pour toutes les évaluations
|
|
|
|
Returns:
|
|
Dict avec nombre total, répartition par statut (terminées/en cours/non commencées)
|
|
"""
|
|
from providers.concrete_providers import AssessmentServicesFactory
|
|
|
|
class_services = AssessmentServicesFactory.create_class_services_facade()
|
|
return class_services.get_trimester_statistics(self, trimester)
|
|
|
|
def get_domain_analysis(self, trimester=None):
|
|
"""
|
|
Adapter vers ClassAnalysisService pour maintenir la compatibilité API.
|
|
|
|
Args:
|
|
trimester: Trimestre à filtrer (1, 2, 3) ou None pour toutes les évaluations
|
|
|
|
Returns:
|
|
Dict avec liste des domaines, points totaux et nombre d'éléments par domaine
|
|
"""
|
|
from providers.concrete_providers import AssessmentServicesFactory
|
|
|
|
class_services = AssessmentServicesFactory.create_class_services_facade()
|
|
return class_services.get_domain_analysis(self, trimester)
|
|
|
|
def get_competence_analysis(self, trimester=None):
|
|
"""
|
|
Adapter vers ClassAnalysisService pour maintenir la compatibilité API.
|
|
|
|
Args:
|
|
trimester: Trimestre à filtrer (1, 2, 3) ou None pour toutes les évaluations
|
|
|
|
Returns:
|
|
Dict avec liste des compétences, points totaux et nombre d'éléments par compétence
|
|
"""
|
|
from providers.concrete_providers import AssessmentServicesFactory
|
|
|
|
class_services = AssessmentServicesFactory.create_class_services_facade()
|
|
return class_services.get_competence_analysis(self, trimester)
|
|
|
|
def get_class_results(self, trimester=None):
|
|
"""
|
|
Adapter vers ClassStatisticsService pour maintenir la compatibilité API.
|
|
|
|
Args:
|
|
trimester: Trimestre à filtrer (1, 2, 3) ou None pour toutes les évaluations
|
|
|
|
Returns:
|
|
Dict avec moyennes, distribution des notes et métriques statistiques
|
|
"""
|
|
from providers.concrete_providers import AssessmentServicesFactory
|
|
|
|
class_services = AssessmentServicesFactory.create_class_services_facade()
|
|
return class_services.get_class_results(self, trimester)
|
|
|
|
def __repr__(self):
|
|
return f'<ClassGroup {self.name}>'
|
|
|
|
class Student(db.Model):
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
last_name = db.Column(db.String(100), nullable=False)
|
|
first_name = db.Column(db.String(100), nullable=False)
|
|
email = db.Column(db.String(120), unique=True)
|
|
class_group_id = db.Column(db.Integer, db.ForeignKey('class_group.id'), nullable=False)
|
|
grades = db.relationship('Grade', backref='student', lazy=True)
|
|
|
|
def __repr__(self):
|
|
return f'<Student {self.first_name} {self.last_name}>'
|
|
|
|
@property
|
|
def full_name(self):
|
|
return f"{self.first_name} {self.last_name}"
|
|
|
|
class Assessment(db.Model):
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
title = db.Column(db.String(200), nullable=False)
|
|
description = db.Column(db.Text)
|
|
date = db.Column(db.Date, nullable=False, default=datetime.utcnow)
|
|
trimester = db.Column(db.Integer, nullable=False) # 1, 2, ou 3
|
|
class_group_id = db.Column(db.Integer, db.ForeignKey('class_group.id'), nullable=False)
|
|
coefficient = db.Column(db.Float, default=1.0) # Garder Float pour compatibilité
|
|
exercises = db.relationship('Exercise', backref='assessment', lazy=True, cascade='all, delete-orphan')
|
|
|
|
__table_args__ = (
|
|
CheckConstraint('trimester IN (1, 2, 3)', name='check_trimester_valid'),
|
|
)
|
|
|
|
def __repr__(self):
|
|
return f'<Assessment {self.title}>'
|
|
|
|
@property
|
|
def grading_progress(self):
|
|
"""
|
|
Calcule le pourcentage de progression des notes saisies pour cette évaluation.
|
|
Utilise AssessmentProgressService avec injection de dépendances.
|
|
|
|
Returns:
|
|
Dict avec les statistiques de progression
|
|
"""
|
|
from providers.concrete_providers import AssessmentServicesFactory
|
|
|
|
# Injection de dépendances pour éviter les imports circulaires
|
|
services_facade = AssessmentServicesFactory.create_facade()
|
|
progress_result = services_facade.get_grading_progress(self)
|
|
|
|
# Conversion du ProgressResult vers le format dict attendu
|
|
return {
|
|
'percentage': progress_result.percentage,
|
|
'completed': progress_result.completed,
|
|
'total': progress_result.total,
|
|
'status': progress_result.status,
|
|
'students_count': progress_result.students_count
|
|
}
|
|
|
|
def calculate_student_scores(self, grade_repo=None):
|
|
"""Calcule les scores de tous les élèves pour cette évaluation.
|
|
Retourne un dictionnaire avec les scores par élève et par exercice.
|
|
Utilise StudentScoreCalculator avec injection de dépendances.
|
|
|
|
Args:
|
|
grade_repo: Repository des notes (optionnel, maintenu pour compatibilité)
|
|
"""
|
|
from providers.concrete_providers import AssessmentServicesFactory
|
|
|
|
services = AssessmentServicesFactory.create_facade()
|
|
students_scores_data, exercise_scores_data = services.score_calculator.calculate_student_scores(self)
|
|
|
|
# Conversion vers format legacy pour compatibilité
|
|
students_scores = {}
|
|
exercise_scores = {}
|
|
|
|
for student_id, score_data in students_scores_data.items():
|
|
# Récupérer l'objet étudiant pour compatibilité
|
|
student_obj = next(s for s in self.class_group.students if s.id == student_id)
|
|
students_scores[student_id] = {
|
|
'student': student_obj,
|
|
'total_score': score_data.total_score,
|
|
'total_max_points': score_data.total_max_points,
|
|
'exercises': score_data.exercises
|
|
}
|
|
|
|
for exercise_id, student_scores in exercise_scores_data.items():
|
|
exercise_scores[exercise_id] = dict(student_scores)
|
|
|
|
return students_scores, exercise_scores
|
|
|
|
def get_assessment_statistics(self):
|
|
"""
|
|
Calcule les statistiques descriptives pour cette évaluation.
|
|
Utilise AssessmentStatisticsService avec injection de dépendances.
|
|
"""
|
|
from providers.concrete_providers import AssessmentServicesFactory
|
|
services = AssessmentServicesFactory.create_facade()
|
|
result = services.statistics_service.get_assessment_statistics(self)
|
|
|
|
# Conversion du StatisticsResult vers le format dict legacy
|
|
return {
|
|
'count': result.count,
|
|
'mean': result.mean,
|
|
'median': result.median,
|
|
'min': result.min,
|
|
'max': result.max,
|
|
'std_dev': result.std_dev
|
|
}
|
|
|
|
def get_total_max_points(self):
|
|
"""Calcule le total des points maximum pour cette évaluation."""
|
|
total = 0
|
|
for exercise in self.exercises:
|
|
for element in exercise.grading_elements:
|
|
# Logique simplifiée avec 2 types : notes et score
|
|
total += element.max_points
|
|
return total
|
|
|
|
class Exercise(db.Model):
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
assessment_id = db.Column(db.Integer, db.ForeignKey('assessment.id'), nullable=False)
|
|
title = db.Column(db.String(200), nullable=False)
|
|
description = db.Column(db.Text)
|
|
order = db.Column(db.Integer, default=1)
|
|
grading_elements = db.relationship('GradingElement', backref='exercise', lazy=True, cascade='all, delete-orphan')
|
|
|
|
def __repr__(self):
|
|
return f'<Exercise {self.title}>'
|
|
|
|
class GradingElement(db.Model):
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
exercise_id = db.Column(db.Integer, db.ForeignKey('exercise.id'), nullable=False)
|
|
label = db.Column(db.String(200), nullable=False)
|
|
description = db.Column(db.Text)
|
|
skill = db.Column(db.String(200))
|
|
max_points = db.Column(db.Float, nullable=False) # Garder Float pour compatibilité
|
|
# NOUVEAU : Types enum directement
|
|
grading_type = db.Column(Enum('notes', 'score', name='grading_types'), nullable=False, default='notes')
|
|
# Ajout du champ domain_id
|
|
domain_id = db.Column(db.Integer, db.ForeignKey('domains.id'), nullable=True) # Optionnel
|
|
grades = db.relationship('Grade', backref='grading_element', lazy=True, cascade='all, delete-orphan')
|
|
|
|
def __repr__(self):
|
|
return f'<GradingElement {self.label}>'
|
|
|
|
class Grade(db.Model):
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
student_id = db.Column(db.Integer, db.ForeignKey('student.id'), nullable=False)
|
|
grading_element_id = db.Column(db.Integer, db.ForeignKey('grading_element.id'), nullable=False)
|
|
value = db.Column(db.String(10)) # Garder l'ancien format pour compatibilité
|
|
comment = db.Column(db.Text)
|
|
|
|
|
|
def __repr__(self):
|
|
return f'<Grade {self.value} for {self.student.first_name if self.student else "Unknown"}>'
|
|
|
|
# Configuration tables
|
|
|
|
class AppConfig(db.Model):
|
|
"""Configuration simple de l'application (clé-valeur)."""
|
|
__tablename__ = 'app_config'
|
|
|
|
key = db.Column(db.String(100), primary_key=True)
|
|
value = db.Column(db.Text, nullable=False)
|
|
description = db.Column(db.Text)
|
|
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
|
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
|
|
|
def __repr__(self):
|
|
return f'<AppConfig {self.key}={self.value}>'
|
|
|
|
class CompetenceScaleValue(db.Model):
|
|
"""Valeurs de l'échelle des compétences (0, 1, 2, 3, ., d, etc.)."""
|
|
__tablename__ = 'competence_scale_values'
|
|
|
|
value = db.Column(db.String(10), primary_key=True) # '0', '1', '2', '3', '.', 'd', etc.
|
|
label = db.Column(db.String(100), nullable=False)
|
|
color = db.Column(db.String(7), nullable=False) # Format #RRGGBB
|
|
included_in_total = db.Column(db.Boolean, default=True, nullable=False)
|
|
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
|
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
|
|
|
def __repr__(self):
|
|
return f'<CompetenceScaleValue {self.value}: {self.label}>'
|
|
|
|
class Competence(db.Model):
|
|
"""Liste des compétences (Calculer, Raisonner, etc.)."""
|
|
__tablename__ = 'competences'
|
|
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
name = db.Column(db.String(100), unique=True, nullable=False)
|
|
color = db.Column(db.String(7), nullable=False) # Format #RRGGBB
|
|
icon = db.Column(db.String(50), nullable=False)
|
|
order_index = db.Column(db.Integer, default=0) # Pour l'ordre d'affichage
|
|
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
|
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
|
|
|
def __repr__(self):
|
|
return f'<Competence {self.name}>'
|
|
|
|
|
|
class Domain(db.Model):
|
|
"""Domaines/tags pour les éléments de notation."""
|
|
__tablename__ = 'domains'
|
|
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
name = db.Column(db.String(100), unique=True, nullable=False)
|
|
color = db.Column(db.String(7), nullable=False, default='#6B7280') # Format #RRGGBB
|
|
description = db.Column(db.Text)
|
|
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
|
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
|
|
|
# Relation inverse
|
|
grading_elements = db.relationship('GradingElement', backref='domain', lazy=True)
|
|
|
|
def __repr__(self):
|
|
return f'<Domain {self.name}>' |