From 0895a80d16e1cf73729ac72ffa5b6a6401cecd3c Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Sun, 16 Jan 2022 16:56:46 +0200 Subject: [PATCH] fix issues with date --- .../intervention_medication.dart | 7 ++++--- .../pharmacy_intervention_screen.dart | 2 +- .../profile_gird_for_InPatient.dart | 17 ++++++++--------- pubspec.lock | 9 +-------- 4 files changed, 14 insertions(+), 21 deletions(-) diff --git a/lib/screens/patients/profile/pharmacy-intervention/intervention_medication.dart b/lib/screens/patients/profile/pharmacy-intervention/intervention_medication.dart index 4587ce8d..81360f5e 100644 --- a/lib/screens/patients/profile/pharmacy-intervention/intervention_medication.dart +++ b/lib/screens/patients/profile/pharmacy-intervention/intervention_medication.dart @@ -20,7 +20,8 @@ DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); class InterventionMedicationScreen extends StatefulWidget { final PatiantInformtion patient; - const InterventionMedicationScreen(this.patient, {Key key}) : super(key: key); + final InterventionMedicationViewModel previousModel; + const InterventionMedicationScreen(this.patient, {Key key, this.previousModel}) : super(key: key); @override _InterventionMedicationScreenState createState() => @@ -42,8 +43,8 @@ class _InterventionMedicationScreenState onModelReady: (model) => model.getInterventionMedication( patientId: widget.patient.patientId, admissionNo: int.parse(widget.patient.admissionNo), - fromDate: model.selectedFromDate, - toDate: model.selectedToDate, + fromDate: widget.previousModel.selectedFromDate, + toDate: widget.previousModel.selectedToDate, ), builder: (_, model, w) => AppScaffold( diff --git a/lib/screens/patients/profile/pharmacy-intervention/pharmacy_intervention_screen.dart b/lib/screens/patients/profile/pharmacy-intervention/pharmacy_intervention_screen.dart index 82a5c51e..c60805aa 100644 --- a/lib/screens/patients/profile/pharmacy-intervention/pharmacy_intervention_screen.dart +++ b/lib/screens/patients/profile/pharmacy-intervention/pharmacy_intervention_screen.dart @@ -173,7 +173,7 @@ class _PharmacyInterventionScreenState context, MaterialPageRoute( builder: (context) => - InterventionMedicationScreen(patient,)), + InterventionMedicationScreen(patient,previousModel: model,)), ); }, ), diff --git a/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart b/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart index b43dbc44..7aed8f6f 100644 --- a/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart +++ b/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart @@ -166,15 +166,14 @@ class ProfileGridForInPatient extends StatelessWidget { DIABETIC_CHART_VALUES, 'assets/images/svgs/profile_screen/diabetic chart.svg', isInPatient: isInpatient, - ) - , - PatientProfileCardModel( - "VTE", - "Assessment", - VTE_ASSESSMENT, - 'assets/images/svgs/profile_screen/diabetic chart.svg', - isInPatient: isInpatient, - ), + ), + PatientProfileCardModel( + "VTE", + "Assessment", + VTE_ASSESSMENT, + 'assets/images/svgs/profile_screen/diabetic chart.svg', + isInPatient: isInpatient, + ), PatientProfileCardModel( TranslationBase.of(context).pharmacy, TranslationBase.of(context).intervention, diff --git a/pubspec.lock b/pubspec.lock index 3ba5bc57..e4f5a19f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -770,13 +770,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.2" meta: dependency: transitive description: @@ -1180,7 +1173,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.3" timing: dependency: transitive description: