fix profile issue

merge-requests/626/head
Elham Rababah 5 years ago
parent 0b473f630f
commit 7bc897bf39

@ -147,7 +147,7 @@ class BaseAppClient {
: SETUP_ID; : SETUP_ID;
} }
body['VersionID'] = 5.8; body['VersionID'] = VERSION_ID;
body['Channel'] = CHANNEL; body['Channel'] = CHANNEL;
body['LanguageID'] = languageID == 'ar' ? 1 : 2; body['LanguageID'] = languageID == 'ar' ? 1 : 2;

@ -276,8 +276,8 @@ const Map<String, Map<String, String>> localizedValues = {
'age2': {'en': 'Age: ', 'ar': 'العمر: '}, 'age2': {'en': 'Age: ', 'ar': 'العمر: '},
'replySuccessfully': {'en': 'Reply Successfully', 'ar': 'تم الرد بنجاح'}, 'replySuccessfully': {'en': 'Reply Successfully', 'ar': 'تم الرد بنجاح'},
"sick-leaves": {"en": "Patient Sick Leave", "ar": "الاجازات المرضية"}, "sick-leaves": {"en": "Patient Sick Leave", "ar": "الاجازات المرضية"},
"patient-sick": {"en": "Patient Sick", "ar": "المرضية"}, "patient-sick": {"en": "Patient Sick", "ar": "مرضية"},
"leave": {"en": "Leave", "ar": "غادر"}, "leave": {"en": "Leave", "ar": "مغادره"},
"submit": {"en": "Submit", "ar": "ارسال"}, "submit": {"en": "Submit", "ar": "ارسال"},
"doc-name": {"en": "Doctor Name", "ar": "اسم الطبيب"}, "doc-name": {"en": "Doctor Name", "ar": "اسم الطبيب"},
"clinicname": {"en": "Clinic Name", "ar": "اسم العيادة"}, "clinicname": {"en": "Clinic Name", "ar": "اسم العيادة"},
@ -819,7 +819,7 @@ const Map<String, Map<String, String>> localizedValues = {
"add-reschedule": {"en": "Add reschedule", "ar": "أضف إعادة الجدولة"}, "add-reschedule": {"en": "Add reschedule", "ar": "أضف إعادة الجدولة"},
"update-reschedule": {"en": "Update reschedule", "ar": "تحديث إعادة الجدولة"}, "update-reschedule": {"en": "Update reschedule", "ar": "تحديث إعادة الجدولة"},
"sick_leave": {"en": "Sick Leave", "ar": "أجازة مرضية"}, "sick_leave": {"en": "Sick Leave", "ar": "إجازة مرضية"},
"addSickLeaveRequest": { "addSickLeaveRequest": {
"en": "Add Sick Leave Request", "en": "Add Sick Leave Request",
"ar": "إضافة طلب إجازة مرضية" "ar": "إضافة طلب إجازة مرضية"
@ -928,8 +928,8 @@ const Map<String, Map<String, String>> localizedValues = {
"newRadiologyOrder": {"en": "New Radiology Order", "ar": "طلب الأشعة الجديد"}, "newRadiologyOrder": {"en": "New Radiology Order", "ar": "طلب الأشعة الجديد"},
"orderDate": {"en": "Order Date", "ar": "تاريخ الطلب"}, "orderDate": {"en": "Order Date", "ar": "تاريخ الطلب"},
"examType": {"en": "Exam Type", "ar": "نوع الفحص"}, "examType": {"en": "Exam Type", "ar": "نوع الفحص"},
"health": {"en": "Health", "ar": "التقرير"}, "health": {"en": "Health", "ar": "الصحي"},
"summary": {"en": "Summary", "ar": "الصحي"}, "summary": {"en": "Summary", "ar": "التقرير"},
"applyForNewPrescriptionsOrder": { "applyForNewPrescriptionsOrder": {
"en": "Apply for New Prescriptions Order", "en": "Apply for New Prescriptions Order",
"ar": "التقدم بطلب للحصول على وصفات طبية جديدة " "ar": "التقدم بطلب للحصول على وصفات طبية جديدة "
@ -956,6 +956,11 @@ const Map<String, Map<String, String>> localizedValues = {
'noteAdd': {'en': 'Add ', 'ar': 'اضف '}, 'noteAdd': {'en': 'Add ', 'ar': 'اضف '},
'noteUpdateْْ': {'en': 'Update ', 'ar': 'تحديت'}, 'noteUpdateْْ': {'en': 'Update ', 'ar': 'تحديت'},
'orderSheet': {'en': 'Order Sheet', 'ar': 'ورقة الطلب'}, 'orderSheet': {'en': 'Order Sheet', 'ar': 'ورقة الطلب'},
'order': {'en': 'Order', 'ar': 'الطلب'},
'sheet': {'en': 'Sheet', 'ar': 'ورقة'},
'medical': {'en': 'Medical', 'ar': 'الطبي'},
'report': {'en': 'Report', 'ar': 'التقرير'},
'discharge': {'en': 'Discharge', 'ar': 'discharge'},
}; };

@ -1,5 +1,5 @@
import 'package:doctor_app_flutter/root_page.dart'; import 'package:doctor_app_flutter/root_page.dart';
import 'package:doctor_app_flutter/screens/medical-file/medical_file_page.dart'; import 'package:doctor_app_flutter/screens/medical-file/health_summary_page.dart';
import 'package:doctor_app_flutter/screens/patients/ECGPage.dart'; import 'package:doctor_app_flutter/screens/patients/ECGPage.dart';
import 'package:doctor_app_flutter/screens/patients/insurance_approval_screen_patient.dart'; import 'package:doctor_app_flutter/screens/patients/insurance_approval_screen_patient.dart';
import 'package:doctor_app_flutter/screens/patients/profile/UCAF/UCAF-detail-screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/UCAF/UCAF-detail-screen.dart';
@ -37,7 +37,7 @@ const String PATIENTS = 'patients/patients';
const String PATIENTS_PROFILE = 'patients/patients-profile'; const String PATIENTS_PROFILE = 'patients/patients-profile';
const String IN_PATIENTS_PROFILE = 'inpatients/patients-profile'; const String IN_PATIENTS_PROFILE = 'inpatients/patients-profile';
const String LAB_RESULT = 'patients/lab_result'; const String LAB_RESULT = 'patients/lab_result';
const String MEDICAL_FILE = 'patients/radiology'; const String HEALTH_SUMMARY = 'patients/health-summary';
const String PROGRESS_NOTE = 'patients/progress-note'; const String PROGRESS_NOTE = 'patients/progress-note';
const String ORDER_NOTE = 'patients/order-note'; const String ORDER_NOTE = 'patients/order-note';
@ -70,7 +70,7 @@ var routes = {
VERIFICATION_METHODS: (_) => VerificationMethodsScreen(), VERIFICATION_METHODS: (_) => VerificationMethodsScreen(),
PATIENTS_PROFILE: (_) => PatientProfileScreen(), PATIENTS_PROFILE: (_) => PatientProfileScreen(),
LAB_RESULT: (_) => LabsHomePage(), LAB_RESULT: (_) => LabsHomePage(),
MEDICAL_FILE: (_) => MedicalFilePage(), HEALTH_SUMMARY: (_) => HealthSummaryPage(),
PROGRESS_NOTE: (_) => ProgressNoteScreen(visitType: 5,), PROGRESS_NOTE: (_) => ProgressNoteScreen(visitType: 5,),
ORDER_NOTE: (_) => ProgressNoteScreen(visitType: 3,), ORDER_NOTE: (_) => ProgressNoteScreen(visitType: 3,),
REFER_PATIENT_TO_DOCTOR: (_) => PatientMakeReferralScreen(), REFER_PATIENT_TO_DOCTOR: (_) => PatientMakeReferralScreen(),

@ -11,12 +11,12 @@ import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class MedicalFilePage extends StatefulWidget { class HealthSummaryPage extends StatefulWidget {
@override @override
_MedicalFilePageState createState() => _MedicalFilePageState(); _HealthSummaryPageState createState() => _HealthSummaryPageState();
} }
class _MedicalFilePageState extends State<MedicalFilePage> { class _HealthSummaryPageState extends State<HealthSummaryPage> {
PatiantInformtion patient; PatiantInformtion patient;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

@ -141,7 +141,7 @@ class _InPatientProfileScreenState extends State<InPatientProfileScreen>with Sin
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: MEDICAL_FILE, route: HEALTH_SUMMARY,
nameLine1: "Health", nameLine1: "Health",
//TranslationBase.of(context).medicalReport, //TranslationBase.of(context).medicalReport,
nameLine2: "Summary", nameLine2: "Summary",
@ -152,7 +152,7 @@ class _InPatientProfileScreenState extends State<InPatientProfileScreen>with Sin
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
isDisable: true, isDisable: true,
route: MEDICAL_FILE, route: HEALTH_SUMMARY,
nameLine1: "Medical", //Health nameLine1: "Medical", //Health
//TranslationBase.of(context).medicalReport, //TranslationBase.of(context).medicalReport,
nameLine2: "Report", //Report nameLine2: "Report", //Report

@ -146,12 +146,9 @@ class ProfileGridForInPatient extends StatelessWidget {
route: ORDER_NOTE, route: ORDER_NOTE,
isDischargedPatient: isDischargedPatient:
isDischargedPatient, isDischargedPatient,
nameLine1: nameLine1:TranslationBase.of(context).order,
"Order",
//"Text",
nameLine2: nameLine2:
"Sheet", TranslationBase.of(context).sheet,
//TranslationBase.of(context).orders,
icon: icon:
'patient/Progress_notes.png'), 'patient/Progress_notes.png'),
PatientProfileButton( PatientProfileButton(
@ -176,11 +173,11 @@ class ProfileGridForInPatient extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: MEDICAL_FILE, route: HEALTH_SUMMARY,
nameLine1: "Health", nameLine1: TranslationBase.of(context).health,
nameLine2: TranslationBase.of(context).summary,
isInPatient: isInpatient, isInPatient: isInpatient,
nameLine2: "Summary",
//TranslationBase.of(context).summaryReport,
icon: icon:
'patient/health_summary.png'), 'patient/health_summary.png'),
PatientProfileButton( PatientProfileButton(
@ -188,15 +185,12 @@ class ProfileGridForInPatient extends StatelessWidget {
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
isDisable: true, isDisable: true,
route: MEDICAL_FILE, route: HEALTH_SUMMARY,
nameLine1: nameLine1:
"Medical", TranslationBase.of(context).medical,
//Health
isInPatient: isInpatient,
nameLine2: nameLine2:
"Report", TranslationBase.of(context).report,
//Report isInPatient: isInpatient,
//TranslationBase.of(context).summaryReport,
icon: icon:
'patient/health_summary.png'), 'patient/health_summary.png'),
PatientProfileButton( PatientProfileButton(
@ -246,8 +240,8 @@ class ProfileGridForInPatient extends StatelessWidget {
arrivalType: arrivalType, arrivalType: arrivalType,
isDisable: true, isDisable: true,
route: null, route: null,
nameLine1: "Discharge", nameLine1: TranslationBase.of(context).discharge,
nameLine2: "Summery", nameLine2: TranslationBase.of(context).report,
icon: icon:
'patient/patient_sick_leave.png'), 'patient/patient_sick_leave.png'),
PatientProfileButton( PatientProfileButton(

@ -131,11 +131,9 @@ class ProfileGridForOther extends StatelessWidget {
patientType, patientType,
arrivalType: arrivalType:
arrivalType, arrivalType,
route: MEDICAL_FILE, route: HEALTH_SUMMARY,
nameLine1: "Health", nameLine1: TranslationBase.of(context).health,
//TranslationBase.of(context).medicalReport, nameLine2: TranslationBase.of(context).summary,
nameLine2: "Summary",
//TranslationBase.of(context).summaryReport,
icon: icon:
'patient/health_summary.png'), 'patient/health_summary.png'),
PatientProfileButton( PatientProfileButton(

@ -80,11 +80,9 @@ class ProfileGridForSearch extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: MEDICAL_FILE, route: HEALTH_SUMMARY,
nameLine1: "Health", nameLine1: TranslationBase.of(context).health,
//TranslationBase.of(context).medicalReport, nameLine2: TranslationBase.of(context).summary,
nameLine2: "Summary",
//TranslationBase.of(context).summaryReport,
icon: 'patient/health_summary.png'), icon: 'patient/health_summary.png'),
PatientProfileButton( PatientProfileButton(
isInPatient: isInpatient, isInPatient: isInpatient,

@ -1,5 +1,6 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/model/sick_leave_patient_model.dart'; import 'package:doctor_app_flutter/core/model/sick_leave_patient_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/sick_leave_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/sick_leave_view_model.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/models/sickleave/get_all_sickleave_response.dart'; import 'package:doctor_app_flutter/models/sickleave/get_all_sickleave_response.dart';
@ -14,11 +15,15 @@ import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart';
// ignore: must_be_immutable
class AddSickLeavScreen extends StatelessWidget { class AddSickLeavScreen extends StatelessWidget {
PatiantInformtion patient; PatiantInformtion patient;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectsProvider = Provider.of<ProjectViewModel>(context);
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute.of(context).settings.arguments as Map;
patient = routeArgs['patient']; patient = routeArgs['patient'];
bool isInpatient = routeArgs['isInpatient']; bool isInpatient = routeArgs['isInpatient'];
@ -37,8 +42,6 @@ class AddSickLeavScreen extends StatelessWidget {
), ),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column(children: [ child: Column(children: [
// PatientProfileHeaderNewDesign(
// patient, routeArgs['patientType'], routeArgs['arrivalType']),
patient.patientStatusType == 43 patient.patientStatusType == 43
? Column( ? Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -48,6 +51,7 @@ class AddSickLeavScreen extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
if(!projectsProvider.isArabic)
AppText( AppText(
TranslationBase.of(context).patient, TranslationBase.of(context).patient,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,

@ -1325,6 +1325,16 @@ class TranslationBase {
String get orderSheet => String get orderSheet =>
localizedValues["orderSheet"][locale.languageCode]; localizedValues["orderSheet"][locale.languageCode];
String get order =>
localizedValues["order"][locale.languageCode];
String get sheet =>
localizedValues["sheet"][locale.languageCode];
String get medical =>
localizedValues["medical"][locale.languageCode];
String get report =>
localizedValues["report"][locale.languageCode];
String get discharge =>
localizedValues["discharge"][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -77,7 +77,7 @@ class PatientProfileButton extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
this.nameLine1, !projectsProvider.isArabic?this.nameLine1: nameLine2,
color: Colors.black, color: Colors.black,
/*Color(0xFFB9382C),*/ /*Color(0xFFB9382C),*/
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -85,7 +85,7 @@ class PatientProfileButton extends StatelessWidget {
fontSize: SizeConfig.textMultiplier * 1.5, fontSize: SizeConfig.textMultiplier * 1.5,
), ),
AppText( AppText(
this.nameLine2, !projectsProvider.isArabic? this.nameLine2:nameLine1,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
textAlign: TextAlign.left, textAlign: TextAlign.left,

@ -52,7 +52,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: MEDICAL_FILE, route: HEALTH_SUMMARY,
nameLine1: "Health" ,//TranslationBase.of(context).medicalReport, nameLine1: "Health" ,//TranslationBase.of(context).medicalReport,
nameLine2: "Summary",//TranslationBase.of(context).summaryReport, nameLine2: "Summary",//TranslationBase.of(context).summaryReport,
icon: 'patient/health_summary.png'), icon: 'patient/health_summary.png'),

@ -113,7 +113,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: MEDICAL_FILE, route: HEALTH_SUMMARY,
nameLine1: "Health", nameLine1: "Health",
//TranslationBase.of(context).medicalReport, //TranslationBase.of(context).medicalReport,
nameLine2: "Summary", nameLine2: "Summary",
@ -125,7 +125,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget {
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
isDisable: true, isDisable: true,
route: MEDICAL_FILE, route: HEALTH_SUMMARY,
nameLine1: "Medical", //Health nameLine1: "Medical", //Health
//TranslationBase.of(context).medicalReport, //TranslationBase.of(context).medicalReport,
nameLine2: "Report", //Report nameLine2: "Report", //Report

@ -173,7 +173,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: MEDICAL_FILE, route: HEALTH_SUMMARY,
nameLine1: "Health", nameLine1: "Health",
//TranslationBase.of(context).medicalReport, //TranslationBase.of(context).medicalReport,
nameLine2: "Summary", nameLine2: "Summary",
@ -185,7 +185,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
isDisable: true, isDisable: true,
route: MEDICAL_FILE, route: HEALTH_SUMMARY,
nameLine1: "Medical", //Health nameLine1: "Medical", //Health
//TranslationBase.of(context).medicalReport, //TranslationBase.of(context).medicalReport,
nameLine2: "Report", //Report nameLine2: "Report", //Report
@ -256,7 +256,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: MEDICAL_FILE, route: HEALTH_SUMMARY,
nameLine1: nameLine1:
"Health", //TranslationBase.of(context).medicalReport, "Health", //TranslationBase.of(context).medicalReport,
nameLine2: nameLine2:

Loading…
Cancel
Save