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

Erweiterungen

Browse Source
This commit is contained in:
Sven committed 2024-02-08 17:59:43 +01:00
1 parent e0b30366e5
commit efb55331d2
2 files changed
+37 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/content_views/main_page.dart
+5
View File
@@ -14,6 +14,7 @@ import 'package:stadtbote/model/status.dart';
import 'package:stadtbote/popups/accept_jobs_popup.dart'; import 'package:stadtbote/popups/accept_jobs_popup.dart';
import 'package:stadtbote/popups/infos_popup.dart'; import 'package:stadtbote/popups/infos_popup.dart';
import 'package:stadtbote/tools/message_service.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/job_received_message.dart';
import 'package:stadtbote/tools/messages/message_message.dart'; import 'package:stadtbote/tools/messages/message_message.dart';
import 'package:stadtbote/tools/messages/session_info_update.dart'; import 'package:stadtbote/tools/messages/session_info_update.dart';
@@ -250,6 +251,10 @@ class _MainPageState extends State<MainPage> {
MessageService().subscribe<MessageReceivedMessage>(Constants.messageTopicMessageReceived, this, (MessageReceivedMessage mesage) { MessageService().subscribe<MessageReceivedMessage>(Constants.messageTopicMessageReceived, this, (MessageReceivedMessage mesage) {
_refreshBadges(); _refreshBadges();
}); });
MessageService().subscribe<JobDeletedMessage>(Constants.messageTopicJobDeleted, this, (JobDeletedMessage job) {
_refreshBadges();
});
} }
void _exitMessages() { void _exitMessages() {
lib/popups/accept_jobs_popup.dart
+32 -13
View File
@@ -37,6 +37,12 @@ Future<void> showAcceptJobsPopup(BuildContext context, List<Job> jobs) async {
itemBuilder: (_, i) { itemBuilder: (_, i) {
var job = jobsSet.toList()[i]; var job = jobsSet.toList()[i];
String remarkString = '';
for (var remark in job.rem) {
remarkString += '$remark\n';
}
remarkString = remarkString.trim();
return ExpandableNotifier( return ExpandableNotifier(
child: ListTile( child: ListTile(
contentPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8), contentPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
@@ -50,7 +56,7 @@ Future<void> showAcceptJobsPopup(BuildContext context, List<Job> jobs) async {
), ),
child: badges.Badge( child: badges.Badge(
position: badges.BadgePosition.topEnd(top: -13, end: -5), position: badges.BadgePosition.topEnd(top: -13, end: -5),
showBadge: true, showBadge: false,
badgeContent: const Text( badgeContent: const Text(
'Neu', 'Neu',
style: TextStyle( style: TextStyle(
@@ -69,13 +75,25 @@ Future<void> showAcceptJobsPopup(BuildContext context, List<Job> jobs) async {
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
child: Column( child: Column(
children: [ children: [
Text(DateFormat('dd.MM.yyyy HH:mm').format(DateTime.parse(job.ordertime)).toString(), SizedBox(
textAlign: TextAlign.left), width: double.infinity,
Text('Auftragsnummer: ${job.id}'), child: Text(DateFormat('dd.MM.yyyy HH:mm').format(DateTime.parse(job.ordertime)).toString(),
Text(job.tours[0].comp), textAlign: TextAlign.left),
Text(job.tours[0].street), ),
Text(job.tours[0].city), SizedBox(width: double.infinity, child: Text('Auftragsnummer: ${job.id}', textAlign: TextAlign.left)),
const SizedBox(height: 20), SizedBox(width: double.infinity, child: Text(job.tours[0].comp, textAlign: TextAlign.left)),
SizedBox(width: double.infinity, child: Text(job.tours[0].street, textAlign: TextAlign.left)),
SizedBox(width: double.infinity, child: Text(job.tours[0].city, textAlign: TextAlign.left)),
Row(
children: [
Image.asset("assets/${mapVehicleTypeToImageName(job.vhtId)}", width: 60, height: 60),
const SizedBox(width: 10),
Text(
mapVehicleTypeToText(job.vhtId)
),
],
),
const SizedBox(height: 10),
ScrollOnExpand( ScrollOnExpand(
scrollOnExpand: true, scrollOnExpand: true,
scrollOnCollapse: false, scrollOnCollapse: false,
@@ -92,7 +110,7 @@ Future<void> showAcceptJobsPopup(BuildContext context, List<Job> jobs) async {
)), )),
collapsed: const SizedBox(), collapsed: const SizedBox(),
expanded: Column( expanded: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[ children: <Widget>[
Container( Container(
height: 200, height: 200,
@@ -104,7 +122,10 @@ Future<void> showAcceptJobsPopup(BuildContext context, List<Job> jobs) async {
width: 0.5, width: 0.5,
), ),
), ),
child: const Text('asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd '), child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text(remarkString),
),
), ),
], ],
), ),
@@ -153,7 +174,5 @@ _sendAnswer(Job job, int item) {
MqttCore.instance.publishPayloadMessage("job", message.toJson()); MqttCore.instance.publishPayloadMessage("job", message.toJson());
job.state = 9; job.state = 9;
MyApp.isarInstance.writeTxnSync(() => { MyApp.isarInstance.writeTxnSync(() => {MyApp.isarInstance.jobs.putSync(job)});
MyApp.isarInstance.jobs.putSync(job)
});
} }