Fehlerkorrekturen und Erweiterungen
This commit is contained in:
1 parent
265d75a99b
commit
47b4c85133
14 files changed
+155
-125
No files matched your search
@@ -255,10 +255,10 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
|
||||
_processTaskArrivedOrFinished(TaskInfo taskInfo) {
|
||||
Util.logInfo('Task ${taskInfo.task.sId} called');
|
||||
|
||||
showTaskArrivedPopup(context, taskInfo, () {
|
||||
showTaskArrivedPopup(context, taskInfo, () async {
|
||||
DateFormat dateFormat = DateFormat("dd.MM.yyyy HH:mm");
|
||||
|
||||
var answer = _createAnswerHeader(taskInfo);
|
||||
var answer = await _createAnswerHeader(taskInfo);
|
||||
|
||||
taskInfo.answer = jsonEncode(answer.toJson());
|
||||
taskInfo.additionalText = dateFormat.format(DateTime.now());
|
||||
@@ -275,8 +275,8 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
|
||||
_processCommissionNumber(TaskInfo taskInfo) {
|
||||
Util.logInfo('Task ${taskInfo.task.sId} called');
|
||||
|
||||
showComissionNumberPopup(context, taskInfo, (comissionNumber) {
|
||||
var answer = _createAnswerHeader(taskInfo);
|
||||
showComissionNumberPopup(context, taskInfo, (comissionNumber) async {
|
||||
var answer = await _createAnswerHeader(taskInfo);
|
||||
answer.val = comissionNumber;
|
||||
|
||||
taskInfo.answer = jsonEncode(answer.toJson());
|
||||
@@ -294,8 +294,8 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
|
||||
/*_processScanBarcodes(TaskInfo taskInfo) {
|
||||
Util.logInfo('Task ${taskInfo.task.sId} called');
|
||||
|
||||
showScanBarcodesPopup(context, taskInfo, (List<String> barcodes) {
|
||||
var answer = _createAnswerHeader(taskInfo);
|
||||
showScanBarcodesPopup(context, taskInfo, (List<String> barcodes) async {
|
||||
var answer = await _createAnswerHeader(taskInfo);
|
||||
answer.codes = [];
|
||||
for(var barcode in barcodes) {
|
||||
answer.codes!.add(barcode);
|
||||
@@ -343,8 +343,8 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
|
||||
void _processStationNotice(TaskInfo taskInfo) {
|
||||
Util.logInfo('Task ${taskInfo.task.sId} called');
|
||||
|
||||
showStationNoticePopup(context, taskInfo, (notice) {
|
||||
var answer = _createAnswerHeader(taskInfo);
|
||||
showStationNoticePopup(context, taskInfo, (notice) async {
|
||||
var answer = await _createAnswerHeader(taskInfo);
|
||||
answer.val = notice;
|
||||
|
||||
taskInfo.answer = jsonEncode(answer.toJson());
|
||||
@@ -360,8 +360,8 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
|
||||
void _processReceiptGiver(TaskInfo taskInfo) {
|
||||
Util.logInfo('Task ${taskInfo.task.sId} called');
|
||||
|
||||
showReceiptGiverPopup(context, taskInfo, (receiptGiver, selectedTourEntry) {
|
||||
var answer = _createAnswerHeader(taskInfo);
|
||||
showReceiptGiverPopup(context, taskInfo, (receiptGiver, selectedTourEntry) async {
|
||||
var answer = await _createAnswerHeader(taskInfo);
|
||||
answer.code = selectedTourEntry.code;
|
||||
answer.val = receiptGiver;
|
||||
|
||||
@@ -379,8 +379,8 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
|
||||
Util.logInfo('Task ${taskInfo.task.sId} called');
|
||||
|
||||
Future.delayed(const Duration(seconds: 1), () async {
|
||||
showPickupDeliveryStatusPopup(context, taskInfo, (tourEntry, remark) {
|
||||
var answer = _createAnswerHeader(taskInfo);
|
||||
showPickupDeliveryStatusPopup(context, taskInfo, (tourEntry, remark) async {
|
||||
var answer = await _createAnswerHeader(taskInfo);
|
||||
answer.code = tourEntry!.code;
|
||||
answer.val = remark;
|
||||
|
||||
@@ -409,7 +409,7 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
|
||||
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
|
||||
|
||||
if (signature != null) {
|
||||
var answer = _createAnswerHeader(taskInfo);
|
||||
var answer = await _createAnswerHeader(taskInfo);
|
||||
answer.sign = signature;
|
||||
|
||||
taskInfo.answer = jsonEncode(answer.toJson());
|
||||
@@ -465,7 +465,7 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
|
||||
message.task.sId = taskInfo.task.sId;
|
||||
message.task.time = DateTime.now().toIso8601String();
|
||||
|
||||
var position = MyApp.currentPosition;
|
||||
var position = await MyApp.getCurrentPosition();
|
||||
if (position != null) {
|
||||
message.task.pos = FinTaskPos();
|
||||
message.task.pos!.lat = position.latitude;
|
||||
@@ -480,8 +480,8 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
|
||||
);
|
||||
}
|
||||
|
||||
FinTourTask _createAnswerHeader(TaskInfo taskInfo) {
|
||||
var position = MyApp.currentPosition;
|
||||
Future<FinTourTask> _createAnswerHeader(TaskInfo taskInfo) async {
|
||||
var position = await MyApp.getCurrentPosition();
|
||||
|
||||
var finTourTask = FinTourTask();
|
||||
finTourTask.sId = taskInfo.task.sId;
|
||||
@@ -503,7 +503,7 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
|
||||
finTourMessage.trId = widget.tour.id;
|
||||
finTourMessage.com = _commisionNumber;
|
||||
|
||||
var position = MyApp.currentPosition;
|
||||
var position = await MyApp.getCurrentPosition();
|
||||
if (position != null) {
|
||||
finTourMessage.track = Track();
|
||||
finTourMessage.track!.time = DateTime.now().toIso8601String();
|
||||
|
||||
Reference in new issue
Block a user