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

start quesitonnaire

Browse Source
This commit is contained in:
verboomp
2026-02-19 11:04:02 +01:00
parent 168fc986f2
commit 9b3446685a
47 changed files with 2456 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
hartmann-foto-documentation-frontend/lib/controller/questionnaire_controller.dart Normal file
View File

@@ -0,0 +1,23 @@
import 'package:fotodocumentation/controller/base_controller.dart';
import 'package:fotodocumentation/dto/questionnaire_dto.dart';
abstract interface class QuestionnaireController {
Future<bool> delete(QuestionnaireDto dto);
Future<bool> updateEvaluation(QuestionnaireDto dto);
}
class QuestionnaireControllerImpl extends BaseController implements QuestionnaireController {
final String path = "questionnaire";
@override
Future<bool> delete(QuestionnaireDto dto) {
String uriStr = '${uriUtils.getBaseUrl()}$path/${dto.id}';
return runDeleteWithAuth(uriStr);
}
@override
Future<bool> updateEvaluation(QuestionnaireDto dto) {
String uriStr = '${uriUtils.getBaseUrl()}$path/evaluation/${dto.id}?evaluation=${dto.evaluation}';
return runPutWithAuth(uriStr);
}
}

42
hartmann-foto-documentation-frontend/lib/controller/questionnaire_customer_controller.dart Normal file
View File

@@ -0,0 +1,42 @@
import 'package:fotodocumentation/controller/base_controller.dart';
import 'package:fotodocumentation/dto/questionnaire_customer_dto.dart';
abstract interface class QuestionnaireCustomerController {
Future<List<QuestionnaireCustomerListDto>> getAll(String query, String startsWith);
Future<QuestionnaireCustomerDto?> get({required int id});
Future<List<int>> export({required int customerId, int? questionnaireId});
}
class QuestionnaireCustomerControllerImpl extends BaseController implements QuestionnaireCustomerController {
final String path = "questionnairecustomer";
@override
Future<List<QuestionnaireCustomerListDto>> getAll(String query, String startsWith) async {
String uriStr = '${uriUtils.getBaseUrl()}$path?query=$query&startsWith=$startsWith';
return runGetListWithAuth(uriStr, (p0) {
List<QuestionnaireCustomerListDto> retVal = [];
for (var elem in p0) {
var entity = QuestionnaireCustomerListDto.fromJson(elem);
retVal.add(entity);
}
return retVal;
});
}
@override
Future<QuestionnaireCustomerDto?> get({required int id}) {
String uriStr = '${uriUtils.getBaseUrl()}$path/$id';
return runGetWithAuth(uriStr, (json) => QuestionnaireCustomerDto.fromJson(json));
}
@override
Future<List<int>> export({required int customerId, int? questionnaireId}) {
String uriStr = '${uriUtils.getBaseUrl()}$path/export/$customerId';
if (questionnaireId != null) {
uriStr += '?questionnaire=$questionnaireId';
}
return runGetBytesWithAuth(uriStr);
}
}

2
hartmann-foto-documentation-frontend/lib/dto/customer_dto.dart
View File

@@ -46,3 +46,5 @@ class CustomerDto {
);
}
}

49
hartmann-foto-documentation-frontend/lib/dto/questionnaire_customer_dto.dart Normal file
View File

@@ -0,0 +1,49 @@
import 'package:fotodocumentation/dto/questionnaire_dto.dart';
import 'package:fotodocumentation/utils/date_time_utils.dart';
class QuestionnaireCustomerListDto {
final int id;
final String name;
final String customerNumber;
final String? zip;
final String? city;
final DateTime? lastUpdateDate;
QuestionnaireCustomerListDto({required this.id, required this.name, required this.customerNumber, this.zip, this.city, this.lastUpdateDate});
/// Create from JSON response
factory QuestionnaireCustomerListDto.fromJson(Map<String, dynamic> json) {
return QuestionnaireCustomerListDto(
id: json['id'] as int,
name: json['name'] as String,
customerNumber: json['customerNumber'] as String,
zip: json['zip'] as String?,
city: json['city'] as String?,
lastUpdateDate: DateTimeUtils.toDateTime(json['lastUpdateDate']),
);
}
}
class QuestionnaireCustomerDto {
final int id;
final String name;
final String customerNumber;
final String? zip;
final String? city;
final List<QuestionnaireDto> questionnaires;
QuestionnaireCustomerDto({required this.id, required this.name, required this.customerNumber, required this.questionnaires, this.zip, this.city});
/// Create from JSON response
factory QuestionnaireCustomerDto.fromJson(Map<String, dynamic> json) {
return QuestionnaireCustomerDto(
id: json['id'] as int,
name: json['name'] as String,
customerNumber: json['customerNumber'] as String,
zip: json['zip'] as String?,
city: json['city'] as String?,
questionnaires: List<QuestionnaireDto>.from(json["questionnaires"].map((x) => QuestionnaireDto.fromJson(x))),
);
}
}

30
hartmann-foto-documentation-frontend/lib/dto/questionnaire_dto.dart Normal file
View File

@@ -0,0 +1,30 @@
import 'package:fotodocumentation/utils/date_time_utils.dart';
class QuestionnaireDto {
final int id;
final String? comment;
final String? category;
int evaluation;
final DateTime questionnaireDate;
final String? username;
QuestionnaireDto(
{required this.id, required this.comment, required this.category, required this.evaluation, required this.questionnaireDate, required this.username});
/// Create from JSON response
factory QuestionnaireDto.fromJson(Map<String, dynamic> json) {
return QuestionnaireDto(
id: json['id'] as int,
comment: json['comment'] as String?,
category: json['category'] as String?,
evaluation: json["evaluation"] as int,
questionnaireDate: DateTimeUtils.toDateTime(json['questionnaireDate']) ?? DateTime.now(),
username: json['username'] as String?,
);
}
@override
String toString() {
return 'QuestionnaireDto{id: $id}';
}
}

4
hartmann-foto-documentation-frontend/lib/l10n/app_de.arb
View File

