Erweiterungen

lib/content_views/assigned_jobs_page.dart

@@ -7,6 +7,7 @@ import 'package:stadtbote/content_views/utils/header_info.dart';
 import 'package:intl/intl.dart';
 import 'package:badges/badges.dart' as badges;
 import 'package:stadtbote/protocoll_messages/accept_job_message.dart';
+import 'package:stadtbote/protocoll_messages/fin_task_message.dart';
 import 'package:stadtbote/tools/mqtt_core.dart';
 
 import '../main.dart';
@@ -184,7 +185,7 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
     message.reaction.item = item;
     message.reaction.track = Track();
     message.reaction.track.time = DateTime.now().toUtc().toIso8601String();
-    message.reaction.track.pos = Pos();
+    message.reaction.track.pos = FinTaskPos();
     message.reaction.track.pos.lat = 0;
     message.reaction.track.pos.long = 0;
     message.reaction.track.pos.acc = 1;

lib/content_views/task_list_page.dart

@@ -16,7 +16,9 @@ import 'package:stadtbote/popups/tasks_popups/scan_barcodes_popup.dart';
 import 'package:stadtbote/popups/tasks_popups/signature_popup.dart';
 import 'package:stadtbote/popups/tasks_popups/station_notice_popup.dart';
 import 'package:stadtbote/popups/tasks_popups/take_photos_popup.dart';
+import 'package:stadtbote/protocoll_messages/accept_job_message.dart';
 import 'package:stadtbote/protocoll_messages/fin_task_message.dart';
+import 'package:stadtbote/protocoll_messages/fin_tour_message.dart';
 import 'package:stadtbote/protocoll_messages/track_station_message.dart';
 import 'package:stadtbote/tools/constants.dart';
 import 'package:stadtbote/tools/mqtt_core.dart';
@@ -343,12 +345,14 @@ class _TaskListPageState extends State<TaskListPage> {
     SystemChrome.setPreferredOrientations([DeviceOrientation.landscapeLeft]);
 
     Future.delayed(const Duration(seconds: 1), () async {
-      _popup = showSignaturePopup(context, taskInfo, () => {
-        _popup.dismiss(context),
+      _popup = showSignaturePopup(context, taskInfo, () {
+        _popup.dismiss(context);
 
-          taskInfo.completed = true,
+          taskInfo.completed = true;
 
-          SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp])
+          SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+
+          _sendFinTourMessage();
       });
     });
   }
@@ -380,34 +384,6 @@ class _TaskListPageState extends State<TaskListPage> {
 
     MqttCore.instance.publishPayloadMessage("job", finTaskMessage.toJson());
   }
-/*
-var location = App.CurrentLocation;
-
-        var root = new JObject();
-
-        var finTask = new JObject();
-        root.Add(new JProperty("finTask", finTask));
-
-        finTask.Add(new JProperty("tr_id", _jobTour.Id));
-
-        var taskObject = new JObject();
-        finTask.Add(new JProperty("task", taskObject));
-
-        taskObject.Add(new JProperty("s_id", task.SId));
-        taskObject.Add(new JProperty("time", DateTime.Now.ToString("o")));
-
-        if (location != null)
-        {
-            var posObject = new JObject
-            {
-                new JProperty("lat", location.Latitude),
-                new JProperty("long", location.Longitude)
-            };
-            taskObject.Add(new JProperty("pos", posObject));
-        }
-
-        App.Core.SendJsonMessageAsync("job", root);
- */
 
   _sendTrackStationMessage(TaskInfo taskInfo)
   {
@@ -417,16 +393,71 @@ var location = App.CurrentLocation;
 
     var position = MyApp.currentPosition;
     if (position != null) {
-      trackStationMessage.pos = Pos();
+      trackStationMessage.pos = FinTaskPos();
       trackStationMessage.pos!.lat = position.latitude;
       trackStationMessage.pos!.long = position.latitude;
     }
 
-    var json = jsonEncode(trackStationMessage.toJson());
-
     MqttCore.instance.publishPayloadMessage("", trackStationMessage.toJson());
   }
 
+  /*
+		"fin_tour": {
+			"tr_id": 211,
+			"com": "changed com#",
+			"track": {
+				"time": "2021-02-18T12:35:51Z",
+				"pos":
+				{
+					"lat": 53.595121,
+					"long": 9.907433,
+					"acc": 35
+				}
+			},
+			"tasks": [
+				{
+					"s_id": 1,
+					"time": "2021-02-18T12:32:10Z",
+					"pos":
+					{
+						"lat": 53.595124,
+						"long": 9.907435
+					}
+				},
+		}
+	}
+}
+   */
+  _sendFinTourMessage() {
+    var finTourMessage = FinTourMessage();
+    finTourMessage.finTour = FinTour();
+    finTourMessage.finTour.trId = widget.tour.id;
+    finTourMessage.finTour.com = "Mir doch egal!";
+
+    var position = MyApp.currentPosition;
+    if (position != null) {
+      finTourMessage.finTour.track = Track();
+      finTourMessage.finTour.track.time = DateTime.now().toIso8601String();
+      finTourMessage.finTour.track.pos = FinTaskPos();
+      finTourMessage.finTour.track.pos.lat = position.latitude;
+      finTourMessage.finTour.track.pos.long = position.longitude;
+    }
+
+    finTourMessage.finTour.tasks = [];
+    for(var taskInfo in _taskList) {
+      var finTourTask = FinTourTask();
+      finTourTask.sId = taskInfo.task.sId;
+      finTourTask.time = DateTime.now().toIso8601String();
+      finTourTask.pos = FinTaskPos();
+      finTourTask.pos.lat = 0;
+      finTourTask.pos.long = 0;
+
+      finTourMessage.finTour.tasks.add(finTourTask);
+    }
+
+    MqttCore.instance.publishPayloadMessage("job", finTourMessage.toJson());
+  }
+
   /*private JObject CreateFinTourMessage()
   {
     var payloadObject = new JObject();