heyday-marketing-gmbh/hartmann-foto_documentation
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rework ui

Browse Source
This commit is contained in:
verboomp
2026-01-29 12:37:44 +01:00
parent 38979c99e5
commit e062b4c688
18 changed files with 462 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
hartmann-foto-documentation-frontend/lib/pages/customer/back_button.dart
View File

@@ -1,42 +0,0 @@
import 'package:flutter/material.dart';
import 'package:fotodocumentation/pages/ui_utils/general_style.dart';
import 'package:fotodocumentation/utils/di_container.dart';
import 'package:go_router/go_router.dart';
import 'package:fotodocumentation/l10n/app_localizations.dart';
class CustomerBackButton extends StatelessWidget {
GeneralStyle get _generalStyle => DiContainer.get();
final String path;
const CustomerBackButton({super.key, required this.path});
@override
Widget build(BuildContext context) {
return ElevatedButton.icon(
onPressed: () => context.go(path),
icon: Icon(
Icons.chevron_left,
color: _generalStyle.secondaryTextLabelColor,
size: 24,
),
label: Text(
AppLocalizations.of(context)!.backButtonLabel,
style: TextStyle(
fontFamily: _generalStyle.fontFamily,
fontWeight: FontWeight.normal,
fontSize: 16,
color: _generalStyle.secondaryTextLabelColor,
),
),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.white,
elevation: 0,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8),
),
),
);
}
}

3
hartmann-foto-documentation-frontend/lib/pages/customer/customer_list_widget.dart
View File

