Update Saqel Platform: 2026-09-12 13:38:49

apps/student_app/lib/logic/cubits/exam_cubit.dart

@@ -15,6 +15,7 @@ import 'dart:async';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import '../../data/models/exam_model.dart';
 import '../../data/repositories/app_repositories.dart';
+import '../../data/repositories/curriculum_question_bank.dart';
 
 /// الحالات العامة للامتحان
 abstract class ExamState {}
@@ -100,18 +101,51 @@ class ExamCubit extends Cubit<ExamState> {
     return super.close();
   }
 
-  Future<void> loadExam({int examId = 1, ExamModel? initialExam}) async {
+  Future<void> loadExam({
+    int examId = 1,
+    ExamModel? initialExam,
+    String? subjectCode,
+    String? unitKey,
+    String? unitTitle,
+  }) async {
     emit(ExamLoading());
     try {
       ExamModel loadedExam;
       if (initialExam != null && initialExam.questions.isNotEmpty) {
         loadedExam = initialExam;
       } else {
-        loadedExam = await _repository.getExamDetails(examId);
+        try {
+          loadedExam = await _repository.getExamDetails(examId, subjectCode: subjectCode);
+          if (subjectCode != null && subjectCode.isNotEmpty) {
+            final norm = CurriculumQuestionBank.normalizeSubjectKey(subjectCode);
+            final titleLower = loadedExam.title.toLowerCase();
+            final isCrossContaminated = (norm != 'math_10' &&
+                (titleLower.contains('معادلات') ||
+                    titleLower.contains('رياضيات') ||
+                    titleLower.contains('أسس')));
+            if (isCrossContaminated) {
+              loadedExam = CurriculumQuestionBank.getUnitExam(
+                subjectId: subjectCode,
+                unitKey: unitKey ?? 'unit_01',
+                unitTitle: unitTitle,
+              );
+            }
+          }
+        } catch (_) {
+          if (subjectCode != null && subjectCode.isNotEmpty) {
+            loadedExam = CurriculumQuestionBank.getUnitExam(
+              subjectId: subjectCode,
+              unitKey: unitKey ?? 'unit_01',
+              unitTitle: unitTitle,
+            );
+          } else {
+            rethrow;
+          }
+        }
       }
 
       if (loadedExam.questions.isEmpty) {
-        emit(ExamError('لم يتم العثور على أسئلة لهذا الامتحان في السيرفر. يرجى توليد بنك الأسئلة من لوحة المناهج.'));
+        emit(ExamError('لم يتم العثور على أسئلة لهذا الامتحان. يرجى تجربة اختبار وحدة أخرى.'));
         return;
       }
 
@@ -123,7 +157,7 @@ class ExamCubit extends Cubit<ExamState> {
 
       _startTimer();
     } catch (e) {
-      emit(ExamError('تعذر جلب الامتحان من السيرفر: ${e.toString()}'));
+      emit(ExamError('تعذر جلب الامتحان: ${e.toString()}'));
     }
   }