model: translate field names to English

2025-09-25 21:30:52 +02:00
parent 4f1c903384
commit a9829b2163
3 changed files with 133 additions and 131 deletions
--- a/firka/lib/helpers/api/model/all_lessons.dart
+++ b/firka/lib/helpers/api/model/all_lessons.dart
@@ -1,127 +1,127 @@
 import 'dart:convert';

 class AllLessons {
-  final String intezmenyId;
-  final String tanevId;
-  final dynamic osztalyId;
-  final String? osztalyNev;
-  final bool osztalyMunkaTer;
-  final dynamic csoportId;
-  final String? csoportNev;
-  final bool csoportMunkaTer;
-  final String osztalyCsoportNev;
-  final dynamic tantargyId;
-  final String tantargyNev;
-  final dynamic alkalmazottId;
-  final String alkalmazottGuid;
-  final String alkalmazottNev;
-  final dynamic alkalmazottUzenoFalId;
-  final dynamic uzenoFalId;
-  final String? nyelvId;
-  final dynamic tantargyKategoriaId;
-  final String tantargyKategoriaNev;
-  final dynamic tipusId;
-  final String tipusNev;
-  final dynamic evfolyamTipusId;
-  final String evfolyamTipusNev;
-  final dynamic feladatEllatasiHelyId;
-  final String feladatEllatasiHelyNev;
-  final dynamic alkalmazottAvatarTipusId;
-  final String alkalmazottAvatarEleres;
-  final dynamic oraiFeladatGroupId;
+  final String schoolId;
+  final String yearId;
+  final dynamic classId;
+  final String? className;
+  final bool classWorkspace;
+  final dynamic groupId;
+  final String? groupName;
+  final bool groupWorkspace;
+  final String groupWorkspaceName;
+  final dynamic subjectId;
+  final String subjectName;
+  final dynamic teacherId;
+  final String teacherGuid;
+  final String teacherName;
+  final dynamic teacherAnnoId;
+  final dynamic annoId;
+  final String? languageId;
+  final dynamic subjectCategoryId;
+  final String subjectCategoryName;
+  final dynamic typeId;
+  final String typeName;
+  final dynamic gradeTypeId;
+  final String gradeTypeName;
+  final dynamic taskPlaceId;
+  final String taskPlaceName;
+  final dynamic teacherAvatarTypeId;
+  final String teacherAvatarTypePath;
+  final dynamic taskGroupId;

  AllLessons({
-    required this.intezmenyId,
-    required this.tanevId,
-    this.osztalyId,
-    this.osztalyNev,
-    required this.osztalyMunkaTer,
-    this.csoportId,
-    this.csoportNev,
-    required this.csoportMunkaTer,
-    required this.osztalyCsoportNev,
-    required this.tantargyId,
-    required this.tantargyNev,
-    required this.alkalmazottId,
-    required this.alkalmazottGuid,
-    required this.alkalmazottNev,
-    this.alkalmazottUzenoFalId,
-    this.uzenoFalId,
-    this.nyelvId,
-    required this.tantargyKategoriaId,
-    required this.tantargyKategoriaNev,
-    required this.tipusId,
-    required this.tipusNev,
-    required this.evfolyamTipusId,
-    required this.evfolyamTipusNev,
-    required this.feladatEllatasiHelyId,
-    required this.feladatEllatasiHelyNev,
-    required this.alkalmazottAvatarTipusId,
-    required this.alkalmazottAvatarEleres,
-    this.oraiFeladatGroupId,
+    required this.schoolId,
+    required this.yearId,
+    this.classId,
+    this.className,
+    required this.classWorkspace,
+    this.groupId,
+    this.groupName,
+    required this.groupWorkspace,
+    required this.groupWorkspaceName,
+    required this.subjectId,
+    required this.subjectName,
+    required this.teacherId,
+    required this.teacherGuid,
+    required this.teacherName,
+    this.teacherAnnoId,
+    this.annoId,
+    this.languageId,
+    required this.subjectCategoryId,
+    required this.subjectCategoryName,
+    required this.typeId,
+    required this.typeName,
+    required this.gradeTypeId,
+    required this.gradeTypeName,
+    required this.taskPlaceId,
+    required this.taskPlaceName,
+    required this.teacherAvatarTypeId,
+    required this.teacherAvatarTypePath,
+    this.taskGroupId,
  });

  factory AllLessons.fromJson(Map<String, dynamic> json) => AllLessons(
-      intezmenyId: json['intezmenyId']?.toString() ?? '',
-      tanevId: json['tanevId']?.toString() ?? '',
-      osztalyId: json['osztalyId'],
-      osztalyNev: json['osztalyNev']?.toString(),
-      osztalyMunkaTer: json['osztalyMunkaTer'] == true,
-      csoportId: json['csoportId'],
-      csoportNev: json['csoportNev']?.toString(),
-      csoportMunkaTer: json['csoportMunkaTer'] == true,
-      osztalyCsoportNev: json['osztalyCsoportNev']?.toString() ?? '',
-      tantargyId: json['tantargyId'],
-      tantargyNev: json['tantargyNev']?.toString() ?? '',
-      alkalmazottId: json['alkalmazottId'],
-      alkalmazottGuid: json['alkalmazottGuid']?.toString() ?? '',
-      alkalmazottNev: json['alkalmazottNev']?.toString() ?? '',
-      alkalmazottUzenoFalId: json['alkalmazottUzenoFalId'],
-      uzenoFalId: json['uzenoFalId'],
-      nyelvId: json['nyelvId']?.toString(),
-      tantargyKategoriaId: json['tantargyKategoriaId'],
-      tantargyKategoriaNev: json['tantargyKategoriaNev']?.toString() ?? '',
-      tipusId: json['tipusId'],
-      tipusNev: json['tipusNev']?.toString() ?? '',
-      evfolyamTipusId: json['evfolyamTipusId'],
-      evfolyamTipusNev: json['evfolyamTipusNev']?.toString() ?? '',
-      feladatEllatasiHelyId: json['feladatEllatasiHelyId'],
-      feladatEllatasiHelyNev: json['feladatEllatasiHelyNev']?.toString() ?? '',
-      alkalmazottAvatarTipusId: json['alkalmazottAvatarTipusId'],
-      alkalmazottAvatarEleres: json['alkalmazottAvatarEleres']?.toString() ?? '',
-      oraiFeladatGroupId: json['oraiFeladatGroupId'],
-    );
-
+        schoolId: json['intezmenyId']?.toString() ?? '',
+        yearId: json['tanevId']?.toString() ?? '',
+        classId: json['osztalyId'],
+        className: json['osztalyNev']?.toString(),
+        classWorkspace: json['osztalyMunkaTer'] == true,
+        groupId: json['csoportId'],
+        groupName: json['csoportNev']?.toString(),
+        groupWorkspace: json['csoportMunkaTer'] == true,
+        groupWorkspaceName: json['osztalyCsoportNev']?.toString() ?? '',
+        subjectId: json['tantargyId'],
+        subjectName: json['tantargyNev']?.toString() ?? '',
+        teacherId: json['alkalmazottId'],
+        teacherGuid: json['alkalmazottGuid']?.toString() ?? '',
+        teacherName: json['alkalmazottNev']?.toString() ?? '',
+        teacherAnnoId: json['alkalmazottUzenoFalId'],
+        annoId: json['uzenoFalId'],
+        languageId: json['nyelvId']?.toString(),
+        subjectCategoryId: json['tantargyKategoriaId'],
+        subjectCategoryName: json['tantargyKategoriaNev']?.toString() ?? '',
+        typeId: json['tipusId'],
+        typeName: json['tipusNev']?.toString() ?? '',
+        gradeTypeId: json['evfolyamTipusId'],
+        gradeTypeName: json['evfolyamTipusNev']?.toString() ?? '',
+        taskPlaceId: json['feladatEllatasiHelyId'],
+        taskPlaceName: json['feladatEllatasiHelyNev']?.toString() ?? '',
+        teacherAvatarTypeId: json['alkalmazottAvatarTipusId'],
+        teacherAvatarTypePath:
+            json['alkalmazottAvatarEleres']?.toString() ?? '',
+        taskGroupId: json['oraiFeladatGroupId'],
+      );

  Map<String, dynamic> toJson() => {
-        'intezmenyId': intezmenyId,
-        'tanevId': tanevId,
-        'osztalyId': osztalyId,
-        'osztalyNev': osztalyNev,
-        'osztalyMunkaTer': osztalyMunkaTer,
-        'csoportId': csoportId,
-        'csoportNev': csoportNev,
-        'csoportMunkaTer': csoportMunkaTer,
-        'osztalyCsoportNev': osztalyCsoportNev,
-        'tantargyId': tantargyId,
-        'tantargyNev': tantargyNev,
-        'alkalmazottId': alkalmazottId,
-        'alkalmazottGuid': alkalmazottGuid,
-        'alkalmazottNev': alkalmazottNev,
-        'alkalmazottUzenoFalId': alkalmazottUzenoFalId,
-        'uzenoFalId': uzenoFalId,
-        'nyelvId': nyelvId,
-        'tantargyKategoriaId': tantargyKategoriaId,
-        'tantargyKategoriaNev': tantargyKategoriaNev,
-        'tipusId': tipusId,
-        'tipusNev': tipusNev,
-        'evfolyamTipusId': evfolyamTipusId,
-        'evfolyamTipusNev': evfolyamTipusNev,
-        'feladatEllatasiHelyId': feladatEllatasiHelyId,
-        'feladatEllatasiHelyNev': feladatEllatasiHelyNev,
-        'alkalmazottAvatarTipusId': alkalmazottAvatarTipusId,
-        'alkalmazottAvatarEleres': alkalmazottAvatarEleres,
-        'oraiFeladatGroupId': oraiFeladatGroupId,
+        'intezmenyId': schoolId,
+        'tanevId': yearId,
+        'osztalyId': classId,
+        'osztalyNev': className,
+        'osztalyMunkaTer': classWorkspace,
+        'csoportId': groupId,
+        'csoportNev': groupName,
+        'csoportMunkaTer': groupWorkspace,
+        'osztalyCsoportNev': groupWorkspaceName,
+        'tantargyId': subjectId,
+        'tantargyNev': subjectName,
+        'alkalmazottId': teacherId,
+        'alkalmazottGuid': teacherGuid,
+        'alkalmazottNev': teacherName,
+        'alkalmazottUzenoFalId': teacherAnnoId,
+        'uzenoFalId': annoId,
+        'nyelvId': languageId,
+        'tantargyKategoriaId': subjectCategoryId,
+        'tantargyKategoriaNev': subjectCategoryName,
+        'tipusId': typeId,
+        'tipusNev': typeName,
+        'evfolyamTipusId': gradeTypeId,
+        'evfolyamTipusNev': gradeTypeName,
+        'feladatEllatasiHelyId': taskPlaceId,
+        'feladatEllatasiHelyNev': taskPlaceName,
+        'alkalmazottAvatarTipusId': teacherAvatarTypeId,
+        'alkalmazottAvatarEleres': teacherAvatarTypePath,
+        'oraiFeladatGroupId': taskGroupId,
      };
 }

