UEAuvergne/Seshat
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

fix: switched to more user friendly datetimerange

Browse source
This commit is contained in:
alzalia1 2025-08-14 10:35:45 +02:00
parent d16d1e2778
commit 6ed99248b3
2 changed files with 24 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

47
lib/ui/bal_page/widget/pending/bal_pending_screen.dart
View file

@ -61,32 +61,21 @@ class _EditPopup extends State<EditPopup> {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>(); final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
String? name; String? name;
DateTime? start; DateTime? start;
Future<void> _selectStart() async {
final DateTime? pickedDate = await showDatePicker(
context: context,
initialDate: start ?? widget.viewModel.bal!.startTime,
firstDate: DateTime.now(),
lastDate: DateTime(DateTime.now().year + 2),
locale: Locale("fr", "FR"),
);
setState(() {
start = pickedDate;
});
}
DateTime? end; DateTime? end;
Future<void> _selectEnd() async { Future<void> _selectRange() async {
final DateTime? pickedDate = await showDatePicker( final DateTimeRange? pickedDate = await showDateRangePicker(
context: context, context: context,
initialDate: end ?? widget.viewModel.bal!.endTime, firstDate: DateTime(DateTime.now().year - 1),
firstDate: DateTime.now(),
lastDate: DateTime(DateTime.now().year + 2), lastDate: DateTime(DateTime.now().year + 2),
locale: Locale("fr", "FR"), initialDateRange: DateTimeRange(
start: start ?? widget.viewModel.bal!.startTime,
end: end ?? widget.viewModel.bal!.endTime,
),
); );
setState(() { setState(() {
end = pickedDate; start = pickedDate?.start;
end = pickedDate?.end;
}); });
} }
@ -125,24 +114,10 @@ class _EditPopup extends State<EditPopup> {
Text("Date de début : "), Text("Date de début : "),
TextButton( TextButton(
onPressed: () { onPressed: () {
_selectStart(); _selectRange();
}, },
child: Text( child: Text(
format.format(start ?? widget.viewModel.bal!.startTime), "Du ${format.format(start ?? DateTime.now())}\nau ${format.format(end ?? DateTime.now().add(Duration(days: 1)))}",
locale: Locale("fr"),
),
),
],
),
Row(
children: [
Text("Date de fin : "),
TextButton(
onPressed: () {
_selectEnd();
},
child: Text(
format.format(end ?? widget.viewModel.bal!.endTime),
), ),
), ),
], ],

44
lib/ui/home_page/widgets/create_confirmation_popup.dart
View file

@ -17,32 +17,21 @@ class _CreateConfirmationPopupState extends State<CreateConfirmationPopup> {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>(); final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
String? name; String? name;
DateTime? start; DateTime? start;
Future<void> _selectStart() async {
final DateTime? pickedDate = await showDatePicker(
context: context,
initialDate: start ?? DateTime.now(),
firstDate: DateTime.now(),
lastDate: DateTime(DateTime.now().year + 2),
locale: Locale("fr"),
);
setState(() {
start = pickedDate;
});
}
DateTime? end; DateTime? end;
Future<void> _selectEnd() async { Future<void> _selectRange() async {
final DateTime? pickedDate = await showDatePicker( final DateTimeRange? pickedDate = await showDateRangePicker(
context: context, context: context,
initialDate: end ?? DateTime.now(), firstDate: DateTime(DateTime.now().year - 1),
firstDate: DateTime.now(),
lastDate: DateTime(DateTime.now().year + 2), lastDate: DateTime(DateTime.now().year + 2),
locale: Locale("fr"), initialDateRange: DateTimeRange(
start: start ?? DateTime.now(),
end: end ?? DateTime.now().add(Duration(days: 1)),
),
); );
setState(() { setState(() {
end = pickedDate; start = pickedDate?.start;
end = pickedDate?.end;
}); });
} }
@ -80,20 +69,11 @@ class _CreateConfirmationPopupState extends State<CreateConfirmationPopup> {
Text("Date de début : "), Text("Date de début : "),
TextButton( TextButton(
onPressed: () { onPressed: () {
_selectStart(); _selectRange();
}, },
child: Text(format.format(start ?? DateTime.now())), child: Text(
"Du ${format.format(start ?? DateTime.now())}\nau ${format.format(end ?? DateTime.now().add(Duration(days: 1)))}",
), ),
],
),
Row(
children: [
Text("Date de fin : "),
TextButton(
onPressed: () {
_selectEnd();
},
child: Text(format.format(end ?? DateTime.now())),
), ),
], ],
), ),