Fehler Merge behoben

lib/content_views/assigned_jobs_page.dart

@@ -202,8 +202,8 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
 
     MqttCore.instance.publishText("reaction", jsonEncode(message.toJson()));
 
-    MyApp.isarInstance.writeTxnSync(() {
-      MyApp.isarInstance.jobs.deleteSync(job.id);
+    await MyApp.isarInstance.writeTxn(() async {
+      await MyApp.isarInstance.jobs.delete(job.id);
     });
 
     MessageService().publish(Constants.messageTopicRefreshBadges, arguments: RefreshBadgesMessage());

lib/content_views/main_page.dart

@@ -381,8 +381,6 @@ class _MainPageState extends State<MainPage> {
       logoutMessage.pos!.acc = position.accuracy.toInt();
     }
 
-    var json  = jsonEncode(logoutMessage.toJson());
-
-    MqttCore.instance.publishText("session", jsonEncode(logoutMessage.toJson()));
+    MqttCore.instance.publishText("logout", jsonEncode(logoutMessage.toJson()));
   }
 }

lib/content_views/messages_page.dart

@@ -182,7 +182,7 @@ class _MessagesPageState extends State<MessagesPage> {
                               const SizedBox(width: 20),
                               Expanded(
                                 child: getDefaultButton('Ja', () async => {
-                                await MyApp.isarInstance.writeTxnSync(() async => { await MyApp.isarInstance.messages.delete(int.parse(message.id))}),
+                                await MyApp.isarInstance.writeTxn(() async => { await MyApp.isarInstance.messages.delete(int.parse(message.id))}),
 
                                 _fetchMessages(),
 

lib/content_views/task_list_page.dart

@@ -379,13 +379,13 @@ class _TaskListPageState extends State<TaskListPage> {
     });
   }
 
-  void _processSignature(TaskInfo taskInfo) {
+  void _processSignature(TaskInfo taskInfo) async {
     MyApp.suppressAcceptDialog = true;
 
     SystemChrome.setPreferredOrientations([DeviceOrientation.landscapeLeft]);
 
-    Future.delayed(const Duration(seconds: 1), () async {
-      showSignaturePopup(context, taskInfo, (String? signature) {
+    Future.delayed(const Duration(seconds: 1), () {
+      showSignaturePopup(context, taskInfo, (String? signature) async {
         MyApp.suppressAcceptDialog = false;
 
         SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
@@ -399,15 +399,15 @@ class _TaskListPageState extends State<TaskListPage> {
 
           _sendFinTourMessage();
 
-          _finishTaskProcessing(taskInfo);
+          await _finishTaskProcessing(taskInfo);
 
-          MessageService().publish<PopContentViewMessage>(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 2));
+          MessageService().publish<PopContentViewMessage>(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: widget.job.state == 1 ? 2 : 3));
         }
       });
     });
   }
 
-  _finishTaskProcessing(TaskInfo taskInfo) async {
+  Future<void> _finishTaskProcessing(TaskInfo taskInfo) async {
     await MyApp.isarInstance.writeTxn(() async {
       await MyApp.isarInstance.taskInfos.put(taskInfo);
     });
@@ -444,7 +444,7 @@ class _TaskListPageState extends State<TaskListPage> {
       message.task.pos!.long = position.longitude;
     }
 
-    MqttCore.instance.publishText("job", jsonEncode(message.toJson()));
+    MqttCore.instance.publishText("fin_task", jsonEncode(message.toJson()));
   }
 
   FinTourTask _createAnswerHeader(TaskInfo taskInfo) {
@@ -463,10 +463,10 @@ class _TaskListPageState extends State<TaskListPage> {
     return finTourTask;
   }
 
-  _sendFinTourMessage() async {
+  Future<void> _sendFinTourMessage() async {
     var message = FinTour();
     message.trId = widget.tour.id;
-    message.com = "Mir doch egal!";
+    message.com = _commisionNumber;
 
     var position = MyApp.currentPosition;
     if (position != null) {
@@ -489,8 +489,31 @@ class _TaskListPageState extends State<TaskListPage> {
     MqttCore.instance.publishText("fin_tour", jsonEncode(message.toJson()));
 
     widget.tour.state = Constants.stateFinishedNotConfirmed;
-      await MyApp.isarInstance.writeTxn(() async {
+    await MyApp.isarInstance.writeTxn(() async {
       await MyApp.isarInstance.jobs.put(widget.job);
     });
+
+    checkJobFinished();
+  }
+
+  void checkJobFinished() async {
+    var jobFinished = true;
+
+    for(var tour in widget.job.tours) {
+      if (tour.state < 1) {
+        jobFinished = false;
+      }
+    }
+
+    if (jobFinished) {
+      widget.job.state = 2;
+      for(var tour in widget.job.tours) {
+        tour.state = 1;
+      }
+
+      await MyApp.isarInstance.writeTxn(() async {
+        await MyApp.isarInstance.jobs.put(widget.job);
+      });
+    }
   }
 }