re-design

merge-requests/447/head
mosazaid 5 years ago
parent 14b76c9302
commit 583e06c5f2

@ -43,34 +43,6 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
childAspectRatio: 1 / 1.0, childAspectRatio: 1 / 1.0,
crossAxisCount: 3, crossAxisCount: 3,
children: [ children: [
/*if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
patient: patient,
isDisable: patient.episodeNo != 0 ? true : false,
nameLine1: TranslationBase.of(context).createNew,
nameLine2: TranslationBase.of(context).episode,
route: CREATE_EPISODE,
onTap: () async {
PostEpisodeReqModel postEpisodeReqModel = PostEpisodeReqModel(
appointmentNo: patient.appointmentNo,
patientMRN: patient.patientMRN);
await model.postEpisode(postEpisodeReqModel);
patient.episodeNo = model.episodeID;
Navigator.of(context).pushNamed(CREATE_EPISODE,
arguments: {'patient': patient});
},
isLoading: model.state == ViewState.BusyLocal,
icon: 'create-episod.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
patient: patient,
isDisable: patient.episodeNo == 0 ? true : false,
nameLine1: TranslationBase.of(context).update,
nameLine2: TranslationBase.of(context).episode,
route: UPDATE_EPISODE,
icon: 'modilfy-episode.png'),*/
if (int.parse(patientType) == 7 || int.parse(patientType) == 6) if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton( PatientProfileButton(
key: key, key: key,
@ -84,15 +56,6 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
route: VITAL_SIGN_DETAILS, route: VITAL_SIGN_DETAILS,
icon: 'patient/vital_signs.png'), icon: 'patient/vital_signs.png'),
if (selectedPatientType != 7) if (selectedPatientType != 7)
PatientProfileButton(
key: key,
patient: patient,
patientType: patientType,
arrivalType: arrivalType,
route: LAB_RESULT,
nameLine1: TranslationBase.of(context).lab,
nameLine2: TranslationBase.of(context).result,
icon: 'patient/lab_results.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
@ -102,48 +65,34 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine1: TranslationBase.of(context).previewHealth, nameLine1: TranslationBase.of(context).previewHealth,
nameLine2: TranslationBase.of(context).summaryReport, nameLine2: TranslationBase.of(context).summaryReport,
icon: 'patient/health_summary.png'), icon: 'patient/health_summary.png'),
if (selectedPatientType != 0 &&
selectedPatientType != 5 &&
selectedPatientType != 7)
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: PROGRESS_NOTE, route: LAB_RESULT,
nameLine1: TranslationBase.of(context).progress, nameLine1: TranslationBase.of(context).lab,
nameLine2: TranslationBase.of(context).note, nameLine2: TranslationBase.of(context).result,
icon: 'patient/Progress_notes.png'), icon: 'patient/lab_results.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6) if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: PATIENT_ADMISSION_REQUEST, route: RADIOLOGY_PATIENT,
isDisable: patient.patientStatusType != 43 ? true : false, nameLine1: TranslationBase.of(context).radiology,
nameLine1: TranslationBase.of(context).admission, nameLine2: TranslationBase.of(context).service,
nameLine2: TranslationBase.of(context).request, icon: 'patient/health_summary.png'),
icon: 'patient/admission_req.png'), PatientProfileButton(
// (int.parse(patientType) == 7 || int.parse(patientType) == 6) key: key,
// ? PatientProfileButton( patient: patient,
// key: key, patientType: patientType,
// patient: patient, arrivalType: arrivalType,
// patientType: patientType, route: PATIENT_ECG,
// arrivalType: arrivalType, nameLine1: TranslationBase.of(context).patient,
// route: ORDER_PRESCRIPTION, nameLine2: "ECG",
// nameLine1: TranslationBase.of(context).orders, icon: 'patient/patient_sick_leave.png'),
// nameLine2: TranslationBase.of(context).prescription,
// icon: 'patient/order_prescription.png')
// : PatientProfileButton(
// key: key,
// patient: patient,
// patientType: patientType,
// arrivalType: arrivalType,
// route: ORDER_PRESCRIPTION_HISTORY,
// nameLine1: TranslationBase.of(context).orders,
// nameLine2: TranslationBase.of(context).prescription,
// icon: 'patient/order_prescription.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
@ -169,11 +118,10 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: REFER_PATIENT_TO_DOCTOR, route: PATIENT_INSURANCE_APPROVALS_NEW,
isDisable: patient.patientStatusType != 43 ? true : false, nameLine1: TranslationBase.of(context).insurance,
nameLine1: TranslationBase.of(context).myReferral, nameLine2: TranslationBase.of(context).service,
nameLine2: TranslationBase.of(context).patient, icon: 'patient/vital_signs.png'),
icon: 'patient/refer_patient.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6) if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton( PatientProfileButton(
key: key, key: key,
@ -201,29 +149,34 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: RADIOLOGY_PATIENT, route: REFER_PATIENT_TO_DOCTOR,
nameLine1: TranslationBase.of(context).radiology, isDisable: patient.patientStatusType != 43 ? true : false,
nameLine2: TranslationBase.of(context).service, nameLine1: TranslationBase.of(context).myReferral,
icon: 'patient/health_summary.png'), nameLine2: TranslationBase.of(context).patient,
icon: 'patient/refer_patient.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6) if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: PATIENT_INSURANCE_APPROVALS_NEW, route: PATIENT_ADMISSION_REQUEST,
nameLine1: TranslationBase.of(context).insurance, isDisable: patient.patientStatusType != 43 ? true : false,
nameLine2: TranslationBase.of(context).service, nameLine1: TranslationBase.of(context).admission,
icon: 'patient/vital_signs.png'), nameLine2: TranslationBase.of(context).request,
icon: 'patient/admission_req.png'),
if (selectedPatientType != 0 &&
selectedPatientType != 5 &&
selectedPatientType != 7)
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: PATIENT_ECG, route: PROGRESS_NOTE,
nameLine1: TranslationBase.of(context).patient, nameLine1: TranslationBase.of(context).progress,
nameLine2: "ECG", nameLine2: TranslationBase.of(context).note,
icon: 'patient/patient_sick_leave.png'), icon: 'patient/Progress_notes.png'),
], ],
), ),
); );

