Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

It is possible to confuse v5's time tracker start/end times when entering military (24h) hours into an AM/PM system #271

This commit is contained in:
Hillel Coren 2021-05-13 15:51:17 +03:00
parent 368754c60a
commit 02ebb23e7d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ui/app/forms/time_picker.dart
View File

@ -135,7 +135,8 @@ class _TimePickerState extends State<TimePicker> {
value = value.replaceAll(RegExp('[^\\d\:]'), ''); value = value.replaceAll(RegExp('[^\\d\:]'), '');
value = value.toLowerCase().replaceAll('.', ':'); value = value.toLowerCase().replaceAll('.', ':');
final parts = value.split(':'); final parts =
value.split(':').where((element) => element.isNotEmpty).toList();
String dateTimeStr = ''; String dateTimeStr = '';
if (parts.length == 1) { if (parts.length == 1) {
@ -168,8 +169,15 @@ class _TimePickerState extends State<TimePicker> {
} else { } else {
final store = StoreProvider.of<AppState>(context); final store = StoreProvider.of<AppState>(context);
if (!store.state.company.settings.enableMilitaryTime) { if (!store.state.company.settings.enableMilitaryTime) {
//final hour = parseDouble(parts[0]); final hour = parseDouble(parts[0]);
//dateTimeStr += hour > 6 ? ' AM' : ' PM'; if (hour > 12) {
final parts = dateTimeStr
.split(':')
.where((element) => element.isNotEmpty)
.toList();
parts[0] = '${(hour - 12).toInt()}';
dateTimeStr = parts.join(':');
}
dateTimeStr += ' PM'; dateTimeStr += ' PM';
} }
} }