@@ -151,5 +151,9 @@
"customerWidgetDownloadInProgress": "Download wird vorbereitet…",
"@customerWidgetDownloadInProgress": {
"description": "Download in progress message"
},
"questionnaireLoginTitle": "FRAGEBOGEN",
"@questionnaireLoginTitle": {
"description": "Questionnaire login page title"
}
}

6
hartmann-foto-documentation-frontend/lib/l10n/app_localizations.dart
View File

@@ -297,6 +297,12 @@ abstract class AppLocalizations {
/// In de, this message translates to:
/// **'Download wird vorbereitet…'**
String get customerWidgetDownloadInProgress;
/// Questionnaire login page title
///
/// In de, this message translates to:
/// **'FRAGEBOGEN'**
String get questionnaireLoginTitle;
}
class _AppLocalizationsDelegate

3
hartmann-foto-documentation-frontend/lib/l10n/app_localizations_de.dart
View File

@@ -117,4 +117,7 @@ class AppLocalizationsDe extends AppLocalizations {
@override
String get customerWidgetDownloadInProgress => 'Download wird vorbereitet…';
@override
String get questionnaireLoginTitle => 'FRAGEBOGEN';
}

10
hartmann-foto-documentation-frontend/lib/pages/customer/customer_list_widget.dart → hartmann-foto-documentation-frontend/lib/pages/foto/customer/foto_customer_list_widget.dart
View File