@@ -129,4 +129,4 @@ List<AllLessons> lessonsFromJson(String str) =>
    List<AllLessons>.from(json.decode(str).map((x) => AllLessons.fromJson(x)));

 String lessonsToJson(List<AllLessons> data) =>
-    json.encode(List<dynamic>.from(data.map((x) => x.toJson())));
+    json.encode(List<dynamic>.from(data.map((x) => x.toJson())));
--- a/firka/lib/helpers/api/model/subject.dart
+++ b/firka/lib/helpers/api/model/subject.dart
@@ -5,14 +5,14 @@ class Subject {
  final String name;
  final NameUidDesc category;
  final int sortIndex;
-  final String? alkalmazottNev;
+  final String? teacherName;

  Subject({
    required this.uid,
    required this.name,
    required this.category,
    required this.sortIndex,
-    this.alkalmazottNev,
+    this.teacherName,
  });

  factory Subject.fromJson(Map<String, dynamic> json) {
@@ -21,7 +21,7 @@ class Subject {
      name: json['Nev'],
      category: NameUidDesc.fromJson(json['Kategoria']),
      sortIndex: json['SortIndex'],
-      alkalmazottNev: json['alkalmazottNev'],
+      teacherName: json['alkalmazottNev'],
    );
  }

@@ -31,7 +31,7 @@ class Subject {
      'Nev': name,
      'Kategoria': category.toJson(),
      'SortIndex': sortIndex,
-      'alkalmazottNev': alkalmazottNev,
+      'alkalmazottNev': teacherName,
    };
  }

