softvisor/Holzleitner-Lieferservice-App
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented settings, new scan, enhanced UI/UX

Browse Source
This commit is contained in:
Dennis Nemec
2025-11-04 16:52:39 +01:00
parent b19a6e1cd4
commit 7ea9108f62
79 changed files with 3306 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
lib/feature/delivery/overview/presentation/delivery_overview.dart
View File

@ -6,32 +6,48 @@ import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_list.dart';
import 'package:hl_lieferservice/model/tour.dart';
import '../../../../model/delivery.dart';
import '../../../authentication/bloc/auth_bloc.dart';
import '../../../authentication/bloc/auth_state.dart';
class DeliveryOverview extends StatefulWidget {
const DeliveryOverview({super.key, required this.tour});
const DeliveryOverview({super.key, required this.tour, required this.distances});
final Tour tour;
final Map<String, double> distances;
@override
State<StatefulWidget> createState() => _DeliveryOverviewState();
}
class _DeliveryOverviewState extends State<DeliveryOverview> {
String? _selectedCarPlate;
int? _selectedCarId;
late List<Delivery> _deliveries;
@override
void initState() {
super.initState();
// Select the first car for initialization
_selectedCarPlate = widget.tour.driver.cars.firstOrNull?.plate;
_selectedCarId = widget.tour.driver.cars.firstOrNull?.id;
_updateDeliveries();
}
@override
void didUpdateWidget(covariant DeliveryOverview oldWidget) {
super.didUpdateWidget(oldWidget);
_updateDeliveries();
}
void _updateDeliveries() {
_deliveries = [...widget.tour.deliveries];
}
Future<void> _loadTour() async {
Authenticated state = context.read<AuthBloc>().state as Authenticated;
context.read<TourBloc>().add(LoadTour(teamId: state.teamId));
Authenticated state = context
.read<AuthBloc>()
.state as Authenticated;
context.read<TourBloc>().add(LoadTour(teamId: state.user.number));
}
Widget _carSelection() {
@ -41,47 +57,58 @@ class _DeliveryOverviewState extends State<DeliveryOverview> {
child: ListView(
scrollDirection: Axis.horizontal,
children:
widget.tour.driver.cars.map((car) {
Color? backgroundColor;
Color? iconColor = Theme.of(context).primaryColor;
Color? textColor;
widget.tour.driver.cars.map((car) {
Color? backgroundColor;
Color? iconColor = Theme
.of(context)
.primaryColor;
Color? textColor;
if (_selectedCarPlate == car.plate) {
backgroundColor = Theme.of(context).primaryColor;
textColor = Theme.of(context).colorScheme.onSecondary;
iconColor = Theme.of(context).colorScheme.onSecondary;
}
if (_selectedCarId == car.id) {
backgroundColor = Theme
.of(context)
.primaryColor;
textColor = Theme
.of(context)
.colorScheme
.onSecondary;
iconColor = Theme
.of(context)
.colorScheme
.onSecondary;
}
return Padding(
padding: const EdgeInsets.only(right: 8),
child: GestureDetector(
onTap: () {
setState(() {
_selectedCarPlate = car.plate;
});
},
child: Chip(
backgroundColor: backgroundColor,
label: Row(
children: [
Icon(Icons.local_shipping, color: iconColor, size: 20),
Padding(
padding: const EdgeInsets.only(left: 5),
child: Text(
car.plate,
style: TextStyle(color: textColor, fontSize: 12),
),
),
],
return Padding(
padding: const EdgeInsets.only(right: 8),
child: GestureDetector(
onTap: () {
setState(() {
_selectedCarId = car.id;
});
},
child: Chip(
backgroundColor: backgroundColor,
label: Row(
children: [
Icon(Icons.local_shipping, color: iconColor, size: 20),
Padding(
padding: const EdgeInsets.only(left: 5),
child: Text(
car.plate,
style: TextStyle(color: textColor, fontSize: 12),
),
),
),
],
),
);
}).toList(),
),
),
);
}).toList(),
),
);
}
@override
Widget build(BuildContext context) {
return RefreshIndicator(
@ -99,11 +126,46 @@ class _DeliveryOverviewState extends State<DeliveryOverview> {
children: [
Text(
"Fahrten",
style: Theme.of(context).textTheme.headlineSmall,
style: Theme
.of(context)
.textTheme
.headlineSmall,
),
],
),
IconButton(icon: Icon(Icons.filter_list), onPressed: () {}),
PopupMenuButton<String>(
onSelected: (String value) {
setState(() {
if (value == "name-asc") {
setState(() {
_deliveries.sort();
});
}
if (value == "name-desc") {
setState(() {
_deliveries = _deliveries.reversed.toList();
});
}
});
},
itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
PopupMenuItem<String>(
value: 'name-asc',
child: Text('Name (A-Z)'),
),
PopupMenuItem<String>(
value: 'name-desc',
child: Text('Name (Z-A)'),
),
PopupMenuItem<String>(
value: 'distance',
child: Text('Entfernung'),
),
],
child: Icon(Icons.filter_list),
)
],
),
),
@ -111,7 +173,19 @@ class _DeliveryOverviewState extends State<DeliveryOverview> {
padding: const EdgeInsets.only(left: 10, right: 10, bottom: 20),
child: _carSelection(),
),
Expanded(child: DeliveryList(deliveries: widget.tour.deliveries)),
Expanded(
child: DeliveryList(
distances: widget.distances,
deliveries:
_deliveries
.where(
(delivery) =>
delivery.carId == _selectedCarId &&
delivery.allArticlesScanned(),
)
.toList(),
),
),
],
),
);