@ -39,19 +39,21 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: RADIOLOGY_PATIENT, from: from,
nameLine1: TranslationBase.of(context).radiology, to: to,
nameLine2: TranslationBase.of(context).service, nameLine1: TranslationBase.of(context).vital,
icon: 'patient/health_summary.png'), nameLine2: TranslationBase.of(context).signs,
route: VITAL_SIGN_DETAILS,
icon: 'patient/vital_signs.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: PATIENT_INSURANCE_APPROVALS_NEW, route: MEDICAL_FILE,
nameLine1: TranslationBase.of(context).insurance, nameLine1: TranslationBase.of(context).previewHealth,
nameLine2: TranslationBase.of(context).service, nameLine2: TranslationBase.of(context).summaryReport,
icon: 'patient/vital_signs.png'), icon: 'patient/health_summary.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
@ -66,19 +68,19 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
from: from, route: RADIOLOGY_PATIENT,
to: to, nameLine1: TranslationBase.of(context).radiology,
nameLine1: TranslationBase.of(context).vital, nameLine2: TranslationBase.of(context).service,
nameLine2: TranslationBase.of(context).signs, icon: 'patient/health_summary.png'),
route: VITAL_SIGN_DETAILS, PatientProfileButton(
icon: 'patient/vital_signs.png'), key: key,
// PatientProfileButton( patient: patient,
// key: key, patientType: patientType,
// patient: patient, arrivalType: arrivalType,
// route: PATIENT_ADMISSION_REQUEST, route: PATIENT_ECG,
// nameLine1: TranslationBase.of(context).admission, nameLine1: TranslationBase.of(context).patient,
// nameLine2: TranslationBase.of(context).request, nameLine2: "ECG",
// icon: 'heartbeat.png'), icon: 'patient/patient_sick_leave.png'),
(int.parse(patientType) == 7 || int.parse(patientType) == 6) (int.parse(patientType) == 7 || int.parse(patientType) == 6)
? PatientProfileButton( ? PatientProfileButton(
key: key, key: key,
@ -103,19 +105,10 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: MEDICAL_FILE, route: PATIENT_INSURANCE_APPROVALS_NEW,
nameLine1: TranslationBase.of(context).previewHealth, nameLine1: TranslationBase.of(context).insurance,
nameLine2: TranslationBase.of(context).summaryReport, nameLine2: TranslationBase.of(context).service,
icon: 'patient/health_summary.png'), icon: 'patient/vital_signs.png'),
PatientProfileButton(
key: key,
patient: patient,
patientType: patientType,
arrivalType: arrivalType,
route: PATIENT_ECG,
nameLine1: TranslationBase.of(context).patient,
nameLine2: "ECG",
icon: 'patient/patient_sick_leave.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
@ -125,6 +118,13 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
nameLine1: TranslationBase.of(context).patientSick, nameLine1: TranslationBase.of(context).patientSick,
nameLine2: TranslationBase.of(context).leave, nameLine2: TranslationBase.of(context).leave,
icon: 'patient/patient_sick_leave.png'), icon: 'patient/patient_sick_leave.png'),
// PatientProfileButton(
// key: key,
// patient: patient,
// route: PATIENT_ADMISSION_REQUEST,
// nameLine1: TranslationBase.of(context).admission,
// nameLine2: TranslationBase.of(context).request,
// icon: 'heartbeat.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,

@ -278,8 +278,16 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
child: AppButton( child: AppButton(
title: TranslationBase.of(context).next, title: TranslationBase.of(context).next,
loading: model.state == ViewState.BusyLocal, loading: model.state == ViewState.BusyLocal,
color: HexColor("#A5A5A5"), color: widget.mySelectedExamination != null &&
fontColor: HexColor("#5A5A5A"), widget.mySelectedExamination.length > 0
? HexColor("#D02127")
: HexColor("#A5A5A5"),
fontColor: widget.mySelectedExamination != null &&
widget.mySelectedExamination.length > 0 ? Colors.white : HexColor("#5A5A5A"),
disabled: widget.mySelectedExamination != null &&
widget.mySelectedExamination.length > 0
? false
: true,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
onPressed: () async { onPressed: () async {
await submitUpdateObjectivePage(model); await submitUpdateObjectivePage(model);

Loading…
Cancel
Save