@@ -42,7 +42,7 @@ class Subject {
        'name: "$name", '
        'category: $category, '
        'sortIndex: $sortIndex, '
-        'alkalmazottNev: $alkalmazottNev'
+        'nameOfTeacher: $teacherName'
        ')';
  }
 }
--- a/firka/lib/ui/phone/pages/home/home_grades.dart
+++ b/firka/lib/ui/phone/pages/home/home_grades.dart
@@ -127,15 +127,16 @@ class _HomeGradesScreen extends FirkaState<HomeGradesScreen> {
      }

      for (var lesson in lessons!.response!) {
-        if (subjects.where((s) => s.uid == lesson.tantargyId?.toString()).isEmpty) {
+        if (subjects
+            .where((s) => s.uid == lesson.subjectId?.toString())
+            .isEmpty) {
          subjects.add(Subject(
-            uid: lesson.tantargyId?.toString() ?? '',
-            name: lesson.tantargyNev,
-            alkalmazottNev: lesson.alkalmazottNev,
-
+            uid: lesson.subjectId?.toString() ?? '',
+            name: lesson.subjectName,
+            teacherName: lesson.teacherName,
            category: NameUidDesc(
-              uid: lesson.tantargyKategoriaId?.toString() ?? '',
-              name: lesson.tantargyKategoriaNev,
+              uid: lesson.subjectCategoryId?.toString() ?? '',
+              name: lesson.subjectCategoryName,
              description: "",
            ),
            sortIndex: 0,
@@ -146,8 +147,9 @@ class _HomeGradesScreen extends FirkaState<HomeGradesScreen> {
      subjects.sort((s1, s2) => s1.name.compareTo(s2.name));

      for (var subject in subjects) {
-        final subjectGrades =
-            grades!.response!.where((g) => g.subject.uid == subject.uid).toList();
+        final subjectGrades = grades!.response!
+            .where((g) => g.subject.uid == subject.uid)
+            .toList();

        double avg = double.nan;
        if (subjectGrades.isNotEmpty) {
@@ -168,7 +170,7 @@ class _HomeGradesScreen extends FirkaState<HomeGradesScreen> {
            child: GradeSmallCard(grades!.response!, subject),
            onTap: () {
              activeSubjectUid = subject.uid;
-              alkalmazottNev = subject.alkalmazottNev ?? '';
+              alkalmazottNev = subject.teacherName ?? '';
              tantargyNev = subject.name;
              widget.pageController(1);
            },
@@ -178,7 +180,7 @@ class _HomeGradesScreen extends FirkaState<HomeGradesScreen> {
            child: GradeSmallCard(grades!.response!, subject),
            onTap: () {
              activeSubjectUid = subject.uid;
-              alkalmazottNev = subject.alkalmazottNev  ?? '';
+              alkalmazottNev = subject.teacherName ?? '';
              tantargyNev = subject.name;
              widget.pageController(1);
            },