Merge remote-tracking branch 'origin/main'

alessioC42 · Dec 21, 2023 · 9f354a2 · 9f354a2
2 parents 304ca9c + 5769a46
commit 9f354a2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/app/lib/client/client.dart b/app/lib/client/client.dart
@@ -143,6 +143,7 @@ class SPHclient {
         (status) => status != null && (status == 200 || status == 302);
     try {
       if (username != "" && password != "" && schoolID != "") {
+        FirebaseCrashlytics.instance.setCustomKey("school", client.schoolID);
         final response1 = await dio.post(
             "https://login.schulportal.hessen.de/?i=$schoolID",
             queryParameters: {
@@ -562,20 +563,20 @@ class SPHclient {
     () {
       var schoolClasses = document.querySelectorAll("tr.printable");
       for (var schoolClass in schoolClasses) {
-        var teacher = schoolClass.getElementsByClassName("teacher")[0];
+        var teacher = schoolClass.querySelector(".teacher");
 
         result["aktuell"]?.add({
           "name": schoolClass.querySelector(".name")?.text.trim(),
           "teacher": {
             "short": teacher
-                .getElementsByClassName(
+                ?.getElementsByClassName(
                     "btn btn-primary dropdown-toggle btn-xs")[0]
                 .text.trim(),
-            "name": teacher.querySelector("ul>li>a>i.fa")?.parent?.text.trim()
+            "name": teacher?.querySelector("ul>li>a>i.fa")?.parent?.text.trim()
           },
           "thema": {
-            "title": schoolClass.getElementsByClassName("thema")[0].text.trim(),
-            "date": schoolClass.getElementsByClassName("datum")[0].text.trim()
+            "title": schoolClass.querySelector(".thema")?.text.trim(),
+            "date": schoolClass.querySelector(".datum")?.text.trim()
           },
           "data": {
             "entry": schoolClass.attributes["data-entry"],

diff --git a/app/lib/main.dart b/app/lib/main.dart
@@ -219,9 +219,6 @@ class _HomePageState extends State<HomePage> {
     statusController.add(Status.loadUserData);
     await client.loadFromStorage();
 
-    FirebaseCrashlytics.instance.setCustomKey("school", client.schoolID);
-
-
     await client.prepareDio();
 
     statusController.add(Status.login);
@@ -313,7 +310,7 @@ class _HomePageState extends State<HomePage> {
       setState(() {
         isLoading = false;
       });
-
+      client.prepareFetchers();
       openFeature(Feature.substitutions);
     });
   }

diff --git a/app/lib/view/mein_unterricht/mein_unterricht.dart b/app/lib/view/mein_unterricht/mein_unterricht.dart
@@ -74,7 +74,7 @@ class _MeinUnterrichtAnsichtState extends State<MeinUnterrichtAnsicht>
                   left: padding, right: padding, bottom: padding),
               child: Card(
                 child: ListTile(
-                  title: Text(presence[index]["Kurs"]),
+                  title: Text(presence[index]["Kurs"] ?? ""),
                   subtitle: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: rowChildren,
@@ -113,8 +113,8 @@ class _MeinUnterrichtAnsichtState extends State<MeinUnterrichtAnsicht>
                   left: padding, right: padding, bottom: padding),
               child: Card(
                 child: ListTile(
-                  title: Text(courses[index]["title"]),
-                  subtitle: Text(courses[index]["teacher"]),
+                  title: Text(courses[index]["title"] ?? ""),
+                  subtitle: Text(courses[index]["teacher"] ?? ""),
                   shape: RoundedRectangleBorder(
                     borderRadius: BorderRadius.circular(12),
                   ),
@@ -149,19 +149,19 @@ class _MeinUnterrichtAnsichtState extends State<MeinUnterrichtAnsicht>
                   left: padding, right: padding, bottom: padding),
               child: Card(
                 child: ListTile(
-                  title: Text(current[index]["name"]),
+                  title: Text(current[index]["name"] ?? ""),
                   subtitle: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       Text(
-                          "Thema: ${current[index]["thema"]["title"]}"),
+                          "Thema: ${current[index]["thema"]["title"] ?? ""}"),
                       Row(
                         mainAxisAlignment:
                         MainAxisAlignment.spaceBetween,
                         children: [
                           Text(
-                              "${current[index]["teacher"]["short"]}-${current[index]["teacher"]["name"]}"),
-                          Text(current[index]["thema"]["date"])
+                              "${current[index]["teacher"]["short"] ?? "-"}-${current[index]["teacher"]["name"]??"-"}"),
+                          Text(current[index]["thema"]["date"]??"-")
                         ],
                       ),
                     ],