Merge branch 'progress_note' into 'development'

fix progress_note_screen

See merge request Cloud_Solution/doctor_app_flutter!575
merge-requests/577/merge
Mohammad Aljammal 5 years ago
commit 3bf31c0e43

@ -121,6 +121,16 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
if(model.patientProgressNoteList[index].status == 1 && authProvider.doctorProfile.doctorID != model.patientProgressNoteList[index].createdBy)
AppText(
'In Progress',fontWeight: FontWeight.bold, color: Color(0xFFCC9B14),fontSize: 16,),
if(model.patientProgressNoteList[index].status == 4)
AppText(
'Canceled',fontWeight: FontWeight.bold, color: Colors.red.shade700,fontSize: 16,),
if(model.patientProgressNoteList[index].status == 2)
AppText(
'Verified',fontWeight: FontWeight.bold, color: Colors.grey.shade700,fontSize: 16,),
if (model.patientProgressNoteList[index].status != 2 && if (model.patientProgressNoteList[index].status != 2 &&
model.patientProgressNoteList[index].status != 4 && authProvider.doctorProfile.doctorID == model.patientProgressNoteList[index].createdBy) model.patientProgressNoteList[index].status != 4 && authProvider.doctorProfile.doctorID == model.patientProgressNoteList[index].createdBy)
Row( Row(
@ -347,12 +357,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
), ),
], ],
), ),
if(model.patientProgressNoteList[index].status == 4)
AppText(
'Canceled',fontWeight: FontWeight.w600, color: Colors.red.shade700,fontSize: 12,),
if(model.patientProgressNoteList[index].status == 2)
AppText(
'verified',fontWeight: FontWeight.w600, color: Colors.grey.shade700,fontSize: 12,),
], ],
), ),
), ),

Loading…
Cancel
Save