Merge branch 'soap_update' into 'development'

Fix profile widget

See merge request Cloud_Solution/doctor_app_flutter!223
merge-requests/224/merge
Elham 5 years ago
commit b291572767

@ -1,14 +1,13 @@
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/routes.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import '../../../config/size_config.dart'; import '../../../config/size_config.dart';
import '../../shared/app_texts_widget.dart'; import '../../shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'PatientProfileButton.dart';
/* /*
*@author: Elham Rababah *@author: Elham Rababah
@ -45,16 +44,15 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine2: TranslationBase.of(context).episode, nameLine2: TranslationBase.of(context).episode,
route: UPDATE_EPISODE, route: UPDATE_EPISODE,
icon: 'modilfy-episode.png'), icon: 'modilfy-episode.png'),
Visibility( if(selectedPatientType == 6 || selectedPatientType == 7)
visible: selectedPatientType == 6 || selectedPatientType == 7, PatientProfileButton(
child: PatientProfileButton( key: key,
key: key, patient: patient,
patient: patient, nameLine1: TranslationBase.of(context).vital,
nameLine1: TranslationBase.of(context).vital, nameLine2: TranslationBase.of(context).signs,
nameLine2: TranslationBase.of(context).signs, route: PATIENT_VITAL_SIGN,
route: PATIENT_VITAL_SIGN, icon: 'heartbeat.png'),
icon: 'heartbeat.png'), if(selectedPatientType != 7)
),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
@ -62,13 +60,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine1: TranslationBase.of(context).lab, nameLine1: TranslationBase.of(context).lab,
nameLine2: TranslationBase.of(context).result, nameLine2: TranslationBase.of(context).result,
icon: 'lab.png'), icon: 'lab.png'),
// PatientProfileButton(
// key: key,
// patient: patient,
// route: PRESCRIPTIONS,
// nameLine1: TranslationBase.of(context).medicines,
// nameLine2: TranslationBase.of(context).prescription,
// icon: 'note.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
@ -76,32 +68,22 @@ 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: 'radiology-1.png'), icon: 'radiology-1.png'),
Visibility( if (selectedPatientType != 0 && selectedPatientType != 5)
visible: selectedPatientType != 0 && selectedPatientType != 5, PatientProfileButton(
child: PatientProfileButton( key: key,
key: key, patient: patient,
patient: patient, route: PROGRESS_NOTE,
route: PROGRESS_NOTE, nameLine1: TranslationBase.of(context).progress,
nameLine1: TranslationBase.of(context).progress, nameLine2: TranslationBase.of(context).note,
nameLine2: TranslationBase.of(context).note, icon: 'heartbeat.png'),
icon: 'heartbeat.png')), if (selectedPatientType == 7)
Visibility( PatientProfileButton(
visible: selectedPatientType == 6 || selectedPatientType == 7,
child: PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
route: PATIENT_ADMISSION_REQUEST, route: PATIENT_ADMISSION_REQUEST,
nameLine1: TranslationBase.of(context).admission, nameLine1: TranslationBase.of(context).admission,
nameLine2: TranslationBase.of(context).request, nameLine2: TranslationBase.of(context).request,
icon: 'heartbeat.png'), icon: 'heartbeat.png'),
),
// PatientProfileButton(
// key: key,
// patient: patient,
// route: PATIENT_INSURANCE_APPROVALS,
// nameLine1: TranslationBase.of(context).insurance,
// nameLine2: TranslationBase.of(context).approvals,
// icon: 'lab.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
@ -116,42 +98,54 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine1: 'Order Test', nameLine1: 'Order Test',
nameLine2: 'Or Procedures', nameLine2: 'Or Procedures',
icon: 'lab.png'), icon: 'lab.png'),
Visibility( if(selectedPatientType == 7)
visible: selectedPatientType == 6 || selectedPatientType == 7, PatientProfileButton(
child: PatientProfileButton( key: key,
key: key, patient: patient,
patient: patient, route: REFER_PATIENT_TO_DOCTOR,
route: REFER_PATIENT_TO_DOCTOR, nameLine1: TranslationBase
nameLine1: TranslationBase.of(context).myReferral, .of(context)
nameLine2: TranslationBase.of(context).patient, .myReferral,
icon: 'note.png')), nameLine2: TranslationBase
Visibility( .of(context)
visible: selectedPatientType != 0 && selectedPatientType != 5, .patient,
child: PatientProfileButton( icon: 'note.png'),
key: key, if(selectedPatientType != 0 && selectedPatientType != 5)
patient: patient, PatientProfileButton(
route: PATIENT_ORDERS, key: key,
nameLine1: TranslationBase.of(context).orders, patient: patient,
nameLine2: TranslationBase.of(context).list, route: PATIENT_ORDERS,
icon: 'radiology-1.png')), nameLine1: TranslationBase
Visibility( .of(context)
visible: selectedPatientType != 0 && selectedPatientType != 5, .orders,
child: PatientProfileButton( nameLine2: TranslationBase
key: key, .of(context)
patient: patient, .list,
route: ADD_SICKLEAVE, icon: 'radiology-1.png'),
nameLine1: TranslationBase.of(context).patientSick, if(selectedPatientType != 0 && selectedPatientType != 5)
nameLine2: TranslationBase.of(context).leave, PatientProfileButton(
icon: 'sick_leaves_icons.png')), key: key,
Visibility( patient: patient,
visible: selectedPatientType == 6 || selectedPatientType == 7, route: ADD_SICKLEAVE,
child: PatientProfileButton( nameLine1: TranslationBase
key: key, .of(context)
patient: patient, .patientSick,
route: PATIENT_UCAF_REQUEST, nameLine2: TranslationBase
nameLine1: TranslationBase.of(context).patient, .of(context)
nameLine2: TranslationBase.of(context).ucaf, .leave,
icon: 'lab.png')), icon: 'sick_leaves_icons.png'),
if( selectedPatientType == 7)
PatientProfileButton(
key: key,
patient: patient,
route: PATIENT_UCAF_REQUEST,
nameLine1: TranslationBase
.of(context)
.patient,
nameLine2: TranslationBase
.of(context)
.ucaf,
icon: 'lab.png'),
]); ]);
} }
} }

Loading…
Cancel
Save