v0.3

3 files changed, 29 insertions, 15 deletions

diff --git a/lib/services/local_shift_provider_service.dart b/lib/services/local_shift_provider_service.dart
index 9dc045b..fe4d466 100644
--- a/lib/services/local_shift_provider_service.dart
+++ b/lib/services/local_shift_provider_service.dart
@@ -4,6 +4,7 @@ import 'package:intl/intl.dart';
 import 'package:training_planner/config/defaults.dart';
 import 'package:training_planner/config/old_data.dart';
 import 'package:training_planner/services/ishift_provider_service.dart';
+import 'package:training_planner/services/log_service.dart';
 import 'package:training_planner/shift.dart';
 import 'package:uuid/uuid.dart';
 import 'package:in_date_utils/in_date_utils.dart' as DateUtilities;
@@ -30,7 +31,7 @@ class LocalShiftProviderService extends IProgramProviderService {
       if (startDate.hour > 12 && startDate.hour < 15)
         type = DefaultConfig.shiftTypes[2];
 
-      print(startDate.toString() + ' -> ' + endDate.toString());
+      LogService.log(startDate.toString() + ' -> ' + endDate.toString());
       await addShift(Shift(
           start: startDate, type: type.name, end: endDate, payRate: 13.75));
     }
@@ -73,7 +74,7 @@ class LocalShiftProviderService extends IProgramProviderService {
 
     bool exists = await file.exists();
     if (!exists) {
-      print('creating ' + fullPath);
+      LogService.log('creating ' + fullPath);
       await file.create();
       await file.writeAsString(jsonEncode([]));
     }
@@ -86,14 +87,15 @@ class LocalShiftProviderService extends IProgramProviderService {
       for (var shift in shifts) {
         final file = await _localFile(
             DateUtilities.DateUtils.firstDayOfWeek(shift.start).toString());
-        print(DateUtilities.DateUtils.firstDayOfWeek(shift.start).toString());
+        LogService.log(
+            DateUtilities.DateUtils.firstDayOfWeek(shift.start).toString());
         String content = jsonEncode(shifts);
-        print('writing content to ' + file.path + ' -- ' + content);
+        LogService.log('writing content to ' + file.path + ' -- ' + content);
         await file.writeAsString(content);
       }
     } catch (e, stacktrace) {
-      print(stacktrace);
-      print(e);
+      LogService.log(stacktrace);
+      LogService.log(e);
     }
   }
 
@@ -107,8 +109,8 @@ class LocalShiftProviderService extends IProgramProviderService {
 
       return data;
     } catch (e, stacktrace) {
-      print(stacktrace);
-      print(e);
+      LogService.log(stacktrace);
+      LogService.log(e);
       return [];
     }
   }
@@ -175,6 +177,8 @@ class LocalShiftProviderService extends IProgramProviderService {
       }
     }
 
+    result.sort((a, b) => a.start.compareTo(b.start));
+
     return result;
   }
 
diff --git a/lib/services/log_service.dart b/lib/services/log_service.dart
new file mode 100644
index 0000000..cf8ea0b
--- /dev/null
+++ b/lib/services/log_service.dart
@@ -0,0 +1,9 @@
+import 'package:training_planner/config/defaults.dart';
+
+class LogService {
+  static void log(dynamic data) {
+    if (debug_output) {
+      print(data);
+    }
+  }
+}
diff --git a/lib/services/settings_service.dart b/lib/services/settings_service.dart
index 350d7bd..8f3ea61 100644
--- a/lib/services/settings_service.dart
+++ b/lib/services/settings_service.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:path_provider/path_provider.dart';
+import 'package:training_planner/services/log_service.dart';
 
 class Settings {
   double salary;
@@ -42,7 +43,7 @@ class SettingsService {
 
     bool exists = await file.exists();
     if (!exists) {
-      print('created settings.json');
+      LogService.log('created settings.json');
       await file.create();
       await file.writeAsString(jsonEncode(DefaultSettings()));
     }
@@ -54,11 +55,11 @@ class SettingsService {
     try {
       final file = await _localFile;
       String content = jsonEncode(settings);
-      print('writing to file: ' + content);
+      LogService.log('writing to file: ' + content);
       await file.writeAsString(content);
     } catch (e, stacktrace) {
-      print(stacktrace);
-      print(e);
+      LogService.log(stacktrace);
+      LogService.log(e);
     }
   }
 
@@ -66,13 +67,13 @@ class SettingsService {
     try {
       final file = await _localFile;
       final contents = await file.readAsString();
-      print('read from file: ' + contents);
+      LogService.log('read from file: ' + contents);
       var raw = await jsonDecode(contents);
       var settings = Settings.fromJson(raw);
       return settings;
     } catch (e, stacktrace) {
-      print(stacktrace);
-      print(e);
+      LogService.log(stacktrace);
+      LogService.log(e);
       writeSettingsToFile(DefaultSettings());
       return DefaultSettings();
     }