diff --git a/lib/screens/pharmacy_intervention/widgets/InterventionCardBody.dart b/lib/screens/pharmacy_intervention/widgets/InterventionCardBody.dart index 86e67f0a..0e65e538 100644 --- a/lib/screens/pharmacy_intervention/widgets/InterventionCardBody.dart +++ b/lib/screens/pharmacy_intervention/widgets/InterventionCardBody.dart @@ -136,7 +136,7 @@ class InterventionCardBody extends StatelessWidget { title: TranslationBase .of(context) .status, - data: medication.status.toString() ?? '', + data: medication.statusName ?? '', ), ), Expanded( diff --git a/lib/screens/pharmacy_intervention/widgets/PharmacyInterventionDialog.dart b/lib/screens/pharmacy_intervention/widgets/PharmacyInterventionDialog.dart index ba90f915..8bd67c48 100644 --- a/lib/screens/pharmacy_intervention/widgets/PharmacyInterventionDialog.dart +++ b/lib/screens/pharmacy_intervention/widgets/PharmacyInterventionDialog.dart @@ -168,7 +168,9 @@ class _PharmacyInterventionDialogState Widget _dateSelection(String title, Function(String) onDateSelected, String selectedDate, bool isToDateSelection,{String? selectedFromDate}) { return GestureDetector( - onTap: () => _selectDate(onDateSelected,selectedDate, isToDateSelection , selectedFromDate: selectedFromDate), + onTap: () => _selectDate(onDateSelected, + (isToDateSelection == true) ? selectedDate : "", isToDateSelection, + selectedFromDate: selectedFromDate), child: Row( mainAxisSize: MainAxisSize.min, children: [