From 2ee2429c70bf096feeae6bf5a5570d4240080f50 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Tue, 16 Feb 2021 16:09:32 +0200 Subject: [PATCH] Date Formate change --- .../prescription/add_prescription_form.dart | 2 +- .../prescription/prescription_screen.dart | 29 ++++++++++++++----- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/lib/screens/prescription/add_prescription_form.dart b/lib/screens/prescription/add_prescription_form.dart index 881dc2de..68d4e633 100644 --- a/lib/screens/prescription/add_prescription_form.dart +++ b/lib/screens/prescription/add_prescription_form.dart @@ -201,7 +201,7 @@ class _PrescriptionFormWidgetState extends State { await model.getMedicationDoseTime(); //await model.getMedicationIndications(); await model.getPatientAssessment(getAssessmentReqModel); - await model.getItem(); + //await model.getItem(); }, builder: ( BuildContext context, diff --git a/lib/screens/prescription/prescription_screen.dart b/lib/screens/prescription/prescription_screen.dart index 3e62d6e0..4800c361 100644 --- a/lib/screens/prescription/prescription_screen.dart +++ b/lib/screens/prescription/prescription_screen.dart @@ -209,16 +209,17 @@ class _NewPrescriptionScreenState extends State { child: Column( children: [ AppText( - DateTime.parse(model - .prescriptionList[ - 0] - .entityList[ - index] - .createdOn) - .day + (DateTime.parse(model.prescriptionList[0].entityList[index].createdOn) != + null + ? (DateTime.parse(model.prescriptionList[0].entityList[index].createdOn).year) + .toString() + : DateTime.now() + .year) .toString(), color: Colors .green, + fontSize: + 13.5, ), AppText( Helpers.getMonth(model.prescriptionList[0].entityList[index].createdOn != @@ -230,7 +231,19 @@ class _NewPrescriptionScreenState extends State { .toUpperCase(), color: Colors .green, - ) + ), + AppText( + DateTime.parse(model + .prescriptionList[ + 0] + .entityList[ + index] + .createdOn) + .day + .toString(), + color: Colors + .green, + ), ], ), ),