added new pupil identity fields (WIP), fixed automatic uml svg generation in the assets folder

Author: dabblingwithcode

docs/model_relations/school_data_hub_server.svg

@@ -20,10 +20,12 @@ abstract class PupilIdentity implements _i1.SerializableModel {
     required this.lastName,
     required this.group,
     required this.groupTutor,
+    this.deputyGroupTutor,
     required this.schoolGrade,
     this.specialNeeds,
     required this.gender,
     required this.language,
+    this.nationality,
     this.family,
     required this.birthday,
     this.migrationSupportEnds,
@@ -34,6 +36,7 @@ abstract class PupilIdentity implements _i1.SerializableModel {
     this.religionLessonsCancelledAt,
     this.familyLanguageLessonsSince,
     this.leavingDate,
+    this.schoolTransitionRecommendation,
   });
 
   factory PupilIdentity({
@@ -42,10 +45,12 @@ abstract class PupilIdentity implements _i1.SerializableModel {
     required String lastName,
     required String group,
     required String groupTutor,
+    String? deputyGroupTutor,
     required _i2.SchoolGrade schoolGrade,
-    String? specialNeeds,
+    List<String>? specialNeeds,
     required String gender,
     required String language,
+    String? nationality,
     String? family,
     required DateTime birthday,
     DateTime? migrationSupportEnds,
@@ -56,6 +61,7 @@ abstract class PupilIdentity implements _i1.SerializableModel {
     DateTime? religionLessonsCancelledAt,
     DateTime? familyLanguageLessonsSince,
     DateTime? leavingDate,
+    String? schoolTransitionRecommendation,
   }) = _PupilIdentityImpl;
 
   factory PupilIdentity.fromJson(Map<String, dynamic> jsonSerialization) {
@@ -65,11 +71,15 @@ abstract class PupilIdentity implements _i1.SerializableModel {
       lastName: jsonSerialization['lastName'] as String,
       group: jsonSerialization['group'] as String,
       groupTutor: jsonSerialization['groupTutor'] as String,
+      deputyGroupTutor: jsonSerialization['deputyGroupTutor'] as String?,
       schoolGrade: _i2.SchoolGrade.fromJson(
           (jsonSerialization['schoolGrade'] as String)),
-      specialNeeds: jsonSerialization['specialNeeds'] as String?,
+      specialNeeds: (jsonSerialization['specialNeeds'] as List?)
+          ?.map((e) => e as String)
+          .toList(),
       gender: jsonSerialization['gender'] as String,
       language: jsonSerialization['language'] as String,
+      nationality: jsonSerialization['nationality'] as String?,
       family: jsonSerialization['family'] as String?,
       birthday:
           _i1.DateTimeJsonExtension.fromJson(jsonSerialization['birthday']),
@@ -99,6 +109,8 @@ abstract class PupilIdentity implements _i1.SerializableModel {
           ? null
           : _i1.DateTimeJsonExtension.fromJson(
               jsonSerialization['leavingDate']),
+      schoolTransitionRecommendation:
+          jsonSerialization['schoolTransitionRecommendation'] as String?,
     );
   }
 
@@ -112,14 +124,18 @@ abstract class PupilIdentity implements _i1.SerializableModel {
 
   String groupTutor;
 
+  String? deputyGroupTutor;
+
   _i2.SchoolGrade schoolGrade;
 
-  String? specialNeeds;
+  List<String>? specialNeeds;
 
   String gender;
 
   String language;
 
+  String? nationality;
+
   String? family;
 
   DateTime birthday;
@@ -140,6 +156,8 @@ abstract class PupilIdentity implements _i1.SerializableModel {
 
   DateTime? leavingDate;
 
+  String? schoolTransitionRecommendation;
+
   /// Returns a shallow copy of this [PupilIdentity]
   /// with some or all fields replaced by the given arguments.
   @_i1.useResult
@@ -149,10 +167,12 @@ abstract class PupilIdentity implements _i1.SerializableModel {
     String? lastName,
     String? group,
     String? groupTutor,
+    String? deputyGroupTutor,
     _i2.SchoolGrade? schoolGrade,
-    String? specialNeeds,
+    List<String>? specialNeeds,
     String? gender,
     String? language,
+    String? nationality,
     String? family,
     DateTime? birthday,
     DateTime? migrationSupportEnds,
@@ -163,6 +183,7 @@ abstract class PupilIdentity implements _i1.SerializableModel {
     DateTime? religionLessonsCancelledAt,
     DateTime? familyLanguageLessonsSince,
     DateTime? leavingDate,
+    String? schoolTransitionRecommendation,
   });
   @override
   Map<String, dynamic> toJson() {
@@ -172,10 +193,12 @@ abstract class PupilIdentity implements _i1.SerializableModel {
       'lastName': lastName,
       'group': group,
       'groupTutor': groupTutor,
+      if (deputyGroupTutor != null) 'deputyGroupTutor': deputyGroupTutor,
       'schoolGrade': schoolGrade.toJson(),
-      if (specialNeeds != null) 'specialNeeds': specialNeeds,
+      if (specialNeeds != null) 'specialNeeds': specialNeeds?.toJson(),
       'gender': gender,
       'language': language,
+      if (nationality != null) 'nationality': nationality,
       if (family != null) 'family': family,
       'birthday': birthday.toJson(),
       if (migrationSupportEnds != null)
@@ -190,6 +213,8 @@ abstract class PupilIdentity implements _i1.SerializableModel {
       if (familyLanguageLessonsSince != null)
         'familyLanguageLessonsSince': familyLanguageLessonsSince?.toJson(),
       if (leavingDate != null) 'leavingDate': leavingDate?.toJson(),
+      if (schoolTransitionRecommendation != null)
+        'schoolTransitionRecommendation': schoolTransitionRecommendation,
     };
   }
 
@@ -208,10 +233,12 @@ class _PupilIdentityImpl extends PupilIdentity {
     required String lastName,
     required String group,
     required String groupTutor,
+    String? deputyGroupTutor,
     required _i2.SchoolGrade schoolGrade,
-    String? specialNeeds,
+    List<String>? specialNeeds,
     required String gender,
     required String language,
+    String? nationality,
     String? family,
     required DateTime birthday,
     DateTime? migrationSupportEnds,
@@ -222,16 +249,19 @@ class _PupilIdentityImpl extends PupilIdentity {
     DateTime? religionLessonsCancelledAt,
     DateTime? familyLanguageLessonsSince,
     DateTime? leavingDate,
+    String? schoolTransitionRecommendation,
   }) : super._(
           id: id,
           firstName: firstName,
           lastName: lastName,
           group: group,
           groupTutor: groupTutor,
+          deputyGroupTutor: deputyGroupTutor,
           schoolGrade: schoolGrade,
           specialNeeds: specialNeeds,
           gender: gender,
           language: language,
+          nationality: nationality,
           family: family,
           birthday: birthday,
           migrationSupportEnds: migrationSupportEnds,
@@ -242,6 +272,7 @@ class _PupilIdentityImpl extends PupilIdentity {
           religionLessonsCancelledAt: religionLessonsCancelledAt,
           familyLanguageLessonsSince: familyLanguageLessonsSince,
           leavingDate: leavingDate,
+          schoolTransitionRecommendation: schoolTransitionRecommendation,
         );
 
   /// Returns a shallow copy of this [PupilIdentity]
@@ -254,10 +285,12 @@ class _PupilIdentityImpl extends PupilIdentity {
     String? lastName,
     String? group,
     String? groupTutor,
+    Object? deputyGroupTutor = _Undefined,
     _i2.SchoolGrade? schoolGrade,
     Object? specialNeeds = _Undefined,
     String? gender,
     String? language,
+    Object? nationality = _Undefined,
     Object? family = _Undefined,
     DateTime? birthday,
     Object? migrationSupportEnds = _Undefined,
@@ -268,17 +301,24 @@ class _PupilIdentityImpl extends PupilIdentity {
     Object? religionLessonsCancelledAt = _Undefined,
     Object? familyLanguageLessonsSince = _Undefined,
     Object? leavingDate = _Undefined,
+    Object? schoolTransitionRecommendation = _Undefined,
   }) {
     return PupilIdentity(
       id: id ?? this.id,
       firstName: firstName ?? this.firstName,
       lastName: lastName ?? this.lastName,
       group: group ?? this.group,
       groupTutor: groupTutor ?? this.groupTutor,
+      deputyGroupTutor: deputyGroupTutor is String?
+          ? deputyGroupTutor
+          : this.deputyGroupTutor,
       schoolGrade: schoolGrade ?? this.schoolGrade,
-      specialNeeds: specialNeeds is String? ? specialNeeds : this.specialNeeds,
+      specialNeeds: specialNeeds is List<String>?
+          ? specialNeeds
+          : this.specialNeeds?.map((e0) => e0).toList(),
       gender: gender ?? this.gender,
       language: language ?? this.language,
+      nationality: nationality is String? ? nationality : this.nationality,
       family: family is String? ? family : this.family,
       birthday: birthday ?? this.birthday,
       migrationSupportEnds: migrationSupportEnds is DateTime?
@@ -297,6 +337,9 @@ class _PupilIdentityImpl extends PupilIdentity {
           ? familyLanguageLessonsSince
           : this.familyLanguageLessonsSince,
       leavingDate: leavingDate is DateTime? ? leavingDate : this.leavingDate,
+      schoolTransitionRecommendation: schoolTransitionRecommendation is String?
+          ? schoolTransitionRecommendation
+          : this.schoolTransitionRecommendation,
     );
   }
 }

school_data_hub_client/lib/src/protocol/_features/pupil/models/pupil_identity/pupil_identity.dart

@@ -1128,6 +1128,11 @@ class Protocol extends _i1.SerializationManager {
               .toList()
           : null) as T;
     }
+    if (t == _i1.getType<List<String>?>()) {
+      return (data != null
+          ? (data as List).map((e) => deserialize<String>(e)).toList()
+          : null) as T;
+    }
     if (t == _i1.getType<List<_i61.PupilListEntry>?>()) {
       return (data != null
           ? (data as List)

school_data_hub_client/lib/src/protocol/protocol.dart

@@ -30,28 +30,36 @@ Future<String?> pickPupilIdentityFileContent() async {
 }
 
 /// SchILD export column indices (0-based). Mapping by position, not header names.
-/// Hijacked: Ausweisnummer (14) -> family; Externe ID-Nummer (15) -> familyLanguageLessonsSince.
-/// Förderschwerpunkt 1/2 (20, 21) -> specialNeeds columns 6 and 7.
+/// Headers: Interne ID-Nummer, Vorname, Nachname, Klasse, Klassenlehrer, Stv., Jahrgang,
+/// Förderschwerpunkt 1, Förderschwerpunkt 2, Geschlecht, Staatsangehörigkeit, Verkehrssprache,
+/// Externe ID-Nummer, Geburtsdatum, Ende Eingliederungsphase, Aufnahmedatum, bes.Merkmal,
+/// Konfession, Religionsanmeldung, Religionsabmeldung, Ausweisnummer, Übergangsempfehlung, Entlassdatum
+/// Hijacked: Ausweisnummer (20) -> family; Externe ID-Nummer (12) -> familyLanguageLessonsSince.
 class SchildExportColumns {
   SchildExportColumns._();
 
-  static const int id = 0; // Schulnummer / l.d.A.Schildnummer
-  static const int group = 1; // Klasse
+  static const int id = 0; // Interne ID-Nummer
+  static const int firstName = 1; // Vorname
   static const int lastName = 2; // Nachname
-  static const int firstName = 3; // Vorname
-  static const int gender = 5; // Geschlecht
-  static const int birthday = 6; // Geburtsdatum
-  static const int religion = 8; // Rel.
-  static const int family = 14; // Ausweisnummer (hijacked for family code)
-  static const int familyLanguageLessonsSince =
-      15; // Externe ID-Nummer (hijacked for family language lessons since)
-  static const int specialNeeds1 = 20; // Förderschwerpunkt 1
-  static const int specialNeeds2 = 21; // Förderschwerpunkt 2
-  static const int groupTutor = 31; // Klassenleiter (if present)
-  static const int schoolGrade = 29; // Jahrgang (if present)
-  static const int pupilSince = 30; // Aufnahmedatum
-  static const int leavingDate =
-      32; // Datum Abgang (if present; column may vary)
+  static const int group = 3; // Klasse
+  static const int groupTutor = 4; // Klassenlehrer: Krz.
+  static const int deputyGroupTutor = 5; // Stv. Klassenlehrer: Krz.
+  static const int schoolGrade = 6; // Jahrgang
+  static const int specialNeeds1 = 7; // Förderschwerpunkt 1
+  static const int specialNeeds2 = 8; // Förderschwerpunkt 2
+  static const int gender = 9; // Geschlecht
+  static const int nationality = 10; // Staatsangehörigkeit (Schlüssel)
+  static const int language = 11; // Verkehrssprache in der Familie
+  static const int familyLanguageLessonsSince = 12; // Externe ID-Nummer (hijacked)
+  static const int birthday = 13; // Geburtsdatum
+  static const int migrationSupportEnds = 14; // Ende der Eingliederungsphase
+  static const int pupilSince = 15; // Aufnahmedatum
+  static const int religion = 17; // Konfession (Klartext)
+  static const int religionLessonsSince = 18; // Religionsanmeldung
+  static const int religionLessonsCancelledAt = 19; // Religionsabmeldung
+  static const int family = 20; // Ausweisnummer (hijacked for family code)
+  static const int schoolTransitionRecommendation = 21; // Übergangsempfehlung
+  static const int leavingDate = 22; // Entlassdatum
 }
 
 String _xlsxToPupilIdentityLines(List<int> bytes) {
@@ -110,17 +118,23 @@ String? _rowToCanonicalLine(
     cellStr(SchildExportColumns.specialNeeds1),
     cellStr(SchildExportColumns.specialNeeds2),
     cellStr(SchildExportColumns.gender),
-    '', // language - not mapped from template
+    cellStr(SchildExportColumns.language),
     cellStr(SchildExportColumns.family),
     _normalizeDateCell(cellStr(SchildExportColumns.birthday), dateFormat),
-    '', // migrationSupportEnds
+    _normalizeDateCell(
+        cellStr(SchildExportColumns.migrationSupportEnds), dateFormat),
     _normalizeDateCell(cellStr(SchildExportColumns.pupilSince), dateFormat),
-    '', // afterSchoolCare -> empty if not in export
+    '', // afterSchoolCare -> not in export
     cellStr(SchildExportColumns.religion),
-    '', // religionLessonsSince
-    '', // religionLessonsCancelledAt
+    _normalizeDateCell(
+        cellStr(SchildExportColumns.religionLessonsSince), dateFormat),
+    _normalizeDateCell(
+        cellStr(SchildExportColumns.religionLessonsCancelledAt), dateFormat),
     cellStr(SchildExportColumns.familyLanguageLessonsSince),
     _normalizeDateCell(cellStr(SchildExportColumns.leavingDate), dateFormat),
+    cellStr(SchildExportColumns.deputyGroupTutor),
+    cellStr(SchildExportColumns.nationality),
+    cellStr(SchildExportColumns.schoolTransitionRecommendation),
   ];
 
   return parts.map((p) => p.replaceAll(',', ' ')).join(',');
@@ -143,6 +157,8 @@ String _cellValueToCanonicalString(dynamic value, DateFormat dateFormat) {
   return value.toString();
 }
 
+/// Returns a date string (yyyy-MM-dd) or '' if [raw] is not a valid date.
+/// Avoids passing non-date values (e.g. category codes like "LE") into date fields.
 String _normalizeDateCell(String raw, DateFormat dateFormat) {
   final s = raw.trim();
   if (s.isEmpty) return '';
@@ -152,6 +168,6 @@ String _normalizeDateCell(String raw, DateFormat dateFormat) {
     final ddMMyyyy = DateFormat('dd.MM.yyyy').parse(s);
     return dateFormat.format(ddMMyyyy);
   } catch (_) {
-    return s;
+    return '';
   }
 }

school_data_hub_flutter/assets/school_data_hub_server.svg

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_it/flutter_it.dart';
 import 'package:gap/gap.dart';
@@ -7,6 +8,7 @@ import 'package:school_data_hub_flutter/common/widgets/bottom_nav_bar/generic_bo
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
 import 'package:school_data_hub_flutter/core/updater/shorebird_update_manager.dart';
 import 'package:shorebird_code_push/shorebird_code_push.dart';
+import 'package:terminate_restart/terminate_restart.dart';
 
 final _log = Logger('CheckForUpdatesPage');
 
@@ -196,6 +198,26 @@ class _ShorebirdCodePushPageState extends State<ShorebirdCodePushPage> {
                       : const Icon(Icons.refresh),
                   label: const Text('Nach Updates suchen'),
                 ),
+                const Gap(12),
+                ElevatedButton(
+                  onPressed: () async {
+                    if (defaultTargetPlatform == TargetPlatform.android ||
+                        defaultTargetPlatform == TargetPlatform.iOS) {
+                      await TerminateRestart.instance.restartAppWithConfirmation(
+                        context,
+                        title: 'Restart App',
+                        message: 'Do you want to restart the app?',
+                        terminate: true,
+                      );
+                    } else {
+                      if (!context.mounted) return;
+                      di<NotificationService>().showInformationDialog(
+                        'Bitte schließen Sie die App manuell und starten Sie sie erneut.',
+                      );
+                    }
+                  },
+                  child: const Text('App neu starten'),
+                ),
                 const Spacer(),
               ],
             ),