@@ -13,14 +13,14 @@ import 'package:fotodocumentation/utils/global_router.dart';
import 'package:go_router/go_router.dart';
import 'package:intl/intl.dart';
class CustomerListWidget extends StatefulWidget {
const CustomerListWidget({super.key});
class FotoCustomerListWidget extends StatefulWidget {
const FotoCustomerListWidget({super.key});
@override
State<CustomerListWidget> createState() => _CustomerListWidgetState();
State<FotoCustomerListWidget> createState() => _FotoCustomerListWidgetState();
}
class _CustomerListWidgetState extends State<CustomerListWidget> {
class _FotoCustomerListWidgetState extends State<FotoCustomerListWidget> {
CustomerController get _customerController => DiContainer.get();
GeneralStyle get _generalStyle => DiContainer.get();
@@ -242,7 +242,7 @@ class _CustomerListWidgetState extends State<CustomerListWidget> {
}
Future<void> _actionSelect(BuildContext context, CustomerListDto dto) async {
String uri = "${GlobalRouter.pathHome}${GlobalRouter.pathCustomer}/${dto.id}";
String uri = "${GlobalRouter.pathFotoHome}${GlobalRouter.pathFotoCustomer}/${dto.id}";
context.go(uri);
}

24
hartmann-foto-documentation-frontend/lib/pages/customer/customer_widget.dart → hartmann-foto-documentation-frontend/lib/pages/foto/customer/foto_customer_widget.dart
View File

@@ -6,7 +6,7 @@ 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/foto/customer/foto_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';
@@ -17,15 +17,15 @@ import 'package:go_router/go_router.dart';
import 'package:fotodocumentation/utils/file_download.dart';
import 'package:intl/intl.dart';
class CustomerWidget extends StatefulWidget {
class FotoCustomerWidget extends StatefulWidget {
final int customerId;
const CustomerWidget({super.key, required this.customerId});
const FotoCustomerWidget({super.key, required this.customerId});
@override
State<CustomerWidget> createState() => _CustomerWidgetState();
State<FotoCustomerWidget> createState() => _FotoCustomerWidgetState();
}
class _CustomerWidgetState extends State<CustomerWidget> {
class _FotoCustomerWidgetState extends State<FotoCustomerWidget> {
CustomerController get _customerController => DiContainer.get();
PictureController get _pictureController => DiContainer.get();
GeneralStyle get _generalStyle => DiContainer.get();
@@ -40,6 +40,14 @@ class _CustomerWidgetState extends State<CustomerWidget> {
_dto = _customerController.get(id: widget.customerId);
}
@override
void didUpdateWidget(covariant FotoCustomerWidget oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.customerId != widget.customerId) {
_dto = _customerController.get(id: widget.customerId);
}
}
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -90,7 +98,7 @@ class _CustomerWidgetState extends State<CustomerWidget> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
PageHeaderWidget(text: dto.name, subText: subText),
CustomerBackButton(path: GlobalRouter.pathHome),
CustomerBackButton(path: GlobalRouter.pathFotoHome),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
@@ -316,7 +324,7 @@ class _CustomerWidgetState extends State<CustomerWidget> {
final confirmed = await showDialog<bool>(
context: context,
builder: (BuildContext context) {
return PictureDeleteDialog();
return FotoPictureDeleteDialog();
},
);
@@ -329,7 +337,7 @@ class _CustomerWidgetState extends State<CustomerWidget> {
}
Future<void> _actionSelect(BuildContext context, CustomerDto customerDto, PictureDto pictureDto) async {
String uri = "${GlobalRouter.pathHome}${GlobalRouter.pathCustomer}/${customerDto.id}${GlobalRouter.pathPicture}/${pictureDto.id}";
String uri = "${GlobalRouter.pathFotoHome}${GlobalRouter.pathFotoCustomer}/${customerDto.id}${GlobalRouter.pathFotoPicture}/${pictureDto.id}";
context.go(uri);
setState(() {
_dto = _customerController.get(id: widget.customerId);

4
hartmann-foto-documentation-frontend/lib/pages/customer/picture_delete_dialog.dart → hartmann-foto-documentation-frontend/lib/pages/foto/customer/foto_picture_delete_dialog.dart
View File

@@ -3,10 +3,10 @@ import 'package:fotodocumentation/l10n/app_localizations.dart';
import 'package:fotodocumentation/pages/ui_utils/general_style.dart';
import 'package:fotodocumentation/utils/di_container.dart';
class PictureDeleteDialog extends StatelessWidget {
class FotoPictureDeleteDialog extends StatelessWidget {
GeneralStyle get _generalStyle => DiContainer.get();
const PictureDeleteDialog({super.key});
const FotoPictureDeleteDialog({super.key});
@override
Widget build(BuildContext context) {

4
hartmann-foto-documentation-frontend/lib/pages/customer/picture_fullscreen_dialog.dart → hartmann-foto-documentation-frontend/lib/pages/foto/customer/foto_picture_fullscreen_dialog.dart
View File

@@ -4,12 +4,12 @@ import 'package:fotodocumentation/dto/picture_dto.dart';
import 'package:fotodocumentation/pages/ui_utils/general_style.dart';
import 'package:fotodocumentation/utils/di_container.dart';
class PictureFullscreenDialog extends StatelessWidget {
class FotoPictureFullscreenDialog extends StatelessWidget {
GeneralStyle get _generalStyle => DiContainer.get();
final PictureDto dto;
const PictureFullscreenDialog({super.key, required this.dto});
const FotoPictureFullscreenDialog({super.key, required this.dto});
@override
Widget build(BuildContext context) {

22
hartmann-foto-documentation-frontend/lib/pages/customer/picture_widget.dart → hartmann-foto-documentation-frontend/lib/pages/foto/customer/foto_picture_widget.dart
View File

@@ -6,7 +6,7 @@ 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_fullscreen_dialog.dart';
import 'package:fotodocumentation/pages/foto/customer/foto_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';
@@ -15,16 +15,16 @@ import 'package:fotodocumentation/utils/di_container.dart';
import 'package:fotodocumentation/utils/global_router.dart';
import 'package:intl/intl.dart';
class PictureWidget extends StatefulWidget {
class FotoPictureWidget extends StatefulWidget {
final int customerId;
final int pictureId;
const PictureWidget({super.key, required this.customerId, required this.pictureId});
const FotoPictureWidget({super.key, required this.customerId, required this.pictureId});
@override
State<PictureWidget> createState() => _PictureWidgetState();
State<FotoPictureWidget> createState() => _FotoPictureWidgetState();
}
class _PictureWidgetState extends State<PictureWidget> {
class _FotoPictureWidgetState extends State<FotoPictureWidget> {
GeneralStyle get _generalStyle => DiContainer.get();
CustomerController get _customerController => DiContainer.get();
PictureController get _pictureController => DiContainer.get();
@@ -43,6 +43,14 @@ class _PictureWidgetState extends State<PictureWidget> {
_dto = _customerController.get(id: widget.customerId);
}
@override
void didUpdateWidget(covariant FotoPictureWidget oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.customerId != widget.customerId || oldWidget.pictureId != widget.pictureId) {
_dto = _customerController.get(id: widget.customerId);
}
}
@override
void dispose() {
_commentScrollController.dispose();
@@ -97,7 +105,7 @@ class _PictureWidgetState extends State<PictureWidget> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
PageHeaderWidget(text: _customerDto.name),
CustomerBackButton(path: GlobalRouter.pathCustomer),
CustomerBackButton(path: GlobalRouter.pathFotoCustomer),
const SizedBox(height: 24),
Expanded(
child: _mainWidget(context, selectedPicture),
@@ -415,7 +423,7 @@ class _PictureWidgetState extends State<PictureWidget> {
showDialog(
context: context,
builder: (BuildContext context) {
return PictureFullscreenDialog(dto: dto);
return FotoPictureFullscreenDialog(dto: dto);
},
);
}

12
hartmann-foto-documentation-frontend/lib/pages/login/login_widget.dart → hartmann-foto-documentation-frontend/lib/pages/foto/login/foto_login_widget.dart
View File

@@ -10,14 +10,14 @@ import 'package:fotodocumentation/pages/ui_utils/general_style.dart';
import 'package:fotodocumentation/utils/di_container.dart';
import 'package:fotodocumentation/utils/login_credentials.dart';
class LoginWidget extends StatefulWidget {
const LoginWidget({super.key});
class FotoLoginWidget extends StatefulWidget {
const FotoLoginWidget({super.key});
@override
State<LoginWidget> createState() => _LoginWidgetState();
State<FotoLoginWidget> createState() => _FotoLoginWidgetState();
}
class _LoginWidgetState extends State<LoginWidget> {
class _FotoLoginWidgetState extends State<FotoLoginWidget> {
LoginController get _loginController => DiContainer.get();
LoginCredentials get _loginCredentials => DiContainer.get();
GeneralStyle get _generalStyle => DiContainer.get();
@@ -201,7 +201,9 @@ class _LoginWidgetState extends State<LoginWidget> {
_loginCredentials.setLoggedIn(true);
if (context.mounted) {
context.go("/");
// Get the redirect URL from query parameters
final redirect = GoRouterState.of(context).uri.queryParameters['redirect'];
context.go(redirect ?? '/');
}
}
}

291
hartmann-foto-documentation-frontend/lib/pages/questionnaire/customer/questionnaire_customer_list_widget.dart Normal file
View File

@@ -0,0 +1,291 @@
import 'package:flutter/material.dart';
import 'package:fotodocumentation/controller/base_controller.dart';
import 'package:fotodocumentation/controller/questionnaire_customer_controller.dart';
import 'package:fotodocumentation/dto/questionnaire_customer_dto.dart';
import 'package:fotodocumentation/l10n/app_localizations.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/search_bar_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:go_router/go_router.dart';
import 'package:intl/intl.dart';
class QuestionaireCustomerListWidget extends StatefulWidget {
const QuestionaireCustomerListWidget({super.key});
@override
State<QuestionaireCustomerListWidget> createState() => _QuestionaireCustomerListWidgetState();
}
class _QuestionaireCustomerListWidgetState extends State<QuestionaireCustomerListWidget> {
QuestionnaireCustomerController get _questionnaireCustomerController => DiContainer.get();
GeneralStyle get _generalStyle => DiContainer.get();
final _searchController = TextEditingController();
late Future<List<QuestionnaireCustomerListDto>> _dtos;
String? _selectedLetter;
late DateFormat _dateFormat;
@override
void initState() {
super.initState();
_dateFormat = DateFormat('dd MMMM yyyy');
_dtos = _questionnaireCustomerController.getAll(_searchController.text, "");
}
@override
void dispose() {
_searchController.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
body: _body(context),
);
}
Widget _body(BuildContext context) {
return Container(
color: _generalStyle.pageBackgroundColor,
child: Padding(
padding: const EdgeInsets.only(top: 8.0, left: 50.0, right: 50.0, bottom: 8.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
PageHeaderWidget(text: "FRAGENBOGEN AUSWERTUNG"),
//_abcHeaderBar(),
const SizedBox(width: 48),
SearchBarWidget(
searchController: _searchController,
onSearch: (text) async => actionSearch(text),
),
Expanded(
child: _customerListWidget(),
),
],
),
),
);
}
Widget _customerListWidget() {
return FutureBuilder<List<QuestionnaireCustomerListDto>>(
future: _dtos,
builder: (BuildContext context, AsyncSnapshot<List<QuestionnaireCustomerListDto>> snapshot) {
if (snapshot.connectionState != ConnectionState.done) {
return const WaitingWidget();
}
if (snapshot.hasData) {
List<QuestionnaireCustomerListDto> dtos = snapshot.data ?? [];
return _listWidget(dtos);
} else if (snapshot.hasError) {
var error = snapshot.error;
return (error is ServerError) ? GeneralErrorWidget.fromServerError(error) : GeneralErrorWidget(error: snapshot.error.toString());
}
return const WaitingWidget();
},
);
}
Widget _listWidget(List<QuestionnaireCustomerListDto> dtos) {
if (dtos.isEmpty) {
return Text(AppLocalizations.of(context)!.customerListEmpty,
style: TextStyle(
fontFamily: _generalStyle.fontFamily,
fontWeight: FontWeight.bold,
fontSize: 20,
color: _generalStyle.secondaryWidgetBackgroundColor,
));
}
return Card(
margin: EdgeInsets.zero,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
child: Column(
children: [
_tableHeaderRow(context),
Divider(thickness: 2, height: 1, color: _generalStyle.secondaryWidgetBackgroundColor),
Expanded(
child: ListView.separated(
padding: const EdgeInsets.all(0),
itemCount: dtos.length,
itemBuilder: (BuildContext context, int index) {
return _tableDataRow(context, dtos[index]);
},
separatorBuilder: (BuildContext context, int index) => Divider(
color: _generalStyle.secondaryWidgetBackgroundColor,
),
),
),
],
),
);
}
Widget _tableHeaderRow(BuildContext context) {
final headerStyle = TextStyle(
fontFamily: _generalStyle.fontFamily,
fontWeight: FontWeight.bold,
fontSize: 20,
color: _generalStyle.secondaryWidgetBackgroundColor,
);
return Padding(
padding: const EdgeInsets.all(16.0),
child: Row(
spacing: 8.0,
children: [
const SizedBox(width: 48),
Expanded(
flex: 1,
child: Text(
AppLocalizations.of(context)!.customerListHeaderCustomerNumber,
style: headerStyle,
),
),
Expanded(
flex: 3,
child: Text(
AppLocalizations.of(context)!.customerListHeaderName,
style: headerStyle,
),
),
Expanded(
flex: 1,
child: Text(
"PLZ/Ort",
style: headerStyle,
),
),
Expanded(
flex: 2,
child: Text(
"Ort",
style: headerStyle,
),
),
Expanded(
flex: 2,
child: Wrap(
children: [
Padding(
padding: const EdgeInsets.only(right: 8.0),
child: Icon(Icons.calendar_month, color: _generalStyle.secondaryWidgetBackgroundColor),
),
Text(
AppLocalizations.of(context)!.customerListHeaderLastDate,
style: headerStyle,
),
],
),
),
],
),
);
}
Widget _tableDataRow(BuildContext context, QuestionnaireCustomerListDto dto) {
final dataStyle = TextStyle(
fontFamily: _generalStyle.fontFamily,
fontSize: 16.0,
color: _generalStyle.secondaryTextLabelColor,
);
final dateStr = dto.lastUpdateDate == null ? "" : _dateFormat.format(dto.lastUpdateDate!);
return InkWell(
onTap: () => _actionSelect(context, dto),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
child: Row(
spacing: 8.0,
children: [
SizedBox(
width: 48,
child: Icon(Icons.folder_open_outlined, color: _generalStyle.secondaryWidgetBackgroundColor),
),
Expanded(
flex: 1,
child: Text(dto.customerNumber, style: dataStyle),
),
Expanded(
flex: 3,
child: Text(dto.name, style: dataStyle),
),
Expanded(
flex: 1,
child: Text(dto.zip ?? "", style: dataStyle),
),
Expanded(
flex: 2,
child: Text(dto.city ?? "", style: dataStyle),
),
Expanded(
flex: 2,
child: Text(dateStr, style: dataStyle),
),
],
),
),
);
}
Future<void> actionSearch(String text) async {
_reloadData();
}
Future<void> _actionSelect(BuildContext context, QuestionnaireCustomerListDto dto) async {
String uri = "${GlobalRouter.pathQuestionnaireHome}/${GlobalRouter.pathQuestionnaireCustomer}/${dto.id}";
context.go(uri);
}
void _reloadData() {
_dtos = _questionnaireCustomerController.getAll(_searchController.text, _selectedLetter ?? "");
setState(() {});
}
/*
Widget _abcHeaderBar() {
const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
return Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: Wrap(
spacing: 8,
runSpacing: 8,
children: letters.split('').map((letter) {
final isSelected = _selectedLetter == letter;
return InkWell(
onTap: () {
setState(() {
_selectedLetter = isSelected ? null : letter;
_reloadData();
});
},
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
decoration: BoxDecoration(
color: isSelected ? _generalStyle.secondaryWidgetBackgroundColor : Colors.white,
borderRadius: BorderRadius.circular(4),
),
child: Text(
letter,
style: TextStyle(
fontFamily: _generalStyle.fontFamily,
fontWeight: FontWeight.bold,
fontSize: 20.0,
color: isSelected ? Colors.white : _generalStyle.secondaryWidgetBackgroundColor,
),
),
),
);
}).toList(),
),
);
}*/
}

380
hartmann-foto-documentation-frontend/lib/pages/questionnaire/customer/questionnaire_customer_widget.dart Normal file
View File

@@ -0,0 +1,380 @@
import 'package:flutter/material.dart';
import 'package:fotodocumentation/controller/base_controller.dart';
import 'package:fotodocumentation/controller/questionnaire_controller.dart';
import 'package:fotodocumentation/controller/questionnaire_customer_controller.dart';
import 'package:fotodocumentation/dto/questionnaire_customer_dto.dart';
import 'package:fotodocumentation/dto/questionnaire_dto.dart';
import 'package:fotodocumentation/l10n/app_localizations.dart';
import 'package:fotodocumentation/pages/questionnaire/customer/questionnaire_delete_dialog.dart';
import 'package:fotodocumentation/pages/ui_utils/component/customer_back_button.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/utils/file_download.dart';
import 'package:intl/intl.dart';
class QuestionaireCustomerWidget extends StatefulWidget {
final int customerId;
const QuestionaireCustomerWidget({super.key, required this.customerId});
@override
State<QuestionaireCustomerWidget> createState() => _QuestionaireCustomerWidgetState();
}
class _QuestionaireCustomerWidgetState extends State<QuestionaireCustomerWidget> {
QuestionnaireCustomerController get _customerController => DiContainer.get();
QuestionnaireController get _pictureController => DiContainer.get();
GeneralStyle get _generalStyle => DiContainer.get();
late Future<QuestionnaireCustomerDto?> _dto;
late DateFormat _dateFormat;
@override
void initState() {
super.initState();
_dateFormat = DateFormat('dd MMMM yyyy');
_dto = _customerController.get(id: widget.customerId);
}
@override
void didUpdateWidget(covariant QuestionaireCustomerWidget oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.customerId != widget.customerId) {
_dto = _customerController.get(id: widget.customerId);
}
}
@override
Widget build(BuildContext context) {
return Scaffold(
body: Container(
color: _generalStyle.pageBackgroundColor,
child: Padding(
padding: const EdgeInsets.only(top: 8.0, left: 50.0, right: 50.0, bottom: 8.0),
child: _body(context),
),
),
);
}
Widget _body(BuildContext context) {
return FutureBuilder<QuestionnaireCustomerDto?>(
future: _dto,
builder: (BuildContext context, AsyncSnapshot<QuestionnaireCustomerDto?> snapshot) {
if (snapshot.connectionState != ConnectionState.done) {
return const WaitingWidget();
}
if (snapshot.hasData) {
QuestionnaireCustomerDto? dto = snapshot.data;
if (dto == null) {
return Text(
AppLocalizations.of(context)!.customerWidgetNotFound,
style: TextStyle(
fontFamily: _generalStyle.fontFamily,
fontWeight: FontWeight.bold,
fontSize: 20,
color: _generalStyle.secondaryWidgetBackgroundColor,
),
);
}
return _mainWidget(dto);
} else if (snapshot.hasError) {
var error = snapshot.error;
return (error is ServerError) ? GeneralErrorWidget.fromServerError(error) : GeneralErrorWidget(error: snapshot.error.toString());
}
return const WaitingWidget();
},
);
}
Widget _mainWidget(QuestionnaireCustomerDto dto) {
var subText = AppLocalizations.of(context)!.customerWidgetCustomerNumberPrefix(dto.customerNumber);
return Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
PageHeaderWidget(text: dto.name, subText: subText),
CustomerBackButton(path: GlobalRouter.pathFotoHome),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
_downloadButton(context, dto),
],
),
const SizedBox(height: 24),
Expanded(
child: _customerWidget(dto),
),
],
);
}
Widget _customerWidget(QuestionnaireCustomerDto customerDto) {
var questionnaireDtos = customerDto.questionnaires;
questionnaireDtos.sort((a, b) => b.questionnaireDate.compareTo(a.questionnaireDate));
return Card(
margin: EdgeInsets.zero,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
child: Column(
children: [
_tableHeaderRow(context),
Divider(thickness: 2, height: 1, color: _generalStyle.secondaryWidgetBackgroundColor),
Expanded(
child: ListView.separated(
padding: const EdgeInsets.only(top: 8.0),
itemCount: questionnaireDtos.length,
itemBuilder: (BuildContext context, int index) {
return _tableDataRow(context, customerDto, questionnaireDtos[index]);
},
separatorBuilder: (BuildContext context, int index) => Divider(color: _generalStyle.secondaryWidgetBackgroundColor),
),
),
],
),
);
}
Widget _tableHeaderRow(BuildContext context) {
final headerStyle = TextStyle(
fontFamily: _generalStyle.fontFamily,
fontWeight: FontWeight.bold,
fontSize: 20,
color: _generalStyle.secondaryWidgetBackgroundColor,
);
return Padding(
padding: const EdgeInsets.all(16.0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 8.0,
children: [
Expanded(
flex: 1,
child: Align(
alignment: Alignment.centerLeft,
child: Text(
AppLocalizations.of(context)!.customerWidgetHeaderFoto,
style: headerStyle,
),
),
),
Expanded(
flex: 3,
child: Align(
alignment: Alignment.centerLeft,
child: Text(
AppLocalizations.of(context)!.customerWidgetHeaderComment,
style: headerStyle,
),
),
),
Expanded(
flex: 1,
child: Align(
alignment: Alignment.centerLeft,
child: Text(
'Bewertung',
style: headerStyle,
),
),
),
Expanded(
flex: 2,
child: Align(
alignment: Alignment.centerLeft,
child: Text(
AppLocalizations.of(context)!.customerWidgetHeaderUploadDate,
style: headerStyle,
),
),
),
const SizedBox(width: 96),
],
),
);
}
Widget _tableDataRow(BuildContext context, QuestionnaireCustomerDto customerDto, QuestionnaireDto questionnaireDto) {
final dataStyle = TextStyle(
fontFamily: _generalStyle.fontFamily,
fontSize: 16.0,
color: _generalStyle.secondaryTextLabelColor,
);
final dateStr = _dateFormat.format(questionnaireDto.questionnaireDate);
final evaluationColor = _generalStyle.evaluationColor(value: questionnaireDto.evaluation);
return InkWell(
key: Key("table_row_${customerDto.id}"),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
spacing: 8.0,
children: [
Expanded(
flex: 1,
child: Align(
alignment: Alignment.centerLeft,
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 70, maxHeight: 70),
child:
Icon(Icons.abc),
/*
FIXME: remove me
Image.network(
headers: {cred.name: cred.value},
pictureDto.thumbnailSizeUrl,
fit: BoxFit.contain,
),*/
),
),
),
Expanded(
flex: 3,
child: Align(
alignment: Alignment.centerLeft,
child: Text(questionnaireDto.comment ?? "", style: dataStyle),
),
),
Expanded(
flex: 1,
child: Align(
alignment: Alignment.centerLeft,
child: Container(
width: 20,
height: 20,
decoration: BoxDecoration(
color: evaluationColor,
shape: BoxShape.circle,
),
),
),
),
Expanded(
flex: 2,
child: Align(
alignment: Alignment.centerLeft,
child: Text(dateStr, style: dataStyle),
),
),
SizedBox(
width: 48,
child: IconButton(
key: Key("table_row_download_${questionnaireDto.id}"),
icon: Icon(
Icons.file_download_outlined,
color: _generalStyle.loginFormTextLabelColor,
),
onPressed: () => _actionDownload(context, customerDto, questionnaireDto),
),
),
SizedBox(
width: 48,
child: IconButton(
key: Key("table_row_delete_${customerDto.id}"),
icon: Icon(
Icons.delete_outline,
color: _generalStyle.errorColor,
),
onPressed: () => _actionDelete(context, customerDto, questionnaireDto),
),
),
],
),
),
);
}
Widget _downloadButton(BuildContext context, QuestionnaireCustomerDto customerDto) {
return ElevatedButton.icon(
key: Key("download_all_button"),
onPressed: () => _actionDownload(context, customerDto, null),
iconAlignment: IconAlignment.end,
icon: Icon(
Icons.file_download_outlined,
color: _generalStyle.primaryButtonTextColor,
size: 24,
),
label: Text(
"Alle herunterladen",
style: TextStyle(
fontFamily: _generalStyle.fontFamily,
fontWeight: FontWeight.bold,
fontSize: 16,
color: _generalStyle.primaryButtonTextColor,
),
),
style: ElevatedButton.styleFrom(
backgroundColor: _generalStyle.secondaryWidgetBackgroundColor,
elevation: 0,
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
shape: const StadiumBorder(),
),
);
}
Future<void> _actionDelete(BuildContext context, QuestionnaireCustomerDto customerDto, QuestionnaireDto questionnaireDto) async {
final confirmed = await showDialog<bool>(
context: context,
builder: (BuildContext context) {
return QuestionaireDeleteDialog();
},
);
if (confirmed == true) {
_pictureController.delete(questionnaireDto);
setState(() {
_dto = _customerController.get(id: widget.customerId);
});
}
}
Future<void> _actionDownload(BuildContext context, QuestionnaireCustomerDto customerDto, QuestionnaireDto? questionnaireDto) async {
showDialog(
context: context,
barrierDismissible: false,
builder: (context) => Dialog(
backgroundColor: Colors.white,
child: Padding(
padding: const EdgeInsets.all(24.0),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const CircularProgressIndicator(),
const SizedBox(width: 16),
Text(
AppLocalizations.of(context)!.customerWidgetDownloadInProgress,
style: TextStyle(
fontFamily: _generalStyle.fontFamily,
fontSize: 16,
),
),
],
),
),
),
);
try {
final bytes = await _customerController.export(customerId: customerDto.id, questionnaireId: questionnaireDto?.id);
final fileName = questionnaireDto != null ? '${customerDto.customerNumber}_${questionnaireDto.id}.pdf' : '${customerDto.customerNumber}.pdf';
if (context.mounted) {
Navigator.of(context).pop();
}
await downloadFile(bytes, fileName);
} catch (e) {
if (context.mounted) {
Navigator.of(context).pop();
}
rethrow;
}
}
}

91
hartmann-foto-documentation-frontend/lib/pages/questionnaire/customer/questionnaire_delete_dialog.dart Normal file
View File

@@ -0,0 +1,91 @@
import 'package:flutter/material.dart';
import 'package:fotodocumentation/l10n/app_localizations.dart';
import 'package:fotodocumentation/pages/ui_utils/general_style.dart';
import 'package:fotodocumentation/utils/di_container.dart';
class QuestionaireDeleteDialog extends StatelessWidget {
GeneralStyle get _generalStyle => DiContainer.get();
const QuestionaireDeleteDialog({super.key});
@override
Widget build(BuildContext context) {
return AlertDialog(
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: [
ElevatedButton(
key: Key("questionnaire_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.deleteCancelTextColor,
fontWeight: FontWeight.bold,
fontSize: 18.37,
),
),
),
ElevatedButton(
key: Key("questionnaire_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: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 18.37,
),
),
),
],
);
}
}

209
hartmann-foto-documentation-frontend/lib/pages/questionnaire/login/questionnaire_login_widget.dart Normal file
View File

@@ -0,0 +1,209 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:go_router/go_router.dart';
import 'package:fotodocumentation/controller/login_controller.dart';
import 'package:fotodocumentation/dto/jwt_token_pair_dto.dart';
import 'package:fotodocumentation/l10n/app_localizations.dart';
import 'package:fotodocumentation/pages/ui_utils/general_style.dart';
import 'package:fotodocumentation/utils/di_container.dart';
import 'package:fotodocumentation/utils/login_credentials.dart';
class QuestionaireLoginWidget extends StatefulWidget {
const QuestionaireLoginWidget({super.key});
@override
State<QuestionaireLoginWidget> createState() => _QuestionaireLoginWidgetState();
}
class _QuestionaireLoginWidgetState extends State<QuestionaireLoginWidget> {
LoginController get _loginController => DiContainer.get();
LoginCredentials get _loginCredentials => DiContainer.get();
GeneralStyle get _generalStyle => DiContainer.get();
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
final _usernameController = TextEditingController();
final _passwordController = TextEditingController();
String? _error;
final FocusNode _focusNode = FocusNode();
@override
void dispose() {
_focusNode.dispose();
_usernameController.dispose();
_passwordController.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
body: _body(context),
);
}
Widget _body(BuildContext context) {
return Container(
color: _generalStyle.pageBackgroundColor,
child: _content(context),
);
}
Widget _content(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(20.0),
child: Form(
key: _formKey,
child: KeyboardListener(
focusNode: _focusNode,
onKeyEvent: (event) {
if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.enter) {
_actionSubmit(context);
}
},
child: ListView(
children: [
Center(
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 40.0),
child: Image.asset(
'assets/images/logo.png',
height: 120,
),
),
),
Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 500),
child: Card(
elevation: 0,
margin: EdgeInsets.zero,
clipBehavior: Clip.antiAlias,
child: Padding(
padding: const EdgeInsets.all(70.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Center(
child: Text(
key: Key("login_title"),
AppLocalizations.of(context)!.questionnaireLoginTitle,
style: TextStyle(
fontWeight: FontWeight.bold,
color: _generalStyle.primaryTextLabelColor,
fontFamily: _generalStyle.fontFamily,
fontSize: 50,
),
),
),
const SizedBox(height: 40),
if (_error != null) ...[
_errorWidget(),
const SizedBox(height: 40),
],
TextFormField(
key: Key("username"),
controller: _usernameController,
decoration: _formFieldInputDecoration(AppLocalizations.of(context)!.loginUsernameTFLabel),
),
const SizedBox(height: 25),
TextFormField(
key: Key("password"),
controller: _passwordController,
obscureText: true,
decoration: _formFieldInputDecoration(AppLocalizations.of(context)!.loginPasswordTFLabel),
),
const SizedBox(height: 25),
Center(
child: ElevatedButton(
key: Key("SubmitWidgetButton"),
style: ElevatedButton.styleFrom(
backgroundColor: _generalStyle.primaryButtonBackgroundColor,
foregroundColor: _generalStyle.primaryButtonTextColor,
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 20),
),
onPressed: () async => await _actionSubmit(context),
child: Text(
AppLocalizations.of(context)!.loginLoginButtonLabel,
style: TextStyle(fontWeight: FontWeight.bold, fontFamily: _generalStyle.fontFamily),
),
),
),
const SizedBox(height: 30),
],
),
),
),
),
),
],
),
),
),
);
}
Widget _errorWidget() {
return Center(
child: Text(
_error!,
style: TextStyle(
color: _generalStyle.errorColor,
fontWeight: FontWeight.bold,
fontSize: 16,
fontFamily: _generalStyle.fontFamily,
),
),
);
}
InputDecoration _formFieldInputDecoration(String text) {
var formLabelTextStyle = TextStyle(
color: _generalStyle.loginFormTextLabelColor,
fontFamily: _generalStyle.fontFamily,
fontSize: 14,
fontStyle: FontStyle.normal,
fontWeight: FontWeight.normal,
);
return InputDecoration(
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: _error != null ? BorderSide(color: _generalStyle.errorColor) : BorderSide(),
),
enabledBorder: _error != null
? OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide(color: _generalStyle.errorColor),
)
: null,
labelText: text.toUpperCase(),
labelStyle: formLabelTextStyle,
floatingLabelBehavior: FloatingLabelBehavior.always,
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
);
}
Future<void> _actionSubmit(BuildContext context) async {
String username = _usernameController.text;
String password = _passwordController.text;
AuthenticateReply authenticateReply = await _loginController.authenticate(username, password);
JwtTokenPairDto? jwtTokenPairDto = authenticateReply.jwtTokenPairDto;
if (jwtTokenPairDto == null) {
setState(() => _error = AppLocalizations.of(context)!.loginErrorMessage);
return;
}
_loginCredentials.setLoggedIn(true);
if (context.mounted) {
// Get the redirect URL from query parameters
final redirect = GoRouterState.of(context).uri.queryParameters['redirect'];
context.go(redirect ?? '/');
}
}
}

