WIP competence feature: server fix competence check endpoint, client get rid of expansion tiles, implement TODOs, bug fixes

Author: dabblingwithcode

school_data_hub_client/lib/src/protocol/client.dart

@@ -971,6 +971,8 @@ class EndpointCompetenceCheck extends _i1.EndpointRef {
     String? comment,
     required double valueFactor,
     required String createdBy,
+    String? groupCheckId,
+    String? groupCheckName,
   }) =>
       caller.callServerEndpoint<_i7.PupilData>(
         'competenceCheck',
@@ -982,6 +984,8 @@ class EndpointCompetenceCheck extends _i1.EndpointRef {
           'comment': comment,
           'valueFactor': valueFactor,
           'createdBy': createdBy,
+          'groupCheckId': groupCheckId,
+          'groupCheckName': groupCheckName,
         },
       );
 

school_data_hub_flutter/lib/features/learning/data/competence_check_api_service.dart

@@ -1,10 +1,10 @@
 import 'dart:io';
 
+import 'package:flutter_it/flutter_it.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/common/data/file_upload_service.dart';
 import 'package:school_data_hub_flutter/common/models/enums.dart';
 import 'package:school_data_hub_flutter/core/client/client_helper.dart';
-import 'package:flutter_it/flutter_it.dart';
 
 class CompetenceCheckApiService {
   Client get _client => di<Client>();
@@ -15,15 +15,21 @@ class CompetenceCheckApiService {
     required int pupilId,
     required String createdBy,
     String? comment,
+    int? score,
+    double? valueFactor,
+    String? groupCheckId,
+    String? groupCheckName,
   }) async {
     final PupilData? pupil = await ClientHelper.apiCall(
       call: () => _client.competenceCheck.postCompetenceCheck(
         competenceId: competenceId,
         pupilId: pupilId,
-        score: 0,
-        valueFactor: 1,
+        score: score ?? 0,
+        valueFactor: valueFactor ?? 1,
         comment: comment,
         createdBy: createdBy,
+        groupCheckId: groupCheckId,
+        groupCheckName: groupCheckName,
       ),
     );
     return pupil;

school_data_hub_flutter/lib/features/learning/domain/competence_manager.dart

@@ -269,6 +269,10 @@ class CompetenceManager {
           pupilId: pupilId,
           competenceId: competenceId,
           createdBy: createdBy!,
+          comment: competenceComment,
+          score: score,
+          valueFactor: 1,
+          groupCheckId: groupId,
         );
     if (updatedPupilData == null) {
       return;
@@ -283,6 +287,60 @@ class CompetenceManager {
     return;
   }
 
+  Future<void> postCompetenceCheckWithFile({
+    required int pupilId,
+    required int competenceId,
+    required int score,
+    required String? competenceComment,
+    required String? groupId,
+    required File file,
+  }) async {
+    final createdBy = di<HubSessionManager>().userName;
+    
+    // First, create the competence check
+    final PupilData? updatedPupilData = await _competenceCheckApiService
+        .postCompetenceCheck(
+          pupilId: pupilId,
+          competenceId: competenceId,
+          createdBy: createdBy!,
+          comment: competenceComment,
+          score: score,
+          valueFactor: 1,
+          groupCheckId: groupId,
+        );
+    
+    if (updatedPupilData == null) {
+      return;
+    }
+    
+    // Find the newly created competence check
+    final newCheck = updatedPupilData.competenceChecks
+        ?.where((check) => check.competenceId == competenceId)
+        .lastOrNull;
+    
+    if (newCheck == null) {
+      _notificationService.showSnackBar(
+        NotificationType.error,
+        'Fehler beim Erstellen des Kompetenzchecks',
+      );
+      return;
+    }
+    
+    // Encrypt and add the file
+    final File encryptedFile = await customEncrypter.encryptFile(file);
+    final PupilData updatedPupilDataWithFile = await _competenceCheckApiService
+        .addFileToCompetenceCheck(newCheck.checkId, encryptedFile, createdBy);
+    
+    di<PupilProxyManager>().updatePupilProxyWithPupilData(updatedPupilDataWithFile);
+
+    _notificationService.showSnackBar(
+      NotificationType.success,
+      'Kompetenzcheck mit Datei erstellt',
+    );
+
+    return;
+  }
+
   Future<void> postCompetenceGoal({
     required int pupilId,
     required int competenceId,

school_data_hub_flutter/lib/features/learning/presentation/multi_pupil_competence_check_page/widgets/multi_pupil_competence_check_card.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_it/flutter_it.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
@@ -16,7 +17,6 @@ import 'package:school_data_hub_flutter/features/learning/domain/competence_mana
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/avatar.dart';
-import 'package:flutter_it/flutter_it.dart';
 
 class MultiPupilCompetenceCheckCard extends WatchingWidget {
   final String groupId;
@@ -141,7 +141,7 @@ class MultiPupilCompetenceCheckCard extends WatchingWidget {
                                   }
                                   await di<CompetenceManager>()
                                       .postCompetenceCheck(
-                                        pupilId: pupil.internalId,
+                                        pupilId: pupil.pupilId,
                                         competenceId: competenceId,
                                         competenceComment: '',
                                         groupId: groupId,
@@ -248,15 +248,15 @@ class MultiPupilCompetenceCheckCard extends WatchingWidget {
                                       await createAndCropImageFile(context);
 
                                   if (file == null) return;
-                                  // TODO: Uncomment this when postCompetenceCheckWithFile is implemented
-                                  // await di<CompetenceManager>()
-                                  //     .postCompetenceCheckWithFile(
-                                  //         pupilId: pupil.internalId,
-                                  //         competenceId: competenceId,
-                                  //         competenceComment: '',
-                                  //         groupId: groupId,
-                                  //         competenceStatus: 0,
-                                  //         file: file);
+                                  await di<CompetenceManager>()
+                                      .postCompetenceCheckWithFile(
+                                        pupilId: pupil.pupilId,
+                                        competenceId: competenceId,
+                                        competenceComment: '',
+                                        groupId: groupId,
+                                        score: 0,
+                                        file: file,
+                                      );
                                 },
                                 child: SizedBox(
                                   height: 70,