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.getMedicationIndications();
await model.getPatientAssessment(getAssessmentReqModel);
await model.getItem();
//await model.getItem();
},
builder: (
BuildContext context,

@ -209,16 +209,17 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
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<NewPrescriptionScreen> {
.toUpperCase(),
color: Colors
.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(
child: AppText(
"", // 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,
fontSize:
15.0),
// 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,
fontSize: 15.0),
)
],
),

Loading…
Cancel
Save