Erweiterungen

lib/content_views/task_list_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:intl/intl.dart';
 import 'package:isar/isar.dart';
 import 'package:kumi_popup_window/kumi_popup_window.dart';
 import 'package:stadtbote/content_views/utils/content_view_widget.dart';
@@ -212,24 +213,50 @@ class _TaskListPageState extends State<TaskListPage> {
     }
   }
 
-  void _processTaskArrivedOrFinished(TaskInfo taskInfo) {
+  _processTaskArrivedOrFinished(TaskInfo taskInfo) {
     _popup = showTaskArrivedPopup(context, taskInfo, () => {
-      _popup.dismiss(context),
+      _finishProcessTaskArrivedOrFinished(taskInfo)
     });
   }
 
-  void _processCommissionNumber(TaskInfo taskInfo) {
-    _popup = showCommisionNumberPopup(context, taskInfo, () => {
-      _popup.dismiss(context),
+  _finishProcessTaskArrivedOrFinished(TaskInfo taskInfo) {
+    _popup.dismiss(context);
+
+    DateFormat dateFormat = DateFormat("dd.MM.yyyy HH:mm");
+
+    taskInfo.additionalText = dateFormat.format(DateTime.now());
+
+    setState(() {});
+  }
+
+  _processCommissionNumber(TaskInfo taskInfo) {
+    _popup = showComissionNumberPopup(context, taskInfo, (text) => {
+      _finishProcessCommissionNumber(taskInfo, text)
     });
   }
 
-  void _processScanBarcodes(TaskInfo taskInfo) {
-    _popup = showScanBarcodesPopup(context, taskInfo, () => {
-      _popup.dismiss(context)
+  _finishProcessCommissionNumber(TaskInfo taskInfo, String comissionNumber) {
+    _popup.dismiss(context);
+
+    taskInfo.additionalText = comissionNumber;
+
+    setState(() {});
+  }
+
+  _processScanBarcodes(TaskInfo taskInfo) {
+    _popup = showScanBarcodesPopup(context, taskInfo, (List<String> barcodes) => {
+      _finishProcessScanBarcodes(taskInfo, barcodes)
     });
   }
 
+  _finishProcessScanBarcodes(TaskInfo taskInfo, List<String> barcodess) {
+    _popup.dismiss(context);
+
+    taskInfo.additionalText = "Barcodes gescannt";
+
+    setState(() {});
+  }
+
   void _processTakePhotos(TaskInfo taskInfo) {
     _popup = showTakePhotosPopup(context, taskInfo, () => {
       _popup.dismiss(context)
@@ -237,17 +264,33 @@ class _TaskListPageState extends State<TaskListPage> {
   }
 
   void _processStationNotice(TaskInfo taskInfo) {
-    _popup = showStationNoticePopup(context, taskInfo, () => {
-      _popup.dismiss(context)
+    _popup = showStationNoticePopup(context, taskInfo, (notice) => {
+      _finishProcessStationNotice(taskInfo, notice)
     });
   }
 
+  _finishProcessStationNotice(TaskInfo taskInfo, String notice) {
+    _popup.dismiss(context);
+
+    taskInfo.additionalText = notice;
+
+    setState(() {});
+  }
+
   void _processReceiptGiver(TaskInfo taskInfo) {
-    _popup = showReceiptGiverPopup(context, taskInfo, () => {
-      _popup.dismiss(context)
+    _popup = showReceiptGiverPopup(context, taskInfo, (receiptGiver) => {
+      _finishReceiptGiver(taskInfo, receiptGiver)
     });
   }
 
+  _finishReceiptGiver(TaskInfo taskInfo, String receiptGiver) {
+    _popup.dismiss(context);
+
+    taskInfo.additionalText = receiptGiver;
+
+    setState(() {});
+  }
+
   void _processSignature(TaskInfo taskInfo) {
     SystemChrome.setPreferredOrientations([DeviceOrientation.landscapeLeft]);
 

lib/popups/tasks_popups/commision_number_popup.dart

@@ -4,7 +4,7 @@ import 'package:kumi_popup_window/kumi_popup_window.dart';
 import 'package:stadtbote/model/task_info.dart';
 import 'package:stadtbote/tools/util.dart';
 
-KumiPopupWindow showCommisionNumberPopup(BuildContext context, TaskInfo taskInfo, Function() onFinished) {
+KumiPopupWindow showComissionNumberPopup(BuildContext context, TaskInfo taskInfo, Function(String) onFinished) {
   return showPopupWindow(
     context,
     //childSize:Size(240, MediaQuery.of(context).size.width * 0.8),
@@ -56,8 +56,9 @@ KumiPopupWindow showCommisionNumberPopup(BuildContext context, TaskInfo taskInfo
                       type: TextInputType.text, formatter: [FilteringTextInputFormatter.singleLineFormatter], controller: textEditingController, autofocus: true),
                   const SizedBox(height: 20),
                   getDefaultButton('Übernehmen', () => {
-                    onFinished()
-                  })                ],
+                    onFinished(textEditingController.text)
+                  })
+                ],
               ),
             ),
           ));

lib/popups/tasks_popups/receipt_giver_popup.dart

@@ -4,7 +4,7 @@ import 'package:kumi_popup_window/kumi_popup_window.dart';
 import 'package:stadtbote/model/task_info.dart';
 import 'package:stadtbote/tools/util.dart';
 
-KumiPopupWindow showReceiptGiverPopup(BuildContext context, TaskInfo taskInfo, Function() onFinished) {
+KumiPopupWindow showReceiptGiverPopup(BuildContext context, TaskInfo taskInfo, Function(String) onFinished) {
   return showPopupWindow(
     context,
     //childSize:Size(240, MediaQuery.of(context).size.width * 0.8),
@@ -56,7 +56,7 @@ KumiPopupWindow showReceiptGiverPopup(BuildContext context, TaskInfo taskInfo, F
                       type: TextInputType.text, formatter: [FilteringTextInputFormatter.singleLineFormatter], controller: textEditingController, autofocus: true),
                   const SizedBox(height: 20),
                   getDefaultButton('Übernehmen', () => {
-                    onFinished()
+                    onFinished(textEditingController.text)
                   })
                 ],
               ),

lib/popups/tasks_popups/scan_barcodes_popup.dart

@@ -5,7 +5,7 @@ import 'package:kumi_popup_window/kumi_popup_window.dart';
 import 'package:stadtbote/model/task_info.dart';
 import 'package:stadtbote/tools/util.dart';
 
-KumiPopupWindow showScanBarcodesPopup(BuildContext context, TaskInfo taskInfo, Function() onFinished) {
+KumiPopupWindow showScanBarcodesPopup(BuildContext context, TaskInfo taskInfo, Function(List<String> barcodes) onFinished) {
   return showPopupWindow(
     context,
     //childSize:Size(240, MediaQuery.of(context).size.width * 0.8),
@@ -108,7 +108,7 @@ KumiPopupWindow showScanBarcodesPopup(BuildContext context, TaskInfo taskInfo, F
                     scanBarcode()
                   }),
                   getDefaultButton('Übernehmen', buttonHeight: 50, () => {
-                    onFinished()
+                    onFinished(scannedBarcodes)
                   })
                 ],
               ),

lib/popups/tasks_popups/station_notice_popup.dart

@@ -4,7 +4,7 @@ import 'package:kumi_popup_window/kumi_popup_window.dart';
 import 'package:stadtbote/model/task_info.dart';
 import 'package:stadtbote/tools/util.dart';
 
-KumiPopupWindow showStationNoticePopup(BuildContext context, TaskInfo taskInfo, Function() onFinished) {
+KumiPopupWindow showStationNoticePopup(BuildContext context, TaskInfo taskInfo, Function(String) onFinished) {
   return showPopupWindow(
     context,
     //childSize:Size(240, MediaQuery.of(context).size.width * 0.8),
@@ -62,7 +62,7 @@ KumiPopupWindow showStationNoticePopup(BuildContext context, TaskInfo taskInfo,
                         autofocus: true),
                   ),
                   const SizedBox(height: 20),
-                  getDefaultButton('Übernehmen', buttonHeight: 50, () => {onFinished()})
+                  getDefaultButton('Übernehmen', buttonHeight: 50, () => {onFinished(textEditingController.text)})
                 ],
               ),
             ),