Merge branch 'fix-issues' into 'development'

new changes

See merge request Cloud_Solution/doctor_app_flutter!317
merge-requests/319/merge
Mohammad Aljammal 5 years ago
commit 1424941f94

@ -201,7 +201,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
await model.getMedicationDoseTime(); await model.getMedicationDoseTime();
//await model.getMedicationIndications(); //await model.getMedicationIndications();
await model.getPatientAssessment(getAssessmentReqModel); await model.getPatientAssessment(getAssessmentReqModel);
await model.getItem(); //await model.getItem();
}, },
builder: ( builder: (
BuildContext context, BuildContext context,

@ -209,16 +209,17 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
child: Column( child: Column(
children: [ children: [
AppText( AppText(
DateTime.parse(model (DateTime.parse(model.prescriptionList[0].entityList[index].createdOn) !=
.prescriptionList[ null
0] ? (DateTime.parse(model.prescriptionList[0].entityList[index].createdOn).year)
.entityList[ .toString()
index] : DateTime.now()
.createdOn) .year)
.day
.toString(), .toString(),
color: Colors color: Colors
.green, .green,
fontSize:
13.5,
), ),
AppText( AppText(
Helpers.getMonth(model.prescriptionList[0].entityList[index].createdOn != Helpers.getMonth(model.prescriptionList[0].entityList[index].createdOn !=
@ -230,7 +231,19 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
.toUpperCase(), .toUpperCase(),
color: Colors color: Colors
.green, .green,
) ),
AppText(
DateTime.parse(model
.prescriptionList[
0]
.entityList[
index]
.createdOn)
.day
.toString(),
color: Colors
.green,
),
], ],
), ),
), ),
@ -383,12 +396,9 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
), ),
Expanded( Expanded(
child: AppText( child: AppText(
"", // commening below code because there is an error coming in the model please fix it before pushing it // commening below code because there is an error coming in the model please fix it before pushing it
// model.prescriptionList[0].entityList[index].pharmacistRemarks == null model.prescriptionList[0].entityList[index].pharmacistRemarks == null ? "" : model.prescriptionList[0].entityList[index].pharmacistRemarks,
// ? "" fontSize: 15.0),
// : model.prescriptionList[0].entityList[index].pharmacistRemarks,
fontSize:
15.0),
) )
], ],
), ),

Loading…
Cancel
Save