2
hartmann-foto-documentation-frontend/lib/pages/ui_utils/component/page_header_widget.dart
View File

@@ -94,7 +94,7 @@ class PageHeaderWidget extends StatelessWidget {
return ElevatedButton.icon(
onPressed: () {
loginCredentials.logout();
context.go(GlobalRouter.pathLogin);
context.go(GlobalRouter.pathFotoLogin);
},
icon: Icon(
Icons.logout_rounded,

5
hartmann-foto-documentation-frontend/lib/utils/di_container.dart
View File

@@ -1,6 +1,8 @@
import 'package:fotodocumentation/controller/customer_controller.dart';
import 'package:fotodocumentation/controller/login_controller.dart';
import 'package:fotodocumentation/controller/picture_controller.dart';
import 'package:fotodocumentation/controller/questionnaire_controller.dart';
import 'package:fotodocumentation/controller/questionnaire_customer_controller.dart';
import 'package:fotodocumentation/pages/ui_utils/general_style.dart';
import 'package:fotodocumentation/utils/http_client_utils.dart';
import 'package:fotodocumentation/utils/jwt_token_storage.dart';
@@ -26,6 +28,9 @@ class DiContainer {
DiContainer.instance.put(LoginController, LoginControllerImpl());
DiContainer.instance.put(CustomerController, CustomerControllerImpl());
DiContainer.instance.put(PictureController, PictureControllerImpl());
DiContainer.instance.put(QuestionnaireCustomerController, QuestionnaireCustomerControllerImpl());
DiContainer.instance.put(QuestionnaireController, QuestionnaireControllerImpl());
}
void put<T>(Type key, T object) {

110
hartmann-foto-documentation-frontend/lib/utils/global_router.dart
View File

@@ -1,26 +1,35 @@
// needed for web horizontal scroll behavior
import 'package:flutter/material.dart';
import 'package:fotodocumentation/main.dart';
import 'package:fotodocumentation/pages/customer/customer_list_widget.dart';
import 'package:fotodocumentation/pages/customer/customer_widget.dart';
import 'package:fotodocumentation/pages/customer/picture_widget.dart';
import 'package:fotodocumentation/pages/login/login_widget.dart';
import 'package:fotodocumentation/pages/foto/customer/foto_customer_list_widget.dart';
import 'package:fotodocumentation/pages/foto/customer/foto_customer_widget.dart';
import 'package:fotodocumentation/pages/foto/customer/foto_picture_widget.dart';
import 'package:fotodocumentation/pages/foto/login/foto_login_widget.dart';
import 'package:fotodocumentation/pages/questionnaire/customer/questionnaire_customer_list_widget.dart';
import 'package:fotodocumentation/pages/questionnaire/customer/questionnaire_customer_widget.dart';
import 'package:fotodocumentation/pages/questionnaire/login/questionnaire_login_widget.dart';
import 'package:fotodocumentation/utils/di_container.dart';
import 'package:fotodocumentation/utils/login_credentials.dart';
import 'package:go_router/go_router.dart';
class GlobalRouter {
static final GlobalKey<NavigatorState> rootNavigatorKey = GlobalKey<NavigatorState>(debugLabel: 'root');
static final GlobalKey<NavigatorState> bottomBarNavigatorKey = GlobalKey<NavigatorState>(debugLabel: 'bottombar');
static final GlobalKey<NavigatorState> adminNavigatorKey = GlobalKey<NavigatorState>(debugLabel: 'admin');
static final GlobalKey<NavigatorState> skillEditorNavigatorKey = GlobalKey<NavigatorState>(debugLabel: 'skillEditor');
static final String pathHome = "/home";
static final String pathCustomer = "/customer";
static final String pathPicture = "/picture";
static final String pathLogin = "/login";
static final String pathRoot = "/";
static final GoRouter router = createRouter(pathHome);
static final String pathFoto = "/foto";
static final String pathQuestionnaire = "/fragenbogen";
static final String pathFotoHome = "$pathFoto/home";
static final String pathFotoCustomer = "$pathFoto/customer";
static final String pathFotoPicture = "$pathFoto/picture";
static final String pathFotoLogin = "$pathFoto/login";
static final String pathQuestionnaireHome = "$pathQuestionnaire/home";
static final String pathQuestionnaireCustomer = "customer";
static final String pathQuestionnaireLogin = "$pathQuestionnaire/login";
static final GoRouter router = createRouter(pathRoot);
static GoRouter createRouter(String initialLocation) {
return GoRouter(
@@ -28,40 +37,80 @@ class GlobalRouter {
initialLocation: initialLocation,
routes: <RouteBase>[
GoRoute(
path: "/",
redirect: (_, __) => pathHome,
path: "/",
redirect: (_, __) {//nvlev4YnTi
logger.t("uri / redirect to $pathFotoHome");
return pathFotoHome;
}),
GoRoute(
path: pathFoto,
redirect: (_, __) {
logger.t("uri $pathFoto redirect to $pathFotoHome");
return pathFotoHome;
}),
GoRoute(
path: pathFotoLogin,
builder: (_, __) {
logger.t("uri $pathFotoLogin show foto login");
return const FotoLoginWidget();
},
),
GoRoute(
path: pathLogin,
builder: (BuildContext context, GoRouterState state) => const LoginWidget(),
),
GoRoute(
path: pathHome,
builder: (context, state) => CustomerListWidget(),
path: pathFotoHome,
builder: (context, state) => FotoCustomerListWidget(),
routes: [
GoRoute(
path: "$pathCustomer/:customerId",
path: "$pathFotoCustomer/:customerId",
builder: (context, state) {
var idStr = state.pathParameters['customerId'];
var id = idStr == null ? null : int.tryParse(idStr);
return CustomerWidget(customerId: id ?? -1);
return FotoCustomerWidget(customerId: id ?? -1);
},
routes: [
GoRoute(
path: "$pathPicture/:pictureId",
path: "$pathFotoPicture/:pictureId",
builder: (context, state) {
var customerIdStr = state.pathParameters['customerId'];
var customerId = customerIdStr == null ? null : int.tryParse(customerIdStr);
var pictureIdStr = state.pathParameters['pictureId'];
var pictureId = pictureIdStr == null ? null : int.tryParse(pictureIdStr);
return PictureWidget(customerId: customerId ?? -1, pictureId: pictureId ?? -1);
return FotoPictureWidget(customerId: customerId ?? -1, pictureId: pictureId ?? -1);
},
),
],
),
],
),
GoRoute(
path: pathQuestionnaire,
redirect: (_, __) {
logger.t("uri $pathQuestionnaire redirect to $pathQuestionnaireHome");
return pathQuestionnaireHome;
}),
GoRoute(
path: pathQuestionnaireLogin,
builder: (_, __) {
logger.t("uri $pathQuestionnaireLogin show questionnaire login");
return const QuestionaireLoginWidget();
},
),
GoRoute(
path: pathQuestionnaireHome,
builder: (context, state) => QuestionaireCustomerListWidget(),
routes: [
GoRoute(
path: "$pathQuestionnaireCustomer/:customerId",
builder: (context, state) {
var uriStr = state.uri.toString();
logger.t("uri $uriStr show questionnaire");
var idStr = state.pathParameters['customerId'];
var id = idStr == null ? null : int.tryParse(idStr);
return QuestionaireCustomerWidget(customerId: id ?? -1);
},
),
],
),
],
redirect: (context, state) {
var uriStr = state.uri.toString();
@@ -69,7 +118,18 @@ class GlobalRouter {
LoginCredentials loginCredentials = DiContainer.get();
if (!loginCredentials.isLoggedIn) {
return pathLogin;
if (uriStr != '/') {
if (uriStr.startsWith(pathFoto) && !uriStr.startsWith(pathFotoLogin)) {
var url = '$pathFotoLogin?redirect=${Uri.encodeComponent(uriStr)}';
logger.t("foto redirect to $url");
return url;
}
if (uriStr.startsWith(pathQuestionnaire) && !uriStr.startsWith(pathQuestionnaireLogin)) {
var url = '$pathQuestionnaireLogin?redirect=${Uri.encodeComponent(uriStr)}';
logger.t("questionnaire redirect to $url");
return url;
}
}
}
return null;
},

2
hartmann-foto-documentation-frontend/lib/utils/http_client_interceptor.dart
View File

@@ -31,7 +31,7 @@ class HttpClientInterceptor extends http.BaseClient {
// Navigate to login page using GoRouter
final context = GlobalRouter.rootNavigatorKey.currentContext;
if (context != null) {
context.go(GlobalRouter.pathLogin);
context.go(GlobalRouter.pathFotoLogin);
}
}
}