Merge branch 'fixes' into 'main'

Fixes

See merge request Crondung/hsma_cpd!36

lib/globals.dart

@@ -7,4 +7,4 @@ DatabaseService databaseService = DatabaseMock();
 //  DatabaseService databaseService = DatabaseService.instance;
 
 // set this to read settings from local json file instead of scanning a qr code
-bool useLocalConfig = false;
+bool useLocalConfig = true;

lib/models/settings.dart

@@ -19,7 +19,7 @@ class Settings {
         chessTime = json['chess_time'] != null
             ? TimeConfig.fromJson(json['chess_time'])
             : null,
-        startedAt = DateTime.parse(json['startedAt']);
+        startedAt = DateTime.now();
 }
 
 class QueryConfig {

lib/pages/main_page.dart

@@ -37,7 +37,14 @@ class MyHomePage extends StatelessWidget {
               '${pageProvider.currentPageData['title']} ${isConfigured ? "Gruppe ${settingsProvider.settings?.group}" : ""}')
         ],
       )),
-      body: pageProvider.currentPageData['page'],
+      body: Stack(alignment: Alignment.center, children: [
+        Image.asset(
+          'assets/ZI_logo.png',
+          opacity: const AlwaysStoppedAnimation(0.05),
+          width: MediaQuery.of(context).size.width * 0.8,
+        ),
+        pageProvider.currentPageData['page'],
+      ]),
       bottomNavigationBar: NavigationBar(
           onDestinationSelected: isConfigured
               ? pageProvider.setCurrentPage

lib/services/export_service.dart

@@ -33,11 +33,17 @@ class ExportService {
 
   Future<int> exportData() async {
     Map<String, List<String>> body = await _loadRecords();
-    final response = await http.post(url,
+    try {
-        headers: <String, String>{
+      final response = await http.post(url,
-          'Content-Type': 'application/json; charset=UTF-8',
+          headers: <String, String>{
-        },
+            'Content-Type': 'application/json; charset=UTF-8',
-        body: jsonEncode(body));
+          },
-    return response.statusCode >= 400 ? 0 : 1;
+          body: jsonEncode(body));
+      return response.statusCode >= 400 ? 0 : 1;
+    } catch (e) {
+      // ignore: avoid_print
+      print(jsonEncode(body));
+      return 0;
+    }
   }
 }

lib/services/settings_service.dart

@@ -49,7 +49,6 @@ Future<List<String>?> _getStringListSetting(String settingKey) =>
 
 Future<void> loadSettingsFromLocalJSON() async {
   Map<String, dynamic> configJSON = await loadLocalConfigJSON();
-  configJSON['startedAt'] = DateTime.now().toIso8601String();
   Settings settings = Settings.fromJson(configJSON);
   saveSettings(settings);
 }
@@ -63,7 +62,7 @@ void saveSettings(Settings settings) {
   _setStringListSetting('sleep_query_days', settings.sleepQuery!.days!);
   _setIntSetting('sleep_query_hours', settings.sleepQuery!.hours!);
   _setIntSetting('sleep_query_minutes', settings.sleepQuery!.minutes!);
-  _setStringSetting('startedAt', DateTime.now().toIso8601String());
+  _setStringSetting('startedAt', settings.startedAt.toIso8601String());
   if (settings.chessTime != null) {
     _setIntSetting('chess_hours', settings.chessTime!.hours!);
     _setIntSetting('chess_minutes', settings.chessTime!.minutes!);

lib/utils/timer_util.dart

@@ -9,7 +9,7 @@ String formatTime(int seconds) {
   String minutes = twoDigits(duration.inMinutes.remainder(60));
   String formattedSeconds = twoDigits(duration.inSeconds.remainder(60));
   if (duration.inDays != 0) {
-    formattedTime += '$days Tag ${duration.inDays > 1 ? "e" : ""}, ';
+    formattedTime += '$days Tag${duration.inDays > 1 ? "e" : ""}, ';
   }
   if (duration.inHours != 0) formattedTime += '$hours:';
   formattedTime += '$minutes:';

lib/widgets/scanner.dart

@@ -16,7 +16,7 @@ class MyScanner extends StatelessWidget {
   Widget build(BuildContext context) {
     SettingsProvider settingsProvider = context.watch<SettingsProvider>();
 
-    void handleSucces(String? rawValue) {
+    void handleSuccess(String? rawValue) {
       String qrText = rawValue!;
       Map<String, dynamic> json = stringToJSON(qrText);
       Settings settings = Settings.fromJson(json);
@@ -49,7 +49,7 @@ class MyScanner extends StatelessWidget {
         final List<Barcode> barcodes = capture.barcodes;
         for (final barcode in barcodes) {
           if (barcode.rawValue != null) {
-            return handleSucces(barcode.rawValue);
+            return handleSuccess(barcode.rawValue);
           }
         }
       } catch (e) {

pubspec.yaml

@@ -48,3 +48,4 @@ flutter:
     - assets/finish.mp3
     - assets/group1.json
     - assets/group3.json
+    - assets/ZI_logo.png