fix issues with date

merge-requests/953/head
Elham Rababh 4 years ago
parent fde96fbce7
commit 0895a80d16

@ -20,7 +20,8 @@ DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
class InterventionMedicationScreen extends StatefulWidget { class InterventionMedicationScreen extends StatefulWidget {
final PatiantInformtion patient; 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 @override
_InterventionMedicationScreenState createState() => _InterventionMedicationScreenState createState() =>
@ -42,8 +43,8 @@ class _InterventionMedicationScreenState
onModelReady: (model) => model.getInterventionMedication( onModelReady: (model) => model.getInterventionMedication(
patientId: widget.patient.patientId, patientId: widget.patient.patientId,
admissionNo: int.parse(widget.patient.admissionNo), admissionNo: int.parse(widget.patient.admissionNo),
fromDate: model.selectedFromDate, fromDate: widget.previousModel.selectedFromDate,
toDate: model.selectedToDate, toDate: widget.previousModel.selectedToDate,
), ),
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(

@ -173,7 +173,7 @@ class _PharmacyInterventionScreenState
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) =>
InterventionMedicationScreen(patient,)), InterventionMedicationScreen(patient,previousModel: model,)),
); );
}, },
), ),

@ -166,15 +166,14 @@ class ProfileGridForInPatient extends StatelessWidget {
DIABETIC_CHART_VALUES, DIABETIC_CHART_VALUES,
'assets/images/svgs/profile_screen/diabetic chart.svg', 'assets/images/svgs/profile_screen/diabetic chart.svg',
isInPatient: isInpatient, isInPatient: isInpatient,
) ),
, PatientProfileCardModel(
PatientProfileCardModel( "VTE",
"VTE", "Assessment",
"Assessment", VTE_ASSESSMENT,
VTE_ASSESSMENT, 'assets/images/svgs/profile_screen/diabetic chart.svg',
'assets/images/svgs/profile_screen/diabetic chart.svg', isInPatient: isInpatient,
isInPatient: isInpatient, ),
),
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).pharmacy, TranslationBase.of(context).pharmacy,
TranslationBase.of(context).intervention, TranslationBase.of(context).intervention,

@ -770,13 +770,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.11" 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: meta:
dependency: transitive dependency: transitive
description: description:
@ -1180,7 +1173,7 @@ packages:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.8" version: "0.4.3"
timing: timing:
dependency: transitive dependency: transitive
description: description:

Loading…
Cancel
Save