Assecutor/stadtbote-app
4
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into new_appserver

Browse Source 
# 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
This commit is contained in:
Sven committed 2024-03-26 12:56:04 +01:00
2 parents 12a351e604 a683ea0ff1
commit 880cdd65ff
74 files changed
+2463 -441
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/content_views/accepted_jobs_page.dart
+8 -2
View File
@@ -45,6 +45,12 @@ class _AcceptedJobsPageState extends State<AcceptedJobsPage> {
void initState() {
Future.delayed(const Duration(seconds: 0), () async {
_jobs = await MyApp.isarInstance.jobs.filter().stateEqualTo(Constants.stateAccepted).findAll();
_jobs.sort((job1, job2) {
var date1 = DateTime.parse(job1.ordertime).millisecondsSinceEpoch;
var date2 = DateTime.parse(job2.ordertime).millisecondsSinceEpoch;
return date1 - date2;
});
_initCompleted = true;
@@ -88,8 +94,8 @@ class _AcceptedJobsPageState extends State<AcceptedJobsPage> {
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Text(
DateFormat('dd.MM.yyyy HH:mm').format(DateTime.parse(job.ordertime)).toString(),
style: TextStyle(backgroundColor: isJobInFuture(job) ? Colors.yellow : Colors.white),
DateFormat('dd.MM.yyyy HH:mm').format(DateTime.parse(job.ordertime).toLocal()).toString(),
style: TextStyle(backgroundColor: isJobInFuture(job) ? Colors.yellow : Colors.transparent),
textAlign: TextAlign.left,
),
Text(
lib/content_views/approach_area_page.dart
+43 -54
View File
@@ -1,12 +1,13 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:isar/isar.dart';
import 'package:stadtbote/content_views/utils/content_view_widget.dart';
import 'package:stadtbote/content_views/utils/header_info.dart';
import 'package:stadtbote/model/rank.dart';
import 'package:stadtbote/model/ranking.dart';
import 'package:stadtbote/popups/tasks_popups/zip_popup.dart';
import 'package:stadtbote/protocoll_messages/zip_message.dart';
import 'package:stadtbote/tools/constants.dart';
import 'package:stadtbote/tools/message_service.dart';
import 'package:stadtbote/tools/messages/ranking_updated.dart';
import 'package:stadtbote/tools/mqtt_core.dart';
import '../main.dart';
@@ -43,21 +44,30 @@ class ApproachAreaPage extends ContentViewWidget {
}
class _ApproachAreaPageState extends State<ApproachAreaPage> {
late List<Rank>? _rankings;
late Ranking? _ranking;
late bool _initCompleted = false;
@override
void initState() {
super.initState();
Future.delayed(const Duration(seconds: 0), () async {
_rankings = await MyApp.isarInstance.ranks.where().findAll();
_ranking = await MyApp.isarInstance.rankings.where().findFirst();
_initCompleted = true;
setState(() {});
});
super.initState();
_initMessages();
}
@override
void deactivate() {
super.deactivate();
MessageService().unsubscribe(Constants.messageTopicRankingUpdated, this);
}
@override
@@ -84,18 +94,16 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
List<Widget> _fillColumns() {
List<Widget> columns = [];
if (_rankings != null) {
for (int i = 0; i < _rankings!.length; i++) {
var rank = _rankings![i];
if (_ranking != null) {
for (int i = 0; i < _ranking!.ranks.length; i++) {
var rank = _ranking!.ranks[i];
List<Widget> entries = [];
entries.add(
GestureDetector(
onTap: ()=> {
onTap: () => {
if (i == 0) {
showZipPopup(context, 'ACHTUNG: Wenn Sie Ihre PLZ ändern, verlieren Sie Ihr Ranking!\n', 'Freimelden', (zip) => {_sendZip(rank, zip, ModeEnum.set)}),
} else {
showZipPopup(context, 'ACHTUNG: Wenn Sie Ihre PLZ ändern, verlieren Sie Ihr Ranking!\n', 'OK', (zip) => {_sendZip(rank, zip, ModeEnum.request)}),
}
},
child: Container(
@@ -103,7 +111,7 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
margin: const EdgeInsets.all(2),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: i == 0 ? Colors.lightGreen : Colors.white,
color: i == 0 ? Constants.colorPrimary : Colors.white,
border: Border.all(
color: Colors.grey,
width: 0.5,
@@ -114,10 +122,11 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
child: Column(children: [
Text(
rank.zip,
style: const TextStyle(fontSize: 20),
style: TextStyle(fontSize: 20, color: (i == 0 ? Colors.white : Colors.black)),
),
Text(
rank.area,
style: TextStyle(fontSize: 13, color: (i == 0 ? Colors.white : Colors.black)),
)
]
)
@@ -168,56 +177,36 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> {
}
_sendZip(Rank rank, String zip, ModeEnum mode) {
var message = ZipMessage();
var zipMessage = ZipMessage();
if (mode == ModeEnum.set) {
var position = MyApp.currentPosition;
message.setPos = ZipSetPos();
message.setPos!.zip = zip;
zipMessage.setPos = ZipSetPos();
zipMessage.setPos!.zip = zip;
if (position != null) {
message.setPos!.track = ZipTrack();
message.setPos!.track.time = DateTime.now().toIso8601String();
message.setPos!.track.pos = ZipTrackPos();
message.setPos!.track.pos!.lat = position.latitude;
message.setPos!.track.pos!.long = position.longitude;
message.setPos!.track.pos!.acc = position.accuracy.toInt();
zipMessage.setPos!.track = ZipTrack();
zipMessage.setPos!.track!.time = DateTime.now().toIso8601String();
zipMessage.setPos!.track!.pos = ZipTrackPos();
zipMessage.setPos!.track!.pos!.lat = position.latitude;
zipMessage.setPos!.track!.pos!.long = position.longitude;
zipMessage.setPos!.track!.pos!.acc = position.accuracy.toInt();
}
} else {
message.reqZip = ZipReqZip();
message.reqZip!.id = rank.id;
message.reqZip!.zip = zip;
zipMessage.reqZip = ZipReqZip();
zipMessage.reqZip!.id = rank.id;
zipMessage.reqZip!.zip = zip;
}
MqttCore.instance.publishText("set_location", jsonEncode(message.toJson()));
MqttCore.instance.publishPayloadMessage("rank", zipMessage.toJson());
}
}
/*
private void SendMessage(int columnNumber, string zipNumber)
{
var payloadObject = new JObject();
_initMessages() {
MessageService().subscribe<RankingUpdated>(Constants.messageTopicRankingUpdated, this, (rankingUpdateMessage) async {
_ranking = await MyApp.isarInstance.rankings.where().findFirst();
if (columnNumber == 0)
{
var setPosObject = new JObject();
payloadObject.Add(new JProperty("set_pos", setPosObject));
setPosObject.Add(new JProperty("zip", zipNumber));
setPosObject.Add(new JProperty("track", CreateTrackObject()));
}
else
{
var regZipObject = new JObject();
payloadObject.Add(new JProperty("reg_zip", regZipObject));
regZipObject.Add(new JProperty("id", columnNumber));
regZipObject.Add(new JProperty("zip", zipNumber));
}
var json = payloadObject.ToString();
App.Core.SendJsonMessageAsync("rank", payloadObject);
}
*/
setState(() {});
});
}
}
lib/content_views/assigned_jobs_page.dart
+11 -5
View File
@@ -1,5 +1,3 @@
import 'dart:convert';
import 'package:expandable/expandable.dart';
import 'package:flutter/material.dart';
import 'package:isar/isar.dart';
@@ -10,7 +8,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/refresh_badges_message.dart';
import 'package:stadtbote/tools/messages/job_deleted_message.dart';
import 'package:stadtbote/tools/mqtt_core.dart';
import '../main.dart';
@@ -53,6 +51,8 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
Future.delayed(const Duration(seconds: 0), () async {
_entries = await _createListEntries();
_initMessages();
_initCompleted = true;
setState(() {});
@@ -86,6 +86,12 @@ 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),
@@ -119,7 +125,7 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
child: Column(
children: [
Text(
DateFormat('dd.MM.yyyy HH:mm').format(DateTime.parse(job.ordertime)).toString(),
DateFormat('dd.MM.yyyy HH:mm').format(DateTime.parse(job.ordertime).toLocal()).toString(),
textAlign: TextAlign.left,
style: TextStyle(backgroundColor: isJobInFuture(job) ? Colors.yellow : Colors.white),
),
@@ -144,7 +150,7 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
)),
collapsed: const SizedBox(),
expanded: Column(
crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
Container(
height: 200,
lib/content_views/finished_jobs_page.dart
+1 -1
View File
@@ -88,7 +88,7 @@ class _FinishedJobsPageState extends State<FinishedJobsPage> {
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Text(
DateFormat('dd.MM.yyyy HH:mm').format(DateTime.parse(job.ordertime)).toString(),
DateFormat('dd.MM.yyyy HH:mm').format(DateTime.parse(job.ordertime).toLocal()).toString(),
textAlign: TextAlign.left,
),
Text(
lib/content_views/main_page.dart
+60 -13
View File
@@ -1,5 +1,6 @@
import 'dart:convert';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:isar/isar.dart';
import 'package:stadtbote/content_views/accepted_jobs_page.dart';
@@ -10,19 +11,21 @@ import 'package:stadtbote/content_views/messages_page.dart';
import 'package:stadtbote/content_views/utils/content_view_widget.dart';
import 'package:stadtbote/content_views/utils/header_info.dart';
import 'package:stadtbote/model/job.dart';
import 'package:stadtbote/model/log_entry.dart';
import 'package:stadtbote/model/message.dart';
import 'package:stadtbote/model/session_status.dart';
import 'package:stadtbote/model/status.dart';
import 'package:stadtbote/popups/infos_popup.dart';
import 'package:stadtbote/protocoll_messages/device_log_response.dart';
import 'package:stadtbote/protocoll_messages/logout_message.dart';
import 'package:stadtbote/tools/message_service.dart';
import 'package:stadtbote/tools/messages/job_deleted_message.dart';
import 'package:stadtbote/tools/messages/job_received_message.dart';
import 'package:stadtbote/tools/messages/message_message.dart';
import 'package:stadtbote/tools/messages/refresh_badges_message.dart';
import 'package:stadtbote/tools/messages/session_info_update.dart';
import 'package:badges/badges.dart' as badges;
import 'package:stadtbote/tools/messages/status_info_update.dart';
import 'package:stadtbote/tools/messages/update_badges_message.dart';
import 'package:stadtbote/tools/mqtt_core.dart';
import '../main.dart';
@@ -30,8 +33,8 @@ import '../tools/constants.dart';
import '../tools/util.dart';
class MainPage extends ContentViewWidget {
final ValueNotifier<String> _zipValueNotifier = ValueNotifier("----");
final ValueNotifier<String> sidValueNotifier = ValueNotifier("----");
final ValueNotifier<String> _zipValueNotifier = ValueNotifier("-----");
final ValueNotifier<String> sidValueNotifier = ValueNotifier("-----");
MainPage({super.key});
@@ -233,7 +236,13 @@ class _MainPageState extends State<MainPage> {
getDefaultButton(
_loggedOut ? 'Anmelden' : 'Abmelden',
image: Image.asset(_loggedOut ? 'assets/anmelden.png' : 'assets/abmelden.png', width: 30, height: 30),
() async => {_logout()}),
() async {
if (!kDebugMode) {
_logout(context);
} else {
_test();
}
}),
Expanded(
child: Container(
decoration: BoxDecoration(
@@ -278,7 +287,7 @@ class _MainPageState extends State<MainPage> {
_refreshBadges();
});
MessageService().subscribe<RefreshBadgesMessage>(Constants.messageTopicRefreshBadges, this, (RefreshBadgesMessage refreshMessage) {
MessageService().subscribe<UpdateBadgesMessage>(Constants.messageTopicUpdateBadges, this, (UpdateBadgesMessage message) {
_refreshBadges();
});
}
@@ -312,20 +321,58 @@ class _MainPageState extends State<MainPage> {
}
}
_logout() {
_logout(context) {
if (!_loggedOut) {
_sendLogoutMessage();
Future.delayed(const Duration(seconds: 1), () async {
MqttCore.instance.diconnect();
});
showLogoutAlertDialog(context);
} else {
MqttCore.setup();
_loggedOut = false;
setState(() {});
}
}
_loggedOut = !_loggedOut;
showLogoutAlertDialog(BuildContext context) {
Widget yesButton = TextButton(
child: const Text("Ja"),
onPressed: () {
Navigator.of(context).pop();
_sendLogoutMessage();
setState(() {});
Future.delayed(const Duration(seconds: 1), () async {
MqttCore.instance.diconnect();
});
_loggedOut = true;
setState(() {});
},
);
Widget noButton = TextButton(
child: const Text("Nein"),
onPressed: () {
Navigator.of(context).pop();
},
);
// set up the AlertDialog
AlertDialog alert = AlertDialog(
title: const Text("Warnung"),
content: const Text("Wollen Sie sich wirklich abmelden?"),
actions: [
yesButton, noButton,
],
);
// show the dialog
showDialog(
context: context,
builder: (BuildContext context) {
return alert;
},
);
}
_sendLogoutMessage() {
lib/content_views/messages_page.dart
+20 -18
View File
@@ -8,6 +8,7 @@ import 'package:stadtbote/content_views/utils/content_view_widget.dart';
import 'package:stadtbote/content_views/utils/header_info.dart';
import 'package:stadtbote/main.dart';
import 'package:stadtbote/model/message.dart' as sbmessage;
import 'package:stadtbote/model/message.dart';
import 'package:stadtbote/model/session_status.dart';
import 'package:stadtbote/tools/mqtt_core.dart';
@@ -95,16 +96,17 @@ class _MessagesPageState extends State<MessagesPage> {
void _handleSendPressed(types.PartialText text) async {
var now = DateTime.now();
var message = sbmessage.Message();
message.text = [text.text];
message.from = _sid;
message.subj = '';
message.time = now.toIso8601String();
message.read = true;
message.id = await sbmessage.Message.getNextId();
var message = MessageMessage();
message.mssg = sbmessage.Message();
message.mssg.text = [text.text];
message.mssg.from = _sid;
message.mssg.subj = '';
message.mssg.time = now.toUtc().toIso8601String();
message.mssg.read = true;
message.mssg.id = await sbmessage.Message.getNextId();
MyApp.isarInstance.writeTxnSync(() {
MyApp.isarInstance.messages.putSync(message);
await MyApp.isarInstance.writeTxn(() async {
await MyApp.isarInstance.messages.put(message.mssg);
});
var json = jsonEncode(message.toJson());
@@ -114,7 +116,7 @@ class _MessagesPageState extends State<MessagesPage> {
_messages.insert(0, types.TextMessage(
author: _user,
createdAt: now.millisecondsSinceEpoch,
id: message.id.toString(),
id: message.mssg.id.toString(),
text: text.text,
));
@@ -132,18 +134,18 @@ class _MessagesPageState extends State<MessagesPage> {
}
text = text.trim();
_messages.insert(0, types.TextMessage(
_messages.add(types.TextMessage(
author: message.from == _sid ? _user : _central,
createdAt: DateTime
.parse(message.time)
.millisecondsSinceEpoch,
createdAt: DateTime.parse(message.time).toLocal().millisecondsSinceEpoch,
id: message.id.toString(),
text: text,
));
_messages.sort((a, b) => b.createdAt! > a.createdAt! ? 1 : 0);
message.read = true;
MyApp.isarInstance.writeTxnSync(() {
MyApp.isarInstance.messages.putSync(message);
await MyApp.isarInstance.writeTxn(() async {
await MyApp.isarInstance.messages.put(message);
});
}
@@ -181,8 +183,8 @@ class _MessagesPageState extends State<MessagesPage> {
),
const SizedBox(width: 20),
Expanded(
child: getDefaultButton('Ja', () => {
MyApp.isarInstance.writeTxnSync(() => {MyApp.isarInstance.messages.deleteSync(int.parse(message.id))}),
child: getDefaultButton('Ja', () async => {
await MyApp.isarInstance.writeTxnSync(() async => { await MyApp.isarInstance.messages.delete(int.parse(message.id))}),
_fetchMessages(),
lib/content_views/task_list_page.dart
+63 -25
View File
@@ -20,6 +20,7 @@ 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/pic_message.dart';
import 'package:stadtbote/tools/constants.dart';
import 'package:stadtbote/tools/message_service.dart';
import 'package:stadtbote/tools/mqtt_core.dart';
@@ -64,11 +65,17 @@ class _TaskListPageState extends State<TaskListPage> {
late List<TaskInfo> _taskList;
List<Uint8List> _photos = [];
late String _commisionNumber;
@override
void initState() {
Future.delayed(const Duration(seconds: 0), () async {
_taskList = await _fetchTaskList();
_commisionNumber = widget.tour.com ?? "";
_initCompleted = true;
setState(() {});
@@ -93,8 +100,21 @@ class _TaskListPageState extends State<TaskListPage> {
child: AbsorbPointer(
absorbing: widget.readOnly,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: steps,
children: [
Visibility(
visible: _commisionNumber.length > 0,
child: Row(
children: [
Text('Komm-#: $_commisionNumber', style: const TextStyle(fontSize: 20), textAlign: TextAlign.left),
],
),
),
const SizedBox(height: 10),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: steps,
),
],
),
),
),
@@ -125,7 +145,7 @@ class _TaskListPageState extends State<TaskListPage> {
left: 16.5,
top: i == 0 ? 40 : 40,
child: Container(
height: i == widget.tour.tasks!.length - 1 ? 0 : 20,
height: i == widget.tour.tasks.length - 1 ? 0 : 20,
width: 6,
color: isTaskActive(i) ? Constants.colorPrimary : Constants.colorPrimaryOpaque,
),
@@ -159,12 +179,16 @@ class _TaskListPageState extends State<TaskListPage> {
),
),
const SizedBox(height: 5),
Text(
taskInfo.additionalText ?? '',
textAlign: TextAlign.left,
style: TextStyle(
color: textColor,
fontSize: 12.0,
SizedBox(
width: MediaQuery.of(context).size.width * 0.7,
child: Text(
taskInfo.additionalText ?? '',
textAlign: TextAlign.left,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: textColor,
fontSize: 12.0,
),
),
),
],
@@ -187,7 +211,7 @@ class _TaskListPageState extends State<TaskListPage> {
Future<List<TaskInfo>> _fetchTaskList() async {
List<TaskInfo> taskList = [];
for(var task in widget.tour.tasks!) {
for(var task in widget.tour.tasks) {
var taskInfo = await MyApp.isarInstance.taskInfos.filter().sIdEqualTo(task.sId).findFirst();
if (taskInfo == null) {
taskInfo = TaskInfo();
@@ -268,6 +292,8 @@ class _TaskListPageState extends State<TaskListPage> {
taskInfo.additionalText = comissionNumber;
taskInfo.completed = true;
_commisionNumber = comissionNumber;
setState(() {});
_finishTaskProcessing(taskInfo);
@@ -282,6 +308,7 @@ class _TaskListPageState extends State<TaskListPage> {
answer.codes!.add(barcode);
}
taskInfo.answer = jsonEncode(answer.toJson());
taskInfo.additionalText = "Barcodes gescannt";
taskInfo.completed = true;
@@ -292,13 +319,17 @@ class _TaskListPageState extends State<TaskListPage> {
}
_processTakePhotos(TaskInfo taskInfo) {
showTakePhotosPopup(context, taskInfo, () {
taskInfo.additionalText = "Fotos aufgenommen";
taskInfo.completed = true;
showTakePhotosPopup(context, taskInfo, (List<Uint8List>? photos) {
if (photos != null) {
_photos = photos;
setState(() {});
taskInfo.additionalText = "Fotos aufgenommen";
taskInfo.completed = true;
_finishTaskProcessing(taskInfo);
setState(() {});
_finishTaskProcessing(taskInfo);
}
});
}
@@ -308,6 +339,7 @@ class _TaskListPageState extends State<TaskListPage> {
answer.val = notice;
taskInfo.answer = jsonEncode(answer.toJson());
taskInfo.additionalText = notice;
taskInfo.completed = true;
_finishTaskProcessing(taskInfo);
@@ -349,23 +381,29 @@ class _TaskListPageState extends State<TaskListPage> {
}
void _processSignature(TaskInfo taskInfo) {
MyApp.suppressAcceptDialog = true;
SystemChrome.setPreferredOrientations([DeviceOrientation.landscapeLeft]);
Future.delayed(const Duration(seconds: 1), () async {
showSignaturePopup(context, taskInfo, () {
var answer = _createAnswerHeader(taskInfo);
answer.sign = 'A110';
taskInfo.answer = jsonEncode(answer.toJson());
taskInfo.completed = true;
showSignaturePopup(context, taskInfo, (String? signature) {
MyApp.suppressAcceptDialog = false;
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
_sendFinTourMessage();
if (signature != null) {
var answer = _createAnswerHeader(taskInfo);
answer.sign = signature;
_finishTaskProcessing(taskInfo);
taskInfo.answer = jsonEncode(answer.toJson());
taskInfo.completed = true;
MessageService().publish<PopContentViewMessage>(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 2));
_sendFinTourMessage();
_finishTaskProcessing(taskInfo);
MessageService().publish<PopContentViewMessage>(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 2));
}
});
});
}
@@ -407,7 +445,7 @@ class _TaskListPageState extends State<TaskListPage> {
message.task.pos!.long = position.longitude;
}
MqttCore.instance.publishText("fin_task", jsonEncode(message.toJson()));
MqttCore.instance.publishPayloadMessage("job", finTaskMessage.toJson());
}
FinTourTask _createAnswerHeader(TaskInfo taskInfo) {
lib/content_views/tour_list_page.dart
+27 -10
View File
@@ -63,7 +63,7 @@ class _TourListPageState extends State<TourListPage> {
return Util.getWaitWidget(context);
}
late List<Widget> jobWidgets = _createjobWidgets();
late List<Widget> jobWidgets = _createTourWidgets();
return Padding(
padding: const EdgeInsets.all(18.0),
@@ -124,14 +124,26 @@ class _TourListPageState extends State<TourListPage> {
);
}
List<Widget> _createjobWidgets() {
List<Widget> jobWidgets = [];
List<Widget> _createTourWidgets() {
List<Widget> tourWidgets = [];
JobTour? lastTour;
for (var tour in _tours) {
bool tourActive = false;
if (lastTour == null) {
tourActive = true;
} else {
if (lastTour.state != 0) {
tourActive = true;
}
}
Color color = Colors.transparent;
switch (tour.state) {
case 0:
color = Colors.white;
color = tourActive ? Colors.white : Colors.grey;
break;
case 1:
@@ -143,11 +155,17 @@ class _TourListPageState extends State<TourListPage> {
break;
}
jobWidgets.add(
lastTour = tour;
tourWidgets.add(
ListTile(
contentPadding: const EdgeInsets.all(0),
onTap: () {
_clicked(tour);
if (tourActive) {
_clicked(tour, false);
} else {
_clicked(tour, true);
}
},
title: Container(
decoration: BoxDecoration(
@@ -179,11 +197,10 @@ class _TourListPageState extends State<TourListPage> {
);
}
return jobWidgets;
return tourWidgets;
}
void _clicked(JobTour tour) {
MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView,
arguments: TourDetailsPage(job: widget.job, tour: tour, readOnly: tour.state != 0));
void _clicked(JobTour tour, bool readOnly) {
MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: TourDetailsPage(job: widget.job, tour: tour, readOnly: readOnly));
}
}