Merge branch 'main' into new_appserver

# Conflicts:
#	lib/content_views/approach_area_page.dart
#	lib/content_views/assigned_jobs_page.dart
#	lib/content_views/main_page.dart
#	lib/content_views/task_list_page.dart
#	lib/main.dart
#	lib/popups/accept_jobs_popup.dart
#	lib/protocoll_messages/logout_message.dart
#	lib/protocoll_messages/logout_message.g.dart
#	lib/tools/constants.dart
#	lib/tools/mqtt_core.dart
#	pubspec.lock
#	pubspec.yaml

lib/protocoll_messages/accept_job_message.dart

@@ -20,7 +20,8 @@ class Reaction {
 @JsonSerializable()
 @JsonSerializable()class Track {
   late String time;
-  late FinTaskPos pos;
+
+  FinTaskPos? pos;
 
   Track();
 

lib/protocoll_messages/accept_job_message.g.dart

@@ -21,7 +21,9 @@ Map<String, dynamic> _$ReactionToJson(Reaction instance) => <String, dynamic>{
 
 Track _$TrackFromJson(Map<String, dynamic> json) => Track()
   ..time = json['time'] as String
-  ..pos = FinTaskPos.fromJson(json['pos'] as Map<String, dynamic>);
+  ..pos = json['pos'] == null
+      ? null
+      : FinTaskPos.fromJson(json['pos'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$TrackToJson(Track instance) => <String, dynamic>{
       'time': instance.time,

lib/protocoll_messages/acknowledge_job.dart

@@ -0,0 +1,32 @@
+import 'package:isar/isar.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'acknowledge_job.g.dart';
+
+@JsonSerializable()
+class AcknowledgeJob {
+  late AcknowledgeJobReceived received;
+
+  AcknowledgeJob();
+
+  factory AcknowledgeJob.fromJson(Map<String, dynamic> json) => _$AcknowledgeJobFromJson(json);
+
+  Map<String, dynamic> toJson() => _$AcknowledgeJobToJson(this);
+}
+
+@JsonSerializable()
+class AcknowledgeJobReceived {
+  late int id;
+
+  late int state;
+
+  late int ver;
+
+  late int utc;
+
+  AcknowledgeJobReceived();
+
+  factory AcknowledgeJobReceived.fromJson(Map<String, dynamic> json) => _$AcknowledgeJobReceivedFromJson(json);
+
+  Map<String, dynamic> toJson() => _$AcknowledgeJobReceivedToJson(this);
+}

lib/protocoll_messages/acknowledge_job.g.dart

@@ -0,0 +1,34 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'acknowledge_job.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+AcknowledgeJob _$AcknowledgeJobFromJson(Map<String, dynamic> json) =>
+    AcknowledgeJob()
+      ..received = AcknowledgeJobReceived.fromJson(
+          json['received'] as Map<String, dynamic>);
+
+Map<String, dynamic> _$AcknowledgeJobToJson(AcknowledgeJob instance) =>
+    <String, dynamic>{
+      'received': instance.received,
+    };
+
+AcknowledgeJobReceived _$AcknowledgeJobReceivedFromJson(
+        Map<String, dynamic> json) =>
+    AcknowledgeJobReceived()
+      ..id = json['id'] as int
+      ..state = json['state'] as int
+      ..ver = json['ver'] as int
+      ..utc = json['utc'] as int;
+
+Map<String, dynamic> _$AcknowledgeJobReceivedToJson(
+        AcknowledgeJobReceived instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'state': instance.state,
+      'ver': instance.ver,
+      'utc': instance.utc,
+    };

lib/protocoll_messages/device_log_request.dart

@@ -0,0 +1,18 @@
+import 'dart:core';
+
+import 'package:json_annotation/json_annotation.dart';
+
+part 'device_log_request.g.dart';
+
+@JsonSerializable()
+class DeviceLogRequest {
+  late DateTime startDateTime;
+
+  late DateTime endDateTime;
+
+  DeviceLogRequest();
+
+  Map<String, dynamic> toJson() => _$DeviceLogRequestToJson(this);
+
+  factory DeviceLogRequest.fromJson(Map<String, dynamic> json) => _$DeviceLogRequestFromJson(json);
+}

lib/protocoll_messages/device_log_request.g.dart

@@ -0,0 +1,18 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'device_log_request.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+DeviceLogRequest _$DeviceLogRequestFromJson(Map<String, dynamic> json) =>
+    DeviceLogRequest()
+      ..startDateTime = DateTime.parse(json['startDateTime'] as String)
+      ..endDateTime = DateTime.parse(json['endDateTime'] as String);
+
+Map<String, dynamic> _$DeviceLogRequestToJson(DeviceLogRequest instance) =>
+    <String, dynamic>{
+      'startDateTime': instance.startDateTime.toIso8601String(),
+      'endDateTime': instance.endDateTime.toIso8601String(),
+    };

lib/protocoll_messages/device_log_response.dart

@@ -0,0 +1,15 @@
+import 'package:json_annotation/json_annotation.dart';
+import 'package:stadtbote/model/log_entry.dart';
+
+part 'device_log_response.g.dart';
+
+@JsonSerializable()
+class DeviceLogResponse {
+  late List<LogEntry> entries;
+
+  DeviceLogResponse();
+
+  Map<String, dynamic> toJson() => _$DeviceLogResponseToJson(this);
+
+  factory DeviceLogResponse.fromJson(Map<String, dynamic> json) => _$DeviceLogResponseFromJson(json);
+}

lib/protocoll_messages/device_log_response.g.dart

@@ -0,0 +1,18 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'device_log_response.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+DeviceLogResponse _$DeviceLogResponseFromJson(Map<String, dynamic> json) =>
+    DeviceLogResponse()
+      ..entries = (json['entries'] as List<dynamic>)
+          .map((e) => LogEntry.fromJson(e as Map<String, dynamic>))
+          .toList();
+
+Map<String, dynamic> _$DeviceLogResponseToJson(DeviceLogResponse instance) =>
+    <String, dynamic>{
+      'entries': instance.entries,
+    };

lib/protocoll_messages/fin_task_message.dart

@@ -35,7 +35,7 @@ class Task {
 
   late String time;
 
-  late FinTaskPos? pos;
+  FinTaskPos? pos;
 
   Task();
 

lib/protocoll_messages/fin_tour_message.dart

@@ -23,7 +23,7 @@ class FinTour {
 
   late String com;
 
-  late Track track;
+  Track? track;
 
   late List<FinTourTask> tasks;
 
@@ -49,7 +49,7 @@ class FinTourTask {
 
   List<String>? codes;
 
-  late FinTaskPos pos;
+  FinTaskPos? pos;
 
   FinTourTask();
 

lib/protocoll_messages/fin_tour_message.g.dart

@@ -18,7 +18,9 @@ Map<String, dynamic> _$FinTourMessageToJson(FinTourMessage instance) =>
 FinTour _$FinTourFromJson(Map<String, dynamic> json) => FinTour()
   ..trId = json['tr_id'] as int
   ..com = json['com'] as String
-  ..track = Track.fromJson(json['track'] as Map<String, dynamic>)
+  ..track = json['track'] == null
+      ? null
+      : Track.fromJson(json['track'] as Map<String, dynamic>)
   ..tasks = (json['tasks'] as List<dynamic>)
       .map((e) => FinTourTask.fromJson(e as Map<String, dynamic>))
       .toList();
@@ -37,7 +39,9 @@ FinTourTask _$FinTourTaskFromJson(Map<String, dynamic> json) => FinTourTask()
   ..code = json['code'] as int?
   ..sign = json['sign'] as String?
   ..codes = (json['codes'] as List<dynamic>?)?.map((e) => e as String).toList()
-  ..pos = FinTaskPos.fromJson(json['pos'] as Map<String, dynamic>);
+  ..pos = json['pos'] == null
+      ? null
+      : FinTaskPos.fromJson(json['pos'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$FinTourTaskToJson(FinTourTask instance) =>
     <String, dynamic>{

lib/protocoll_messages/logout_message.dart

@@ -4,13 +4,9 @@ part 'logout_message.g.dart';
 
 @JsonSerializable()
 class LogoutMessage {
-  late String time;
+  late bool logout;
 
-  late double lat;
-
-  late double long;
-
-  late int acc;
+  LogoutMessagePosition? pos;
 
   LogoutMessage();
 
@@ -19,3 +15,20 @@ class LogoutMessage {
   Map<String, dynamic> toJson() => _$LogoutMessageToJson(this);
 }
 
+@JsonSerializable()
+class LogoutMessagePosition {
+  late String time;
+
+  late double lat;
+
+  late double long;
+
+  late int acc;
+
+  LogoutMessagePosition();
+
+  factory LogoutMessagePosition.fromJson(Map<String, dynamic> json) => _$LogoutMessagePositionFromJson(json);
+
+  Map<String, dynamic> toJson() => _$LogoutMessagePositionToJson(this);
+}
+

lib/protocoll_messages/pic_message.dart

@@ -0,0 +1,50 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'pic_message.g.dart';
+
+@JsonSerializable()
+class PicMessage {
+  late PicData pic;
+
+  PicMessagePos? pos;
+
+  PicMessage();
+
+  factory PicMessage.fromJson(Map<String, dynamic> json) => _$PicMessageFromJson(json);
+
+  Map<String, dynamic> toJson() => _$PicMessageToJson(this);
+}
+
+@JsonSerializable()
+class PicData
+{
+  @JsonKey(name: "tr_id")
+  late int trId;
+
+  late int num;
+
+  late int time;
+
+  late String data;
+
+  PicData();
+
+  factory PicData.fromJson(Map<String, dynamic> json) => _$PicDataFromJson(json);
+
+  Map<String, dynamic> toJson() => _$PicDataToJson(this);
+}
+
+@JsonSerializable()
+class PicMessagePos {
+  late double lat;
+
+  late double long;
+
+  late int acc = 0;
+
+  PicMessagePos();
+
+  factory PicMessagePos.fromJson(Map<String, dynamic> json) => _$PicMessagePosFromJson(json);
+
+  Map<String, dynamic> toJson() => _$PicMessagePosToJson(this);
+}

lib/protocoll_messages/pic_message.g.dart

@@ -0,0 +1,45 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'pic_message.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+PicMessage _$PicMessageFromJson(Map<String, dynamic> json) => PicMessage()
+  ..pic = PicData.fromJson(json['pic'] as Map<String, dynamic>)
+  ..pos = json['pos'] == null
+      ? null
+      : PicMessagePos.fromJson(json['pos'] as Map<String, dynamic>);
+
+Map<String, dynamic> _$PicMessageToJson(PicMessage instance) =>
+    <String, dynamic>{
+      'pic': instance.pic,
+      'pos': instance.pos,
+    };
+
+PicData _$PicDataFromJson(Map<String, dynamic> json) => PicData()
+  ..trId = json['tr_id'] as int
+  ..num = json['num'] as int
+  ..time = json['time'] as int
+  ..data = json['data'] as String;
+
+Map<String, dynamic> _$PicDataToJson(PicData instance) => <String, dynamic>{
+      'tr_id': instance.trId,
+      'num': instance.num,
+      'time': instance.time,
+      'data': instance.data,
+    };
+
+PicMessagePos _$PicMessagePosFromJson(Map<String, dynamic> json) =>
+    PicMessagePos()
+      ..lat = (json['lat'] as num).toDouble()
+      ..long = (json['long'] as num).toDouble()
+      ..acc = json['acc'] as int;
+
+Map<String, dynamic> _$PicMessagePosToJson(PicMessagePos instance) =>
+    <String, dynamic>{
+      'lat': instance.lat,
+      'long': instance.long,
+      'acc': instance.acc,
+    };

lib/protocoll_messages/track_message.dart

@@ -4,7 +4,7 @@ part 'track_message.g.dart';
 
 @JsonSerializable()
 class TrackMessage {
-  late TrackPosition pos;
+  TrackPosition? pos;
 
   TrackMessage();
 

lib/protocoll_messages/track_message.g.dart

@@ -7,7 +7,9 @@ part of 'track_message.dart';
 // **************************************************************************
 
 TrackMessage _$TrackMessageFromJson(Map<String, dynamic> json) => TrackMessage()
-  ..pos = TrackPosition.fromJson(json['pos'] as Map<String, dynamic>);
+  ..pos = json['pos'] == null
+      ? null
+      : TrackPosition.fromJson(json['pos'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$TrackMessageToJson(TrackMessage instance) =>
     <String, dynamic>{

lib/protocoll_messages/track_station_message.dart

@@ -10,7 +10,7 @@ class TrackStationMessage {
 
   late String time;
 
-  late FinTaskPos? pos;
+  FinTaskPos? pos;
 
   TrackStationMessage();
 

lib/protocoll_messages/zip_message.dart

@@ -61,7 +61,7 @@ class ZipReqZip {
 class ZipSetPos {
   late String zip;
 
-  late ZipTrack track;
+  ZipTrack? track;
 
   ZipSetPos();
 
@@ -75,7 +75,7 @@ class ZipSetPos {
 class ZipTrack {
   late String time;
 
-  late ZipTrackPos? pos;
+  ZipTrackPos? pos;
 
   ZipTrack();
 

lib/protocoll_messages/zip_message.g.dart

@@ -298,9 +298,13 @@ int _zipSetPosEstimateSize(
   Map<Type, List<int>> allOffsets,
 ) {
   var bytesCount = offsets.last;
-  bytesCount += 3 +
-      ZipTrackSchema.estimateSize(
-          object.track, allOffsets[ZipTrack]!, allOffsets);
+  {
+    final value = object.track;
+    if (value != null) {
+      bytesCount += 3 +
+          ZipTrackSchema.estimateSize(value, allOffsets[ZipTrack]!, allOffsets);
+    }
+  }
   bytesCount += 3 + object.zip.length * 3;
   return bytesCount;
 }
@@ -328,11 +332,10 @@ ZipSetPos _zipSetPosDeserialize(
 ) {
   final object = ZipSetPos();
   object.track = reader.readObjectOrNull<ZipTrack>(
-        offsets[0],
-        ZipTrackSchema.deserialize,
-        allOffsets,
-      ) ??
-      ZipTrack();
+    offsets[0],
+    ZipTrackSchema.deserialize,
+    allOffsets,
+  );
   object.zip = reader.readString(offsets[1]);
   return object;
 }
@@ -346,11 +349,10 @@ P _zipSetPosDeserializeProp<P>(
   switch (propertyId) {
     case 0:
       return (reader.readObjectOrNull<ZipTrack>(
-            offset,
-            ZipTrackSchema.deserialize,
-            allOffsets,
-          ) ??
-          ZipTrack()) as P;
+        offset,
+        ZipTrackSchema.deserialize,
+        allOffsets,
+      )) as P;
     case 1:
       return (reader.readString(offset)) as P;
     default:
@@ -360,6 +362,22 @@ P _zipSetPosDeserializeProp<P>(
 
 extension ZipSetPosQueryFilter
     on QueryBuilder<ZipSetPos, ZipSetPos, QFilterCondition> {
+  QueryBuilder<ZipSetPos, ZipSetPos, QAfterFilterCondition> trackIsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'track',
+      ));
+    });
+  }
+
+  QueryBuilder<ZipSetPos, ZipSetPos, QAfterFilterCondition> trackIsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'track',
+      ));
+    });
+  }
+
   QueryBuilder<ZipSetPos, ZipSetPos, QAfterFilterCondition> zipEqualTo(
     String value, {
     bool caseSensitive = true,
@@ -1046,7 +1064,9 @@ Map<String, dynamic> _$ZipReqZipToJson(ZipReqZip instance) => <String, dynamic>{
 
 ZipSetPos _$ZipSetPosFromJson(Map<String, dynamic> json) => ZipSetPos()
   ..zip = json['zip'] as String
-  ..track = ZipTrack.fromJson(json['track'] as Map<String, dynamic>);
+  ..track = json['track'] == null
+      ? null
+      : ZipTrack.fromJson(json['track'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$ZipSetPosToJson(ZipSetPos instance) => <String, dynamic>{
       'zip': instance.zip,