Erweiterungen

lib/content_views/accepted_jobs_page.dart

@@ -71,6 +71,8 @@ class _AcceptedJobsPageState extends State<AcceptedJobsPage> {
     List<Widget> jobWidgets = [];
 
     for (var job in _jobs) {
+      var vehicleImage = "assets/${mapVehicleTypeToImageName(job.vhtId)}";
+
       jobWidgets.add(
         ListTile(
           onTap: () {
@@ -92,15 +94,15 @@ class _AcceptedJobsPageState extends State<AcceptedJobsPage> {
                   textAlign: TextAlign.left,
                 ),
                 Text(
-                  job.crFilter != null ? job.crFilter.toString() : "Kein CR-Filter vorhanden",
+                  job.crFilter != null ? job.crFilter.toString() : "",
                   textAlign: TextAlign.left,
                 ),
                 Row(
                   children: [
-                    const Icon(Icons.arrow_back, size: 30.0, color: Colors.black),
+                    Image.asset("assets/${mapVehicleTypeToImageName(job.vhtId)}", width: 60, height: 60),
                     const SizedBox(width: 10),
                     Text(
-                      job.vhtId.toString()
+                      mapVehicleTypeToText(job.vhtId)
                     ),
                   ],
                 ),

lib/content_views/tour_list_page.dart

@@ -4,6 +4,7 @@ import 'package:stadtbote/content_views/tour_details_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_tour.dart';
+import 'package:stadtbote/popups/map_popup.dart';
 
 import '../model/job.dart';
 import '../tools/constants.dart';
@@ -80,18 +81,36 @@ class _TourListPageState extends State<TourListPage> {
           Row(
             children: [
               Text(
-                widget.job.crFilter != null ? widget.job.crFilter.toString() : "Kein CR-Filter vorhanden",
+                widget.job.crFilter != null ? widget.job.crFilter.toString() : "",
                 textAlign: TextAlign.left,
               ),
             ],
           ),
           Row(
             children: [
-              const Icon(Icons.arrow_back, size: 30.0, color: Colors.black),
+              Image.asset("assets/${mapVehicleTypeToImageName(widget.job.vhtId)}", width: 60, height: 60),
               const SizedBox(width: 10),
-              Text(
+              Expanded(
-                  widget.job.vhtId.toString()
+                child: Text(
+                    mapVehicleTypeToText(widget.job.vhtId)
                 ),
+              ),
+              const SizedBox(width: 10),
+              SizedBox(
+                width: 100,
+                child: ElevatedButton(
+                    style: ButtonStyle(
+                      shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+                        RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(8.0),
+                          side: const BorderSide(color: Colors.grey),
+                        ),
+                      ),
+                      backgroundColor: MaterialStateProperty.all<Color>(Colors.lightGreen),
+                      foregroundColor: MaterialStateProperty.all<Color>(Colors.black),
+                    ),
+                    onPressed: () => { showMapPopup(context, widget.job.tours[0], widget.job.tours)},
+                    child: const Text("Karte")))
             ],
           ),
           Expanded(
@@ -112,6 +131,10 @@ class _TourListPageState extends State<TourListPage> {
     for (var tour in _tours) {
       Color color = Colors.transparent;
       switch(tour.state) {
+        case 0:
+          color = Colors.white;
+          break;
+
         case 1:
           color = Colors.lightGreen;
           break;
@@ -165,6 +188,8 @@ class _TourListPageState extends State<TourListPage> {
   }
 
   void _clicked(JobTour tour) {
+    if (tour.state == 0) {
       BroadcastReceiver().publish<ContentViewWidget>(Constants.messageTopicPushContentView, arguments: TourDetailsPage(job: widget.job, tour: tour));
     }
+  }
 }

lib/tools/util.dart

@@ -214,6 +214,88 @@ Widget getDefaultButton(String text, Function() onPressed, {Image? image, double
   );
 }
 
+String mapVehicleTypeToImageName(int vehType)
+{
+  switch (vehType) {
+    case 1:
+      return "fahrrad.png";
+
+    case 2:
+      return "pkw.png";
+
+    case 3:
+      return "kombi.png";
+
+    case 4:
+      return "kasten.png";
+
+    case 5:
+      return "bus.png";
+
+    case 6:
+      return "grbus.png";
+
+    case 7:
+      return "lkw.png";
+
+    case 8:
+      return "lkw_12.png";
+
+    case 10:
+      return "lkw_8.png";
+
+    case 11:
+      return "lkw_10.png";
+
+    case 12:
+      return "lkw_15.png";
+
+    case 13:
+      return "lkw_20.png";
+
+    case 999:
+      return "service.png";
+  }
+
+  return "unbekannt.png";
+}
+
+String mapVehicleTypeToText(int vehType) {
+  switch (vehType) {
+    case 1:
+      return "Fahrrad";
+
+    case 2:
+      return "Pkw";
+
+    case 3:
+      return "Kombi";
+
+    case 4:
+      return "Kasten";
+
+    case 5:
+      return "Bus";
+
+    case 6:
+      return "GrBus";
+
+    case 7:
+    case 8:
+    case 10:
+    case 11:
+    case 12:
+    case 13:
+    case 14:
+      return "Lkw";
+
+    case 999:
+      return "Service";
+  }
+
+  return "!UNBEKANTER VEHICLE TYPE!";
+}
+
 String mapTourMode(String mode) {
   var text = "";
   switch (mode) {