WD: from date selection bug and status display name changed

8 months ago · 7a693c00c9
parent d0debd5d5f
commit 7a693c00c9
2 changed files with 4 additions and 2 deletions
--- 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(
--- 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: [