Skip to content

feat(measurements): remove date restriction to allow multiple entries per day #1150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolandgeider merged 3 commits into from
Apr 14, 2026
Merged

feat(measurements): remove date restriction to allow multiple entries per day #1150

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4ea771
feat(measurements): remove date restriction to allow multiple entries…
sg172003 Mar 18, 2026
733a880
fix(measurements): restore complete forms.dart with only selectableDa…
sg172003 Mar 22, 2026
f7f864d
fix(measurements): add time picker to measurement entry form
sg172003 Mar 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 49 additions & 13 deletions lib/widgets/measurements/forms.dart
View file
Open in desktop
Comment thread
sg172003 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ class MeasurementEntryForm extends StatelessWidget {
final int _categoryId;
final _valueController = TextEditingController();
final _dateController = TextEditingController(text: '');
final _timeController = TextEditingController(text: '');
final _notesController = TextEditingController();

late final Map<String, dynamic> _entryData;
Expand Down Expand Up @@ -164,6 +165,7 @@ class MeasurementEntryForm extends StatelessWidget {
@override
Widget build(BuildContext context) {
final dateFormat = DateFormat.yMd(Localizations.localeOf(context).languageCode);
final timeFormat = DateFormat.Hm(Localizations.localeOf(context).languageCode);

final measurementProvider = Provider.of<MeasurementProvider>(context, listen: false);
final measurementCategory = measurementProvider.categories.firstWhere(
Expand All @@ -173,6 +175,9 @@ class MeasurementEntryForm extends StatelessWidget {
if (_dateController.text.isEmpty) {
_dateController.text = dateFormat.format(_entryData['date']);
}
if (_timeController.text.isEmpty) {
_timeController.text = TimeOfDay.fromDateTime(_entryData['date']).format(context);
}

final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());

Expand All @@ -185,6 +190,7 @@ class MeasurementEntryForm extends StatelessWidget {
key: _form,
child: Column(
children: [
// Date
TextFormField(
decoration: InputDecoration(
labelText: AppLocalizations.of(context).date,
Expand All @@ -206,21 +212,19 @@ class MeasurementEntryForm extends StatelessWidget {
initialDate: _entryData['date'],
firstDate: DateTime(DateTime.now().year - 10),
lastDate: DateTime.now(),

// TODO(x): we need to filter out dates that already have an entry
selectableDayPredicate: (day) {
// Always allow the current initial date
if (day == _entryData['date']) {
return true;
}
return true;
},
);
Comment thread
rolandgeider marked this conversation as resolved.

_dateController.text = pickedDate == null ? '' : dateFormat.format(pickedDate);
if (pickedDate != null) {
_dateController.text = dateFormat.format(pickedDate);
}
},
onSaved: (newValue) {
_entryData['date'] = dateFormat.parse(newValue!);
final date = dateFormat.parse(newValue!);
_entryData['date'] = (_entryData['date'] as DateTime).copyWith(
year: date.year,
month: date.month,
day: date.day,
);
},
validator: (value) {
if (value!.isEmpty) {
Expand All @@ -229,6 +233,38 @@ class MeasurementEntryForm extends StatelessWidget {
return null;
},
),

// Time
TextFormField(
decoration: InputDecoration(
labelText: AppLocalizations.of(context).time,
suffixIcon: const Icon(
Icons.access_time_outlined,
key: Key('clockIcon'),
),
),
readOnly: true,
controller: _timeController,
onTap: () async {
final pickedTime = await showTimePicker(
context: context,
initialTime: TimeOfDay.fromDateTime(_entryData['date']),
);

if (pickedTime != null) {
_timeController.text = pickedTime.format(context);
}
},
onSaved: (newValue) {
final time = timeFormat.parse(newValue!);
_entryData['date'] = (_entryData['date'] as DateTime).copyWith(
hour: time.hour,
minute: time.minute,
second: time.second,
);
},
),

// Value
TextFormField(
decoration: InputDecoration(
Expand All @@ -253,7 +289,7 @@ class MeasurementEntryForm extends StatelessWidget {
_entryData['value'] = numberFormat.parse(newValue!);
},
),
// Value
// Notes
TextFormField(
decoration: InputDecoration(labelText: AppLocalizations.of(context).notes),
controller: _notesController,
Expand Down Expand Up @@ -317,4 +353,4 @@ class MeasurementEntryForm extends StatelessWidget {
),
);
}
}
}