fix: Stationsabschluss absichern und Kundenformulare anpassen

Sperrt nachträgliche Aufgabenabschlüsse in App und Backend und zeigt erledigte Aufträge trotz offener optionaler Aufgaben grün an. Ergänzt Regressionstests, die Anredeauswahl und optionale Steuerangaben für Kunden. Enthält App-Version 0.9.25, Backend-Version 0.9.26 und das aktualisierte Frontend-Bundle.
This commit is contained in:
Sven committed 2026-10-06 15:09:51 +02:00
1 parent 8758c53e5b
commit 5e6044e4b1
16 files changed
+638 -69

No files matched your search

+1 -1
View File
@@ -52,7 +52,7 @@ class DeliveryStation {
final tasks =
(json['tasks'] as List? ?? const []).map((rawTask) {
final taskJson = Map<String, dynamic>.from(rawTask as Map);
taskJson['stationOrder'] ??= stationOrder;
taskJson['stationOrder'] = stationOrder;
return Task.fromJson(taskJson);
}).toList()
..sort((a, b) => (a.taskOrder ?? 0).compareTo(b.taskOrder ?? 0));
+10
View File
@@ -6,6 +6,7 @@ class Job {
final String id; // Will store the timestamp as string
final String jobNumber;
final String status;
final List<int> completedStationOrders;
final DateTime createdAt;
final DateTime updatedAt;
final String createdBy;
@@ -61,6 +62,7 @@ class Job {
required this.id,
required this.jobNumber,
required this.status,
this.completedStationOrders = const [],
required this.createdAt,
required this.updatedAt,
required this.createdBy,
@@ -332,6 +334,12 @@ class Job {
id: idValue,
jobNumber: jobJson['jobNumber']?.toString() ?? '',
status: jobJson['status']?.toString() ?? 'UNKNOWN',
completedStationOrders:
(jobJson['completedStationOrders'] as List? ?? const [])
.map((value) => int.tryParse(value.toString()))
.whereType<int>()
.toSet()
.toList(),
createdAt: _parseDateTime(jobJson['createdAt']) ?? DateTime.now(),
updatedAt: _parseDateTime(jobJson['updatedAt']) ?? DateTime.now(),
createdBy: jobJson['createdBy']?.toString() ?? '',
@@ -391,6 +399,7 @@ class Job {
id: id,
jobNumber: t(jobNumber),
status: t(status),
completedStationOrders: List.of(completedStationOrders),
createdAt: createdAt,
updatedAt: updatedAt,
createdBy: t(createdBy),
@@ -446,6 +455,7 @@ class Job {
'id': id,
'jobNumber': jobNumber,
'status': status,
'completedStationOrders': completedStationOrders,
'createdAt': createdAt.toIso8601String(),
'updatedAt': updatedAt.toIso8601String(),
'createdBy': createdBy,
+52
View File
@@ -0,0 +1,52 @@
import 'job.dart';
import 'task.dart';
/// Combines server state with work confirmed locally while offline.
class JobProgress {
final Job job;
final Map<String, bool> taskStatuses;
final Set<int> completedStationOrders;
JobProgress(
this.job, {
this.taskStatuses = const {},
Set<int> localCompletedStations = const {},
}) : completedStationOrders = {
...job.completedStationOrders,
...localCompletedStations,
};
bool isTaskCompleted(Task task) =>
task.completed || taskStatuses[task.id] == true;
bool get isCancelled => job.status.toUpperCase() == 'CANCELLED';
bool get isCompleted {
if (isCancelled) return false;
if (const {'COMPLETED', 'DONE'}.contains(job.status.toUpperCase())) {
return true;
}
// Same rule as the backend: explicit final-station confirmation and all
// mandatory tasks completed. Open optional tasks do not prevent completion.
final lastStationOrder =
job.deliveryStations.isEmpty
? 0
: job.deliveryStations
.map((station) => station.stationOrder)
.reduce((a, b) => a > b ? a : b);
return completedStationOrders.contains(lastStationOrder) &&
job.tasks.where((task) => !task.optional).every(isTaskCompleted);
}
bool isStationClosed(int stationOrder) =>
isCancelled ||
isCompleted ||
completedStationOrders.contains(stationOrder);
bool canCompleteTask(Task task) =>
!isStationClosed(task.stationOrder ?? 0) && !isTaskCompleted(task);
int get completedTaskCount => job.tasks.where(isTaskCompleted).length;
bool get hasProgress =>
completedTaskCount > 0 || completedStationOrders.isNotEmpty;
}