Merge
This commit is contained in:
1 parent
880cdd65ff
commit
8586a23bfa
19 files changed
+179
-220
No files matched your search
@@ -1,3 +1,5 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:expandable/expandable.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:isar/isar.dart';
|
||||
@@ -8,7 +10,7 @@ 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/message_service.dart';
|
||||
import 'package:stadtbote/tools/messages/job_deleted_message.dart';
|
||||
import 'package:stadtbote/tools/messages/refresh_badges_message.dart';
|
||||
import 'package:stadtbote/tools/mqtt_core.dart';
|
||||
|
||||
import '../main.dart';
|
||||
@@ -86,12 +88,6 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
|
||||
|
||||
var jobs = await MyApp.isarInstance.jobs.filter().stateEqualTo(Constants.stateAssigned).findAll();
|
||||
for (var job in jobs) {
|
||||
String remarkString = '';
|
||||
for (var remark in job.rem) {
|
||||
remarkString += '$remark\n';
|
||||
}
|
||||
remarkString = remarkString.trim();
|
||||
|
||||
entries.add(ExpandableNotifier(
|
||||
child: ListTile(
|
||||
contentPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
|
||||
@@ -200,9 +196,9 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
|
||||
message.track = Track();
|
||||
message.track.time = DateTime.now().toUtc().toIso8601String();
|
||||
message.track.pos = FinTaskPos();
|
||||
message.track.pos.lat = currentPosition != null ? currentPosition.latitude : 0.0;
|
||||
message.track.pos.long = currentPosition != null ? currentPosition.longitude : 0.0;
|
||||
message.track.pos.acc = currentPosition != null ? currentPosition.accuracy.toInt() : 0;
|
||||
message.track.pos!.lat = currentPosition != null ? currentPosition.latitude : 0.0;
|
||||
message.track.pos!.long = currentPosition != null ? currentPosition.longitude : 0.0;
|
||||
message.track.pos!.acc = currentPosition != null ? currentPosition.accuracy.toInt() : 0;
|
||||
|
||||
MqttCore.instance.publishText("reaction", jsonEncode(message.toJson()));
|
||||
|
||||
@@ -216,4 +212,6 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
|
||||
|
||||
setState(() {});
|
||||
}
|
||||
|
||||
void _initMessages() {}
|
||||
}
|
||||
Reference in new issue
Block a user