@@ -224,7 +224,8 @@ class _CustomerListWidgetState extends State<CustomerListWidget> {
}
Future<void> _actionSelect(BuildContext context, CustomerListDto dto) async {
context.push("${GlobalRouter.pathCustomer}/${dto.id}");
String uri = "${GlobalRouter.pathHome}${GlobalRouter.pathCustomer}/${dto.id}";
context.go(uri);
}
void _reloadData() {

54
hartmann-foto-documentation-frontend/lib/pages/customer/customer_widget.dart
View File

@@ -1,26 +1,22 @@
import 'dart:convert' show base64Decode;
import 'package:flutter/material.dart';
import 'package:fotodocumentation/controller/picture_controller.dart';
import 'package:fotodocumentation/dto/picture_dto.dart';
import 'package:fotodocumentation/pages/customer/back_button.dart';
import 'package:fotodocumentation/pages/customer/picture_delete_dialog.dart';
import 'package:go_router/go_router.dart';
import 'package:intl/intl.dart';
import 'package:fotodocumentation/controller/base_controller.dart';
import 'package:fotodocumentation/l10n/app_localizations.dart';
import 'package:fotodocumentation/controller/customer_controller.dart';
import 'package:fotodocumentation/controller/picture_controller.dart';
import 'package:fotodocumentation/dto/customer_dto.dart';
import 'package:fotodocumentation/dto/picture_dto.dart';
import 'package:fotodocumentation/l10n/app_localizations.dart';
import 'package:fotodocumentation/pages/ui_utils/component/customer_back_button.dart';
import 'package:fotodocumentation/pages/customer/picture_delete_dialog.dart';
import 'package:fotodocumentation/pages/ui_utils/component/general_error_widget.dart';
import 'package:fotodocumentation/pages/ui_utils/component/page_header_widget.dart';
import 'package:fotodocumentation/pages/ui_utils/component/waiting_widget.dart';
import 'package:fotodocumentation/pages/ui_utils/general_style.dart';
import 'package:fotodocumentation/utils/di_container.dart';
import 'package:fotodocumentation/utils/global_router.dart';
import 'package:fotodocumentation/pages/customer/picture_widget.dart';
import 'package:go_router/go_router.dart';
import 'package:intl/intl.dart';
class CustomerWidget extends StatefulWidget {
final int customerId;
@@ -98,7 +94,6 @@ class _CustomerWidgetState extends State<CustomerWidget> {
children: [
PageHeaderWidget(text: dto.name, subText: subText),
CustomerBackButton(path: GlobalRouter.pathHome),
//_backButton(context),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
@@ -209,7 +204,7 @@ class _CustomerWidgetState extends State<CustomerWidget> {
);
final dateStr = _dateFormat.format(pictureDto.pictureDate);
final evaluationColor = _generalStyle.evaluationColor(); // FIXME: set to color from DB
final evaluationColor = _generalStyle.evaluationColor(value: pictureDto.evaluation); // FIXME: set to color from DB
return InkWell(
key: Key("table_row_${customerDto.id}"),
onTap: () => _actionSelect(context, customerDto, pictureDto),
@@ -288,33 +283,6 @@ class _CustomerWidgetState extends State<CustomerWidget> {
);
}
Widget _backButton(BuildContext context) {
return ElevatedButton.icon(
onPressed: () => context.push(GlobalRouter.pathHome),
icon: Icon(
Icons.chevron_left,
color: _generalStyle.secondaryTextLabelColor,
size: 24,
),
label: Text(
AppLocalizations.of(context)!.backButtonLabel,
style: TextStyle(
fontFamily: _generalStyle.fontFamily,
fontWeight: FontWeight.normal,
fontSize: 16,
color: _generalStyle.secondaryTextLabelColor,
),
),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.white,
elevation: 0,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8),
),
),
);
}
Widget _downloadButton(BuildContext context) {
return ElevatedButton.icon(
key: Key("download_all_button"),
@@ -360,7 +328,11 @@ class _CustomerWidgetState extends State<CustomerWidget> {
}
Future<void> _actionSelect(BuildContext context, CustomerDto customerDto, PictureDto pictureDto) async {
context.go(GlobalRouter.pathPicture, extra: PictureWidgetHolder(customerDto, pictureDto));
String uri = "${GlobalRouter.pathHome}${GlobalRouter.pathPicture}/${customerDto.id}/${pictureDto.id}";
context.go(uri);
setState(() {
_dto = _customerController.get(id: widget.customerId);
});
}
Future<void> _actionDownload(BuildContext context) async {

72
hartmann-foto-documentation-frontend/lib/pages/customer/picture_delete_dialog.dart
View File

@@ -11,41 +11,77 @@ class PictureDeleteDialog extends StatelessWidget {
@override
Widget build(BuildContext context) {
return AlertDialog(
title: Text(
AppLocalizations.of(context)!.deleteDialogTitle,
style: TextStyle(
fontFamily: _generalStyle.fontFamily,
fontWeight: FontWeight.bold,
color: _generalStyle.secondaryWidgetBackgroundColor,
),
),
content: Text(
AppLocalizations.of(context)!.deleteDialogText,
style: TextStyle(
fontFamily: _generalStyle.fontFamily,
color: _generalStyle.secondaryTextLabelColor,
),
actionsAlignment: MainAxisAlignment.center,
actionsPadding: EdgeInsets.only(bottom: 50),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: const EdgeInsets.only(top: 50.0),
child: Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: _generalStyle.errorColor,
shape: BoxShape.circle,
),
child: const Icon(
Icons.delete_outline,
size: 32,
color: Colors.white,
),
),
),
const SizedBox(height: 16),
Padding(
padding: const EdgeInsets.only(left:50, right: 50, bottom: 50),
child: Text(
AppLocalizations.of(context)!.deleteDialogText,
textAlign: TextAlign.center,
style: TextStyle(
fontFamily: _generalStyle.fontFamily,
color: _generalStyle.secondaryTextLabelColor,
fontSize: 28.71,
fontWeight: FontWeight.normal,
),
),
),
],
),
actions: [
TextButton(
ElevatedButton(
key: Key("picture_delete_no"),
onPressed: () => Navigator.of(context).pop(false),
style: ElevatedButton.styleFrom(
backgroundColor: _generalStyle.deleteCancelButtonBackgroundColor,
shape: const StadiumBorder(),
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
),
child: Text(
AppLocalizations.of(context)!.deleteDialogButtonCancel,
style: TextStyle(
fontFamily: _generalStyle.fontFamily,
color: _generalStyle.secondaryTextLabelColor,
color: _generalStyle.deleteCancelTextColor,
fontWeight: FontWeight.bold,
fontSize: 18.37,
),
),
),
TextButton(
ElevatedButton(
key: Key("picture_delete_yes"),
onPressed: () => Navigator.of(context).pop(true),
style: ElevatedButton.styleFrom(
backgroundColor: _generalStyle.primaryButtonBackgroundColor,
shape: const StadiumBorder(),
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
),
child: Text(
AppLocalizations.of(context)!.deleteDialogButtonApprove,
style: TextStyle(
fontFamily: _generalStyle.fontFamily,
color: _generalStyle.errorColor,
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 18.37,
),
),
),

278
hartmann-foto-documentation-frontend/lib/pages/customer/picture_widget.dart
View File

@@ -1,27 +1,25 @@
import 'dart:convert' show base64Decode;
import 'package:flutter/material.dart';
import 'package:fotodocumentation/controller/base_controller.dart';
import 'package:fotodocumentation/controller/customer_controller.dart';
import 'package:fotodocumentation/controller/picture_controller.dart';
import 'package:fotodocumentation/dto/customer_dto.dart';
import 'package:fotodocumentation/dto/picture_dto.dart';
import 'package:fotodocumentation/pages/customer/customer_back_button.dart';
import 'package:fotodocumentation/pages/ui_utils/component/customer_back_button.dart';
import 'package:fotodocumentation/pages/customer/picture_fullscreen_dialog.dart';
import 'package:fotodocumentation/pages/ui_utils/component/general_error_widget.dart';
import 'package:fotodocumentation/pages/ui_utils/component/page_header_widget.dart';
import 'package:fotodocumentation/pages/ui_utils/component/waiting_widget.dart';
import 'package:fotodocumentation/pages/ui_utils/general_style.dart';
import 'package:fotodocumentation/utils/di_container.dart';
import 'package:fotodocumentation/utils/global_router.dart';
import 'package:intl/intl.dart';
class PictureWidgetHolder {
final CustomerDto customerDto;
final PictureDto pictureDto;
const PictureWidgetHolder(this.customerDto, this.pictureDto);
}
class PictureWidget extends StatefulWidget {
final CustomerDto customerDto;
final PictureDto pictureDto;
const PictureWidget({super.key, required this.customerDto, required this.pictureDto});
final int customerId;
final int pictureId;
const PictureWidget({super.key, required this.customerId, required this.pictureId});
@override
State<PictureWidget> createState() => _PictureWidgetState();
@@ -29,16 +27,21 @@ class PictureWidget extends StatefulWidget {
class _PictureWidgetState extends State<PictureWidget> {
GeneralStyle get _generalStyle => DiContainer.get();
CustomerController get _customerController => DiContainer.get();
PictureController get _pictureController => DiContainer.get();
late PictureDto _selectedPicture;
late CustomerDto _customerDto;
PictureDto? _selectedPicture;
late DateFormat _dateFormat;
final ScrollController _commentScrollController = ScrollController();
late Future<CustomerDto?> _dto;
@override
void initState() {
super.initState();
_dateFormat = DateFormat('dd.MM.yyyy, hh:mm');
_selectedPicture = widget.pictureDto;
_dto = _customerController.get(id: widget.customerId);
}
@override
@@ -54,30 +57,58 @@ class _PictureWidgetState extends State<PictureWidget> {
color: _generalStyle.pageBackgroundColor,
child: Padding(
padding: const EdgeInsets.only(top: 8.0, left: 50.0, right: 50.0, bottom: 8.0),
child: _body(context),
child: _future(context),
),
),
);
}
Widget _body(BuildContext context) {
final pictures = widget.customerDto.pictures;
Widget _future(BuildContext context) {
return FutureBuilder<CustomerDto?>(
future: _dto,
builder: (BuildContext context, AsyncSnapshot<CustomerDto?> snapshot) {
if (snapshot.connectionState != ConnectionState.done) {
return const WaitingWidget();
}
if (snapshot.hasData) {
CustomerDto? dto = snapshot.data;
if (dto == null) {
return GeneralErrorWidget(error: "FIXME"); // FIXME: set error text data not found
}
_customerDto = dto;
_selectedPicture ??= dto.pictures.firstWhere((p) => p.id == widget.pictureId);
_selectedPicture ??= _customerDto.pictures.firstOrNull;
if (_selectedPicture == null) {
return GeneralErrorWidget(error: "FIXME"); // FIXME: set error text data not found
}
return _body(context, _selectedPicture!);
} else if (snapshot.hasError) {
var error = snapshot.error;
return (error is ServerError) ? GeneralErrorWidget.fromServerError(error) : GeneralErrorWidget(error: snapshot.error.toString());
}
return const WaitingWidget();
},
);
}
Widget _body(BuildContext context, PictureDto selectedPicture) {
final pictures = _customerDto.pictures;
return Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
PageHeaderWidget(text: widget.customerDto.name),
PageHeaderWidget(text: _customerDto.name),
CustomerBackButton(path: GlobalRouter.pathCustomer),
const SizedBox(height: 24),
Expanded(
child: _mainWidget(context),
child: _mainWidget(context, selectedPicture),
),
_bottomNavigationWidget(pictures),
_bottomNavigationWidget(pictures, selectedPicture),
],
);
}
Widget _mainWidget(BuildContext context) {
Widget _mainWidget(BuildContext context, PictureDto selectedPicture) {
return LayoutBuilder(
builder: (context, constraints) {
final isNarrow = constraints.maxWidth < 800;
@@ -87,18 +118,18 @@ class _PictureWidgetState extends State<PictureWidget> {
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_imageWidget(_selectedPicture),
_imageWidget(selectedPicture),
const SizedBox(height: 32),
_contentWidget(_selectedPicture),
_contentWidget(selectedPicture),
],
)
: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_imageWidget(_selectedPicture),
_imageWidget(selectedPicture),
const SizedBox(width: 32),
Expanded(child: _contentWidget(_selectedPicture)),
Expanded(child: _contentWidget(selectedPicture)),
],
),
);
@@ -148,63 +179,150 @@ class _PictureWidgetState extends State<PictureWidget> {
color: _generalStyle.secondaryTextLabelColor,
);
return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Text(
_dateFormat.format(dto.pictureDate),
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 44,
fontFamily: _generalStyle.fontFamily,
color: _generalStyle.primaryTextLabelColor,
),
),
Padding(
padding: const EdgeInsets.only(top: 20.0),
child: Text(
"KUNDENNUMMER",
style: labelStyle,
),
),
Padding(
padding: const EdgeInsets.only(top: 4.0),
child: Text(
widget.customerDto.customerNumber,
style: contentStyle,
),
),
Padding(
padding: const EdgeInsets.only(top: 20.0),
child: Text(
"KOMMENTAR",
style: labelStyle,
),
),
Padding(
padding: const EdgeInsets.only(top: 4.0),
child: SizedBox(
width: double.infinity,
height: 150,
child: Scrollbar(
controller: _commentScrollController,
thumbVisibility: true,
child: SingleChildScrollView(
controller: _commentScrollController,
padding: const EdgeInsets.all(8.0),
child: Text(
dto.comment ?? "",
style: contentStyle,
),
),
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
_dateFormat.format(dto.pictureDate),
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 44,
fontFamily: _generalStyle.fontFamily,
color: _generalStyle.primaryTextLabelColor,
),
),
const SizedBox(height: 20),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"KUNDENNUMMER",
style: labelStyle,
),
Padding(
padding: const EdgeInsets.only(top: 4.0),
child: Text(
_customerDto.customerNumber,
style: contentStyle,
),
),
Padding(
padding: const EdgeInsets.only(top: 20.0),
child: Text(
"KOMMENTAR",
style: labelStyle,
),
),
Padding(
padding: const EdgeInsets.only(top: 4.0),
child: SizedBox(
width: double.infinity,
height: 150,
child: Scrollbar(
controller: _commentScrollController,
thumbVisibility: true,
child: SingleChildScrollView(
controller: _commentScrollController,
padding: const EdgeInsets.all(8.0),
child: Text(
dto.comment ?? "",
style: contentStyle,
),
),
),
),
),
],
),
),
const SizedBox(width: 24),
_evaluationCard(dto),
],
),
],
);
}
Widget _evaluationCard(PictureDto dto) {
return Card(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
]);
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(
"BEWERTUNG",
style: TextStyle(
fontWeight: FontWeight.normal,
fontSize: 16,
fontFamily: _generalStyle.fontFamily,
color: _generalStyle.primaryTextLabelColor,
),
),
const SizedBox(height: 16),
Row(
mainAxisSize: MainAxisSize.min,
children: [
_evaluationCircle(
key: const Key("evaluation_good"),
color: _generalStyle.evaluationGoodColor,
value: 1,
selected: dto.evaluation == 1,
),
const SizedBox(width: 12),
_evaluationCircle(
key: const Key("evaluation_middle"),
color: _generalStyle.evaluationMiddleColor,
value: 2,
selected: dto.evaluation == 2,
),
const SizedBox(width: 12),
_evaluationCircle(
key: const Key("evaluation_bad"),
color: _generalStyle.evaluationBadColor,
value: 3,
selected: dto.evaluation == 3,
),
],
),
],
),
),
);
}
Widget _evaluationCircle({
required Key key,
required Color color,
required int value,
required bool selected,
}) {
return InkWell(
key: key,
onTap: () async => _actionUpdateEvaluation(value),
customBorder: const CircleBorder(),
child: Container(
width: 32,
height: 32,
decoration: BoxDecoration(
color: color,
shape: BoxShape.circle,
border: selected ? Border.all(color: _generalStyle.secondaryWidgetBackgroundColor, width: 3) : null,
),
),
);
}
// Bottom navigation buttons
Widget _bottomNavigationWidget(List<PictureDto> pictures) {
final currentIndex = pictures.indexWhere((p) => p.id == _selectedPicture.id);
Widget _bottomNavigationWidget(List<PictureDto> pictures, PictureDto selectedPicture) {
final currentIndex = pictures.indexWhere((p) => p.id == selectedPicture.id);
final hasPrevious = currentIndex > 0;
final hasNext = currentIndex < pictures.length - 1;
@@ -262,8 +380,16 @@ class _PictureWidgetState extends State<PictureWidget> {
);
}
Future<void> _actionUpdateEvaluation(int value) async {
_selectedPicture?.evaluation = value;
_pictureController.updateEvaluation(_selectedPicture!);
setState(() {
});
}
void _actionNavigateToPicture(int index) {
final pictures = widget.customerDto.pictures;
final pictures = _customerDto.pictures;
if (index >= 0 && index < pictures.length) {
setState(() {
_selectedPicture = pictures[index];