Erweiterungen

lib/content_views/task_list_page.dart

@@ -358,12 +358,19 @@ class _TaskListPageState extends State<TaskListPage> {
   }
 
   bool isTaskActive(int index) {
-    for (int i = 0; i < index; i++) {
-      var taskInfo = _taskList[i];
+    var currentTaskInfo = _taskList[index];
 
-      if (!taskInfo.completed) return false;
+    if (currentTaskInfo.completed && !currentTaskInfo.task.reenter!) return false;
+
+    for (var taskInfo in _taskList)
+    {
+      if (taskInfo == currentTaskInfo) break;
+
+      if (!taskInfo.task.opt! && !taskInfo.completed) return false;
     }
 
+    if (currentTaskInfo.task.reenter!) return true;
+
     return true;
   }
 
@@ -385,22 +392,6 @@ class _TaskListPageState extends State<TaskListPage> {
     MqttCore.instance.publishPayloadMessage("job", finTaskMessage.toJson());
   }
 
-  /*_sendTrackStationMessage(TaskInfo taskInfo)
-  {
-    var trackStationMessage = TrackStationMessage();
-    trackStationMessage.sid = taskInfo.task.sId;
-    trackStationMessage.time = DateTime.now().toIso8601String();
-
-    var position = MyApp.currentPosition;
-    if (position != null) {
-      trackStationMessage.pos = FinTaskPos();
-      trackStationMessage.pos!.lat = position.latitude;
-      trackStationMessage.pos!.long = position.latitude;
-    }
-
-    MqttCore.instance.publishPayloadMessage("", trackStationMessage.toJson());
-  }*/
-
   _sendFinTourMessage() async {
     var finTourMessage = FinTourMessage();
     finTourMessage.finTour = FinTour();