Merge branch 'get_nursing_progress_note' into 'development'

Get nursing progress note

See merge request Cloud_Solution/doctor_app_flutter!863
merge-requests/864/merge
Mohammad Aljammal 4 years ago
commit b355545549

@ -115,7 +115,7 @@ var routes = {
// PATIENT_UCAF_DETAIL: (_) => UcafDetailScreen(), // PATIENT_UCAF_DETAIL: (_) => UcafDetailScreen(),
PATIENT_ECG: (_) => ECGPage(), PATIENT_ECG: (_) => ECGPage(),
ALL_SPECIAL_LAB_RESULT: (_) => AllLabSpecialResult(), ALL_SPECIAL_LAB_RESULT: (_) => AllLabSpecialResult(),
GET_OPERATION_REPORT: (_) => OperationReportScreen(),
NURSING_PROGRESS_NOTE: (_) => NursingProgressNoteScreen(), NURSING_PROGRESS_NOTE: (_) => NursingProgressNoteScreen(),
DIAGNOSIS_FOR_IN_PATIENT: (_) => DiagnosisScreen(), DIAGNOSIS_FOR_IN_PATIENT: (_) => DiagnosisScreen(),
}; };

@ -92,7 +92,7 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
widthFactor: 0.95, widthFactor: 0.95,
child: CardWithBgWidget( child: CardWithBgWidget(
hasBorder: false, hasBorder: false,
bgColor: Colors.black38, bgColor: Colors.transparent,
widget: Column( widget: Column(
children: [ children: [
Column( Column(

@ -94,7 +94,7 @@ class _ProgressNoteState extends State<NursingProgressNoteScreen> {
widthFactor: 0.95, widthFactor: 0.95,
child: CardWithBgWidget( child: CardWithBgWidget(
hasBorder: false, hasBorder: false,
bgColor: Colors.black38, bgColor: Colors.transparent,
widget: Column( widget: Column(
children: [ children: [
Column( Column(

@ -127,23 +127,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
widthFactor: 0.95, widthFactor: 0.95,
child: CardWithBgWidget( child: CardWithBgWidget(
hasBorder: false, hasBorder: false,
bgColor: model.operationReportList[index] bgColor: Colors.white,
.status ==
1 &&
authenticationViewModel
.doctorProfile.doctorID !=
model.operationReportList[index]
.createdBy
? Color(0xFFCC9B14)
: model.operationReportList[index]
.status ==
4
? Colors.red.shade700
: model.operationReportList[index]
.status ==
2
? Colors.green[600]
: Color(0xFFCC9B14),
widget: Column( widget: Column(
children: [ children: [
Column( Column(

Loading…
Cancel
Save