Erweiterungen

lib/content_views/approach_area_page.dart

@@ -0,0 +1,69 @@
+import 'package:flutter/material.dart';
+import 'package:isar/isar.dart';
+import 'package:stadtbote/content_views/tour_list_page.dart';
+import 'package:stadtbote/content_views/utils/content_view_widget.dart';
+import 'package:stadtbote/content_views/utils/header_info.dart';
+import 'package:intl/intl.dart';
+import 'package:stadtbote/tools/message_service.dart';
+
+import '../main.dart';
+import '../model/job.dart';
+import '../tools/constants.dart';
+import '../tools/util.dart';
+
+class ApproachAreaPage extends ContentViewWidget {
+  const ApproachAreaPage({super.key});
+
+  @override
+  State<ApproachAreaPage> createState() => _ApproachAreaPageState();
+
+  @override
+  Future<HeaderInfo> getHeaderInfo(BuildContext context) async {
+    return HeaderInfo(
+        titleWidget: const Text(
+          'Angenommene Aufträge',
+          style: TextStyle(
+            color: Colors.white,
+            fontSize: 24.0,
+          ),
+        ),
+        rightButtonEnabled: true,
+        rightButtonVisible: true,
+        rightButtonImage: Util.fetchFutureIcon(const Icon(Icons.info_outline, size: 20.0, color: Colors.white)),
+        rightButtonOnPressed: () async {
+          await Util.startBrowser('https://app.assecutor.de/help/sb/app/context/001/index.html');
+        });
+  }
+}
+
+class _ApproachAreaPageState extends State<ApproachAreaPage> {
+  late List<Job> _jobs;
+
+  late bool _initCompleted = false;
+
+  @override
+  void initState() {
+    Future.delayed(const Duration(seconds: 0), () async {
+      _jobs = await MyApp.isarInstance.jobs.filter().stateEqualTo(1).findAll();
+
+      _initCompleted = true;
+
+      setState(() {});
+    });
+
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (!_initCompleted) {
+      return Util.getWaitWidget(context);
+    }
+
+    return const Text("Hello World!");
+  }
+
+  void _clicked(Job job) {
+    MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: TourListPage(job: job));
+  }
+}

lib/content_views/main_page.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:isar/isar.dart';
 import 'package:stadtbote/content_views/accepted_jobs_page.dart';
+import 'package:stadtbote/content_views/approach_area_page.dart';
 import 'package:stadtbote/content_views/assigned_jobs_page.dart';
 import 'package:stadtbote/content_views/finished_jobs_page.dart';
 import 'package:stadtbote/content_views/messages_page.dart';
@@ -132,8 +133,9 @@ class _MainPageState extends State<MainPage> {
                     child: getDefaultButton(
                         'Zugewiesene Aufträge',
                         image: Image.asset('assets/zugewiesene_auftraege.png', width: 30, height: 30),
-                        () => {MessageService()
-                            .publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const AssignedJobsPage())}),
+                        () => {
+                              MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const AssignedJobsPage())
+                            }),
                   );
                 },
               ),
@@ -162,7 +164,7 @@ class _MainPageState extends State<MainPage> {
                           'Angenommene Aufträge',
                           image: Image.asset('assets/angenommene_auftraege.png', width: 30, height: 30),
                           () => {
-                            MessageService()
+                                MessageService()
                                     .publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const AcceptedJobsPage())
                               }));
                 },
@@ -196,18 +198,15 @@ class _MainPageState extends State<MainPage> {
                       child: getDefaultButton(
                           'Nachrichten',
                           image: Image.asset('assets/nachrichten.png', width: 30, height: 30),
-                          () => {
-                            MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const MessagesPage())
-                              }));
+                          () =>
+                              {MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const MessagesPage())}));
                 },
               ),
               const SizedBox(height: 20),
               getDefaultButton(
                   'Anfahrtsbereich',
                   image: Image.asset('assets/anfahrtsbereich.png', width: 30, height: 30),
-                  () => {
-                        //BroadcastReceiver().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const FinishedJobsPage())
-                      }),
+                  () => {MessageService().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: const ApproachAreaPage())}),
               const SizedBox(height: 20),
               getDefaultButton(
                   'Abmelden',

lib/content_views/messages_page.dart

@@ -33,7 +33,7 @@ class MessagesPage extends ContentViewWidget {
         rightButtonVisible: true,
         rightButtonImage: Util.fetchFutureIcon(const Icon(Icons.info_outline, size: 20.0, color: Colors.white)),
         rightButtonOnPressed: () async {
-          showInfosPopup(context, await MyApp.isarInstance.status.where().findFirst());
+          await Util.startBrowser('https://app.assecutor.de/help/sb/app/context/003/index.html');
         });
   }
 }

lib/content_views/task_list_page.dart

@@ -1,4 +1,4 @@
-
+import 'dart:convert' show utf8;
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:intl/intl.dart';
@@ -46,11 +46,11 @@ class TaskListPage extends ContentViewWidget {
             fontSize: 24.0,
           ),
         ),
-        rightButtonEnabled: false,
-        rightButtonVisible: false,
-        rightButtonImage: null,
+        rightButtonEnabled: true,
+        rightButtonVisible: true,
+        rightButtonImage: Util.fetchFutureIcon(const Icon(Icons.info_outline, size: 20.0, color: Colors.white)),
         rightButtonOnPressed: () async {
-          //BroadcastReceiver().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: EmployeeEditProfileWidget());
+          await Util.startBrowser('https://app.assecutor.de/help/sb/app/context/002/index.html');
         });
   }
 }
@@ -148,7 +148,7 @@ class _TaskListPageState extends State<TaskListPage> {
                   mainAxisAlignment: MainAxisAlignment.start,
                   children: [
                     Text(
-                      taskInfo.task.topic,
+                      utf8.decode(taskInfo.task.topic.codeUnits),
                       textAlign: TextAlign.left,
                       style: TextStyle(
                         color: textColor,

lib/content_views/tour_list_page.dart

@@ -30,11 +30,11 @@ class TourListPage extends ContentViewWidget {
             fontSize: 24.0,
           ),
         ),
-        rightButtonEnabled: false,
-        rightButtonVisible: false,
-        rightButtonImage: null,
+        rightButtonEnabled: true,
+        rightButtonVisible: true,
+        rightButtonImage: Util.fetchFutureIcon(const Icon(Icons.info_outline, size: 20.0, color: Colors.white)),
         rightButtonOnPressed: () async {
-          //BroadcastReceiver().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: EmployeeEditProfileWidget());
+          await Util.startBrowser('https://app.assecutor.de/help/sb/app/context/004/index.html');
         });
   }
 }