Fix the start and end time being missing

lib/data.dart

@@ -11,6 +11,7 @@ import 'package:timetrack/consts.dart';
 
 class SessionData {
   static DateTime StartTime = DateTime(0);
+  static DateTime EndTime = DateTime(0);
 
   static bool IsOnTheClock = false;
 
@@ -102,8 +103,9 @@ class SessionData {
       );
 
       if (d < minDistanceMeters) continue; // too small → jitter
-      if (maxDistanceMeters != null && d > maxDistanceMeters)
+      if (maxDistanceMeters != null && d > maxDistanceMeters) {
         continue; // glitch
+      }
 
       meters += d;
     }
@@ -159,6 +161,8 @@ class SessionData {
     currentTrip = null;
     _listener.cancel();
 
+    EndTime = DateTime.now();
+
     var saveData = SaveData();
     print(saveData);
 
@@ -183,18 +187,20 @@ class SessionData {
   static Map<String, dynamic> SaveData() {
     Map<String, dynamic> saveData = {};
 
-    List<Map<String, dynamic>> _trips = [];
+    List<Map<String, dynamic>> trips = [];
     for (var trip in Trips) {
-      _trips.add(trip.toJsonMap());
+      trips.add(trip.toJsonMap());
     }
 
-    List<Map<String, dynamic>> _pos = [];
+    List<Map<String, dynamic>> posx = [];
     for (var pos in positions) {
-      _pos.add(pos.toMap());
+      posx.add(pos.toMap());
     }
 
-    saveData["trips"] = _trips;
-    saveData["positions"] = _pos;
+    saveData["trips"] = trips;
+    saveData["positions"] = posx;
+    saveData["start"] = StartTime.toIso8601String();
+    saveData["end"] = EndTime.toIso8601String();
 
     return saveData;
   }
@@ -209,28 +215,32 @@ class SessionData {
       data: json.encode(payload),
     );
 
-    LoadData(reply.data as String);
+    LoadData(reply.data as Map<String, dynamic>);
   }
 
-  static void LoadData(String js) {
-    Map<String, dynamic> _js = json.decode(js);
-    if (_js.containsKey("error")) {
+  static void LoadData(Map<String, dynamic> jsMap) {
+    if (jsMap.containsKey("error")) {
       LastSessionID = "";
       return;
     }
-    List<Map<String, dynamic>> _trips =
-        _js['trips'] as List<Map<String, dynamic>>;
-    List<Map<String, dynamic>> _pos =
-        _js['positions'] as List<Map<String, dynamic>>;
+    List<dynamic> trips = jsMap['trips'] as List<dynamic>;
+    List<dynamic> pos = jsMap['positions'] as List<dynamic>;
 
-    for (var trip in _trips) {
-      Trips.add(Trip.fromJsonMap(trip));
+    for (var trip in trips) {
+      Trips.add(Trip.fromJsonMap(trip as Map<String, dynamic>));
     }
 
-    for (var position in _pos) {
-      positions.add(SmallPosition.fromMap(position));
+    for (var position in pos) {
+      positions.add(SmallPosition.fromMap(position as Map<String, dynamic>));
     }
 
+    if (jsMap.containsKey("start")) {
+      StartTime = DateTime.parse(jsMap['start'] as String);
+    }
+
+    if (jsMap.containsKey("end"))
+      EndTime = DateTime.parse(jsMap["end"] as String);
+
     IsReadOnly = true;
   }
 
@@ -251,7 +261,6 @@ class SessionData {
   static Delivery GetNewDelivery() {
     if (currentTrip != null) {
       var dropOff = currentTrip!.startNewDelivery();
-      ;
       currentDelivery = dropOff;
       return dropOff;
     } else {
@@ -263,10 +272,31 @@ class SessionData {
     currentDelivery = null;
     currentTrip = null;
   }
+
+  /// [a] should be the Start Time,
+  ///
+  /// [b] is the end time
+  static String GetTotalTimeWorked(DateTime a, DateTime b) {
+    Duration diff = b.difference(a);
+
+    int days = diff.inDays;
+    int hours = diff.inHours.remainder(24);
+    int minutes = diff.inMinutes.remainder(60);
+    int seconds = diff.inSeconds.remainder(60);
+
+    List<String> parts = [];
+
+    if (days > 0) parts.add('${days}d');
+    if (hours > 0) parts.add('${hours}h');
+    if (minutes > 0) parts.add('${minutes}m');
+    if (seconds > 0) parts.add('${seconds}s');
+
+    return parts.join(' ');
+  }
 }
 
 class Delivery {
-  Position? endLocation;
+  SmallPosition? endLocation;
   DateTime StartTime = DateTime.now();
 
   Delivery() {
@@ -275,23 +305,26 @@ class Delivery {
 
   Future<void> MarkEndLocation() async {
     var pos = await SessionData.GetNewLocation();
-    endLocation = pos;
+    endLocation = SmallPosition.fromPosition(pos);
   }
 
   Map<String, dynamic> toJsonMap() {
     return {
       "start": StartTime.toString(),
-      "endPos": endLocation?.toJson() ?? "incomplete",
+      "endPos": endLocation?.toMap() ?? "incomplete",
     };
   }
 
   static Delivery fromMap(Map<String, dynamic> jsx) {
     Delivery delivery = Delivery();
     delivery.StartTime = DateTime.parse(jsx['start'] as String);
-    if (jsx['endPos'] as String == "incomplete")
+    if (jsx['endPos'] is String) {
       delivery.endLocation = null;
-    else
-      delivery.endLocation = Position.fromMap(jsx['endPos']);
+    } else {
+      delivery.endLocation = SmallPosition.fromMap(
+        jsx['endPos'] as Map<String, dynamic>,
+      );
+    }
 
     return delivery;
   }
@@ -314,26 +347,25 @@ class Trip {
   }
 
   Map<String, dynamic> toJsonMap() {
-    Map<String, Object> _trip = {"start": StartTime.toString()};
-    List<Map<String, dynamic>> _dropOffs = [];
+    Map<String, Object> trip = {"start": StartTime.toString()};
+    List<Map<String, dynamic>> dropOffs = [];
     for (var delivery in deliveries) {
-      _dropOffs.add(delivery.toJsonMap());
+      dropOffs.add(delivery.toJsonMap());
     }
 
-    _trip["deliveries"] = _dropOffs;
+    trip["deliveries"] = dropOffs;
 
-    return _trip;
+    return trip;
   }
 
   static Trip fromJsonMap(Map<String, dynamic> jsx) {
     Trip trip = Trip();
     trip.StartTime = DateTime.parse(jsx['start'] as String);
     trip.deliveries = [];
-    List<Map<String, dynamic>> _dropOffs =
-        jsx['deliveries'] as List<Map<String, dynamic>>;
+    List<dynamic> dropOffs = jsx['deliveries'] as List<dynamic>;
 
-    for (var dropOff in _dropOffs) {
-      trip.deliveries.add(Delivery.fromMap(dropOff));
+    for (var dropOff in dropOffs) {
+      trip.deliveries.add(Delivery.fromMap(dropOff as Map<String, dynamic>));
     }
 
     return trip;