Merge branch 'development' into in-patient-changes

merge-requests/579/head
mosazaid 5 years ago
commit 9468450c4d

@ -121,6 +121,16 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
crossAxisAlignment:
CrossAxisAlignment.start,
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 &&
model.patientProgressNoteList[index].status != 4 && authProvider.doctorProfile.doctorID == model.patientProgressNoteList[index].createdBy)
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