Merge branch 'get_nursing_progress_note' into 'development'

Get nursing progress note See merge request Cloud_Solution/doctor_app_flutter!863
5 years ago · b355545549
parent 52e5b86f6c 45f4aa9a22
commit b355545549
4 changed files with 4 additions and 20 deletions
--- a/lib/routes.dart
+++ b/lib/routes.dart
@ -115,7 +115,7 @@ var routes = {
  // PATIENT_UCAF_DETAIL: (_) => UcafDetailScreen(),
  PATIENT_ECG: (_) => ECGPage(),
  ALL_SPECIAL_LAB_RESULT: (_) => AllLabSpecialResult(),
-
+  GET_OPERATION_REPORT: (_) => OperationReportScreen(),
  NURSING_PROGRESS_NOTE: (_) => NursingProgressNoteScreen(),
  DIAGNOSIS_FOR_IN_PATIENT: (_) => DiagnosisScreen(),
 };
--- a/lib/screens/patients/profile/diagnosis/diagnosis_screen.dart
+++ b/lib/screens/patients/profile/diagnosis/diagnosis_screen.dart
@ -92,7 +92,7 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
                                widthFactor: 0.95,
                                child: CardWithBgWidget(
                                  hasBorder: false,
-                                  bgColor: Colors.black38,
+                                  bgColor: Colors.transparent,
                                  widget: Column(
                                    children: [
                                      Column(
--- a/lib/screens/patients/profile/notes/nursing_note/nursing_note_screen.dart
+++ b/lib/screens/patients/profile/notes/nursing_note/nursing_note_screen.dart
@ -94,7 +94,7 @@ class _ProgressNoteState extends State<NursingProgressNoteScreen> {
                                widthFactor: 0.95,
                                child: CardWithBgWidget(
                                  hasBorder: false,
-                                  bgColor: Colors.black38,
+                                  bgColor: Colors.transparent,
                                  widget: Column(
                                    children: [
                                      Column(
--- a/lib/screens/patients/profile/operation_report/operation_report.dart
+++ b/lib/screens/patients/profile/operation_report/operation_report.dart
@ -127,23 +127,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
                                widthFactor: 0.95,
                                child: CardWithBgWidget(
                                  hasBorder: false,
-                                  bgColor: model.operationReportList[index]
-                                                  .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),
+                                  bgColor: Colors.white,
                                  widget: Column(
                                    children: [
                                      Column(