Merge remote-tracking branch 'origin/roaa2.8_addnewmedicationservice' into roaa2.8_addnewmedicationservice

merge-requests/958/head
RoaaGhali98 4 years ago
commit af72810b26

@ -22,8 +22,8 @@ class InterventionMedicationViewModel extends BaseViewModel {
List<PatiantInformtion> filterData = [];
DateTime selectedFromDate;
DateTime selectedToDate;
DateTime selectedFromDate = DateTime.now();
DateTime selectedToDate = DateTime.now().add(Duration(days: 1));
PatiantInformtion patient;
bool hasError = false;

@ -85,9 +85,8 @@ class _PharmacyInterventionScreenState
child: TextField(
decoration: textFieldSelectorDecoration(
TranslationBase.of(context).fromDate,
model.selectedFromDate != null
? "${AppDateUtils.convertStringToDateFormat(model.selectedFromDate.toString(), "yyyy-MM-dd")}"
: "${AppDateUtils.convertStringToDateFormat(DateTime.now().toString(), "yyyy-MM-dd")}",
"${AppDateUtils.convertStringToDateFormat(model.selectedFromDate.toString(), "yyyy-MM-dd")}"
,
true,
suffixIcon: Icon(
Icons.calendar_today,
@ -122,9 +121,8 @@ class _PharmacyInterventionScreenState
child: TextField(
decoration: textFieldSelectorDecoration(
TranslationBase.of(context).toDate,
model.selectedToDate != null
? "${AppDateUtils.convertStringToDateFormat(model.selectedToDate.toString(), "yyyy-MM-dd")}"
: "${AppDateUtils.convertStringToDateFormat(DateTime.now().add(Duration(days: 1)).toString(), "yyyy-MM-dd")}",
"${AppDateUtils.convertStringToDateFormat(model.selectedToDate.toString(), "yyyy-MM-dd")}"
,
true,
suffixIcon: Icon(
Icons.calendar_today,

Loading…
Cancel
Save