Commit Graph

396 Commits (0a33d5fd0777f84deb0cee1a8f3b172bf1fbcb10)

Author SHA1 Message Date
Mohammad Aljammal 0e2bcd7916 Fix Qr issues 4 years ago
Elham Rababah ca6306950d Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_elham
 Conflicts:
	ios/Podfile
	lib/client/base_app_client.dart
	lib/core/model/patient_muse/PatientSearchRequestModel.dart
	lib/core/model/referral/MyReferralPatientModel.dart
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/service/patient/MyReferralPatientService.dart
	lib/core/service/patient/patient_service.dart
	lib/core/viewModel/LiveCarePatientViewModel.dart
	lib/core/viewModel/PatientMedicalReportViewModel.dart
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/core/viewModel/authentication_view_model.dart
	lib/core/viewModel/dashboard_view_model.dart
	lib/core/viewModel/patient-referral-viewmodel.dart
	lib/core/viewModel/procedure_View_model.dart
	lib/core/viewModel/referred_view_model.dart
	lib/models/livecare/start_call_req.dart
	lib/models/patient/patiant_info_model.dart
	lib/screens/auth/login_screen.dart
	lib/screens/auth/verification_methods_screen.dart
	lib/screens/home/dashboard_slider-item-widget.dart
	lib/screens/home/dashboard_swipe_widget.dart
	lib/screens/home/home_page_card.dart
	lib/screens/home/home_patient_card.dart
	lib/screens/home/home_screen.dart
	lib/screens/live_care/end_call_screen.dart
	lib/screens/live_care/live-care_transfer_to_admin.dart
	lib/screens/live_care/live_care_patient_screen.dart
	lib/screens/medical-file/health_summary_page.dart
	lib/screens/medical-file/medical_file_details.dart
	lib/screens/patients/ECGPage.dart
	lib/screens/patients/insurance_approval_screen_patient.dart
	lib/screens/patients/insurance_approvals_details.dart
	lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
	lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
	lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
	lib/screens/patients/profile/admission-request/admission-request-third-screen.dart
	lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
	lib/screens/patients/profile/medical_report/AddVerifyMedicalReport.dart
	lib/screens/patients/profile/medical_report/MedicalReportPage.dart
	lib/screens/patients/profile/note/progress_note_screen.dart
	lib/screens/patients/profile/profile_screen/PatientProfileCardModel.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/screens/patients/profile/radiology/radiology_details_page.dart
	lib/screens/patients/profile/radiology/radiology_home_page.dart
	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
	lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart
	lib/screens/patients/profile/referral/refer-patient-screen-in-patient.dart
	lib/screens/patients/profile/referral/refer-patient-screen.dart
	lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
	lib/screens/patients/profile/referral/referred-patient-screen.dart
	lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart
	lib/screens/patients/profile/soap_update/update_soap_index.dart
	lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
	lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart
	lib/screens/prescription/add_favourite_prescription.dart
	lib/screens/prescription/add_prescription_form.dart
	lib/screens/prescription/prescription_home_screen.dart
	lib/screens/prescription/prescription_item_in_patient_page.dart
	lib/screens/prescription/prescription_items_page.dart
	lib/screens/prescription/prescription_screen.dart
	lib/screens/prescription/prescription_screen_history.dart
	lib/screens/prescription/prescriptions_page.dart
	lib/screens/procedures/ProcedureCard.dart
	lib/screens/procedures/add-favourite-procedure.dart
	lib/screens/procedures/add-procedure-form.dart
	lib/screens/procedures/add_lab_home_screen.dart
	lib/screens/procedures/add_lab_orders.dart
	lib/screens/procedures/add_radiology_order.dart
	lib/screens/procedures/add_radiology_screen.dart
	lib/screens/procedures/base_add_procedure_tab_page.dart
	lib/screens/procedures/entity_list_procedure_widget.dart
	lib/screens/qr_reader/QR_reader_screen.dart
	lib/util/VideoChannel.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/auth/sms-popup.dart
	lib/widgets/auth/verification_methods_list.dart
	lib/widgets/dashboard/out_patient_stack.dart
	lib/widgets/patients/patient-referral-item-widget.dart
	lib/widgets/patients/patient_card/PatientCard.dart
	lib/widgets/patients/profile/PatientHeaderWidgetNoAvatar.dart
	lib/widgets/patients/profile/PatientProfileButton.dart
	lib/widgets/patients/profile/patient-page-header-widget.dart
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
	lib/widgets/patients/profile/patient-profile-header-new-design.dart
	lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
	lib/widgets/patients/profile/profile-welcome-widget.dart
	lib/widgets/shared/app_drawer_widget.dart
	lib/widgets/shared/app_scaffold_widget.dart
	lib/widgets/shared/app_texts_widget.dart
	lib/widgets/shared/bottom_navigation_item.dart
	lib/widgets/shared/buttons/app_buttons_widget.dart
	lib/widgets/shared/drawer_item_widget.dart
	pubspec.lock
4 years ago
Mohammad Aljammal 387f75b36c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_home_design
 Conflicts:
	lib/screens/home/home_patient_card.dart
	lib/screens/home/home_screen.dart
4 years ago
Elham Rababah 764e2e29f5 first fix from procedure 4 years ago
Elham Rababah 4e6237f2ce fix header from lab 4 years ago
Elham Rababah 09634716e5 Merge branches 'development' and 'special_clinic' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into special_clinic
 Conflicts:
	lib/locator.dart
4 years ago
Elham Rababah 363b55069f first step form Special Clinic 4 years ago
hussam al-habibeh 3913f8936c Scan QR Code fix 4 years ago
Elham Rababah c46c339933 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into special_clinic
 Conflicts:
	lib/config/config.dart
4 years ago
Elham Rababah 1edd375fd7 first step from special clinic 4 years ago
hussam al-habibeh 142fbb93fd Referrel Doctor reply 4 years ago
mosazaid c44b3d74bb reply changes 4 years ago
mosazaid 1b47b60155 Merge branch 'development' into reply-doctor_changes
# Conflicts:
#	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
4 years ago
mosazaid 10441e4af0 referral changes 4 years ago
Elham Rababah 36caca0e46 test live care and general result header in lab result 4 years ago
Elham Rababah 72966c3269 fix referral patient services 4 years ago
Elham Rababah ecb600c4fc small fixes 4 years ago
mosazaid ec9f628b67 Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
4 years ago
mosazaid 400420bd4d Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
4 years ago
Mohammad Aljammal 6dfcbcca12 Merge branch 'procedure_refactoring' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedure_refactoring
 Conflicts:
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/viewModel/LiveCarePatientViewModel.dart
4 years ago
mosazaid 0fe6d880fd add livecare send instructions 4 years ago
mosazaid 5d0a7a4045 livecare changes 4 years ago
hussam al-habibeh 6989235334 Live care Is Login service 4 years ago
mosazaid b36ddf9317 add prescription to procedure type 4 years ago
Mohammad Aljammal a9a7c8a73c fix patient MRN 4 years ago
Mohammad Aljammal ad74ff00dc fix issues in android and add ChangeCallStatus services in IOS 4 years ago
mosazaid bc48d915c6 procedure refactoring 4 years ago
mosazaid f75ac64cad procedure get template 5 years ago
Mohammad Aljammal 6620c79478 fix ui issues 5 years ago
hussam al-habibeh e068009527 prescription form 5 years ago
Mohammad Aljammal 281a807ec8 fix live care 5 years ago
mosazaid 73cf681e9d lab-result-special 5 years ago
hussam al-habibeh 17cca30b17 procedure changes 5 years ago
Elham Rababah 5778a4a887 view list of Live care patient 5 years ago
Elham Rababah c4b434497a Merge branches 'development' and 'html_editor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor
 Conflicts:
	lib/screens/home/home_screen.dart
5 years ago
Elham Rababah 33ceb01d67 first step from Live care patient list 5 years ago
mosazaid 70d171a599 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 67e0cac742 add livecare to home 5 years ago
Mohammad Aljammal 172b457092 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into expansion_procedure
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
5 years ago
Mohammad Aljammal 40b4a83c6b Fix Expansion Procedure 5 years ago
hussam al-habibeh c182928a5d favourite template Procedure service 5 years ago
hussam al-habibeh 3801d7b59a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
5 years ago
mosazaid deb126fdd5 meical report changes 5 years ago
hussam al-habibeh 066acc404a Procedure template service 5 years ago
mosazaid 9e80a1879e Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/locator.dart
5 years ago
mosazaid fa830cf4da changes 5 years ago
hussam al-habibeh 3b800bcd19 favourite procedure templates 5 years ago
mosazaid 6192d9a84f working on medical-profile 5 years ago
hussam al-habibeh 6b6243232c Procedure template service 5 years ago
Elham Rababah e0be4ec1be move logout function from helper to authentication view model 5 years ago
Elham Rababah 0adcfeccce fix auth bug 5 years ago
Elham Rababah 3ca4ac3632 create method card and remove future builder from verification method widget 5 years ago
hussam al-habibeh 68e9470273 hot fix 5 years ago
hussam al-habibeh c24bb604d4 DashBoard design fix 5 years ago
Haroon Amjad 0244334bb5 Update on store 5 years ago
Elham Rababah 56a5209d92 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient
 Conflicts:
	lib/core/model/PatientSearchRequestModel.dart
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/locator.dart
5 years ago
mosazaid 3e24278d89 in-patient re-design 5 years ago
Elham Rababah cb67dcc9e1 first step from search 5 years ago
Sultan Khan 099bf81d52 homepage and sms popup updated 5 years ago
Mohammad Aljammal f708689d00 hot fixes 5 years ago
Mohammad Aljammal 8b1c400f2b Merge branch 'referral_in_patient' into 'development'
Done Referral Discharged Patient

See merge request Cloud_Solution/doctor_app_flutter!576
5 years ago
Mohammad Aljammal 97c29945d0 Merge branch 'in_patient_services' into 'development'
procedure screen hot fix

See merge request Cloud_Solution/doctor_app_flutter!577
5 years ago
hussam al-habibeh 9a2cd1719b procedure screen hot fix 5 years ago
Mohammad Aljammal b2bcb3dd6d Done Referral Discharged Patient 5 years ago
Mohammad Aljammal 460a5293b9 add Discharged Patient 5 years ago
Mohammad Aljammal e87ba4db50 set VERSION_ID 5.9 5 years ago
mosazaid 42d8fc0207 finish in-patient referral 5 years ago
Mohammad Aljammal 6d530301b6 done first page in ReferralInPatient 5 years ago
Sultan Khan c9150ef088 bug fixes 5 years ago
Mohammad Aljammal 36189adf94 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/shared/doctor_card.dart
5 years ago
hussam al-habibeh e3102b3f5e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
 Conflicts:
	lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart
5 years ago
hussam al-habibeh 94e598c5f2 Insurance Approval In Patient 5 years ago
Mohammad Aljammal fd790978c4 add new referral service 5 years ago
Elham Rababah 4a263dda8a Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
 Conflicts:
	lib/config/config.dart
5 years ago
Elham Rababah 82285ccf39 show progress_note part 5 years ago
Mohammad Aljammal bb8ad61b95 Merge branch 'in_patient_services' into 'development'
Prescriptions for in patient

See merge request Cloud_Solution/doctor_app_flutter!534
5 years ago
hussam al-habibeh 3e0f87527f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services 5 years ago
hussam al-habibeh 017074ba56 Prescriptions for in patient 5 years ago
Elham Rababah f2011301c6 update progress_note 5 years ago
Elham Rababah 5199104d7a show progress_note 5 years ago
Elham Rababah 67abe2a5e7 first step from radiology 5 years ago
Mohammad Aljammal f55bb4e60e add update page 5 years ago
mosazaid a701b6e989 make referral changes 5 years ago
Mohammad Aljammal 327e058fbd fix design issues and merge conflict 5 years ago
Sultan Khan 8654109500 login design updated 5 years ago
Sultan Khan 1fb594617a bug fixes 5 years ago
mosazaid 00975a2ddd fix arrival patient problem 5 years ago
Mohammad Aljammal be55597771 Merge branch 'fix-issues' into 'development'
adding Doctor image in medical file & adding DoctorApp new Icons

See merge request Cloud_Solution/doctor_app_flutter!426
5 years ago
hussam al-habibeh 92d33abac0 adding Doctor image in medical file & adding DoctorApp new Icons 5 years ago
Sultan Khan 66b81d1a27 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 5309ace62e sick leave 5 years ago
Elham Rababah fc98e75ec3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into doctor_replay
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Elham Rababah 04f39315b5 finish doctor replay design 5 years ago
mosazaid cc7c5af1d0 referral details fix bugs 5 years ago
mosazaid f7e0e89bce working on referral card 5 years ago
mosazaid f57a5bbcef working on referral page 5 years ago
mosazaid 1f70498982 Merge branch 'development' into patients-new-design
# Conflicts:
#	lib/config/config.dart
5 years ago
mosazaid 6eaf448d5a working on new design for vital sign and admission request 5 years ago
Sultan Khan eadfe2d6bc bug fixes 5 years ago
mosazaid 8237270e73 fix navigation problem to patient profile cards 5 years ago
Mohammad Aljammal 6267d805f0 hot fixes 5 years ago
Mohammad Aljammal 17f8b05748 Add prescriptions and radiology from the patient app 5 years ago
Sultan Khan 1ac94d9ec8 bug fixes 5 years ago
Sultan Khan 12dc637163 bug fixes 5 years ago
Mohammad Aljammal 7dae41513f Add insurance approval services 5 years ago
Mohammad Aljammal 0742d64428 add lab result services 5 years ago
Mohammad Aljammal e7e4aad962 add ECG service 5 years ago
hussam al-habibeh 983f03108f adding prescription history & Medical file for all patient types 5 years ago
Sultan Khan 1536632cd4 dashboard updated 5 years ago
hussam al-habibeh c239dbc620 Claculate Box Quantity while adding prescrption 5 years ago
hussam al-habibeh 3250f33b43 jira bugs fix 5 years ago
hussam al-habibeh d115564cc1 DA-355 5 years ago
mosazaid a047255f2c add referral get facilties 5 years ago
mosazaid 8d154239bb finish admission request feature 5 years ago
mosazaid a618292d20 bug fixes for DA-284-DA-285 5 years ago
mosazaid 2b3a7f33d1 working on some bug fixes and finish addmission request 5 years ago
mosazaid 5b5954c6f3 working on Admission request feature adding lookup 5 years ago
Sultan Khan 63e8ee8dd0 sick leave 5 years ago
Sultan Khan 722e1a5c41 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan ad99cebf02 login and drug to drug 5 years ago
Mohammad Aljammal 307463865b Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!249
5 years ago
Mohammad Aljammal 3306d6f400 Merge branch 'medical-file' into 'development'
post Procedure

See merge request Cloud_Solution/doctor_app_flutter!248
5 years ago
hussam al-habibeh dd53a9bd4d post Procedure 5 years ago
mosazaid 8726653ffb working on Referral feature 5 years ago
Sultan Khan 909940a6d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 40e9ab864a login changes 5 years ago
Elham 9e7a7210c4 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!244
5 years ago
Elham Rababah 4f1a892be4 first step form create episode 5 years ago
mosazaid 50d7f733b6 working on UCAF datails and add patient procedure list and diagnosis 5 years ago
Mohammad Aljammal f0f98280b4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
5 years ago
Sultan Khan 9bf07d7117 reschedule leave 5 years ago
hussam al-habibeh 4ffeb31181 update procedure fixes 5 years ago
Sultan Khan 4587fdda59 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan e23bb7ce94 reschedule leave 5 years ago
hussam al-habibeh d1a261c847 procedure update 5 years ago
Sultan Khan b2aef274bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 3c968f0de1 doctor leave 5 years ago
hussam al-habibeh b3567df020 medical file model 5 years ago
hussam al-habibeh ce0303fbce Merge branch 'search_in_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/config.dart
5 years ago
hussam al-habibeh adb8033138 update prescription 5 years ago
Mohammad Aljammal 5669021add Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
 Conflicts:
	lib/widgets/patients/profile/SOAP/assessment_page.dart
	lib/widgets/patients/profile/SOAP/subjective/add_allergies_widget.dart
	lib/widgets/patients/profile/SOAP/subjective/subjective_page.dart
5 years ago
Elham Rababah f0fd5d30e1 First step from update process 5 years ago
Elham Rababah ea4bf159c6 commit issue 5 years ago
Sultan Khan 669655307a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 49e9ecfa4a doctor leave 5 years ago
Elham 88c2c04d68 Merge branch 'design-updates' into 'development'
post prescription

See merge request Cloud_Solution/doctor_app_flutter!203
5 years ago
Elham Rababah 05e7762533 fix obj page 5 years ago
Elham Rababah dccf474e70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_arrival_ist
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
	lib/core/service/patient_service.dart
	lib/core/viewModel/patient_view_model.dart
	lib/lookups/patient_lookup.dart
	lib/models/patient/patiant_info_model.dart
	lib/screens/patients/patients_screen.dart
5 years ago
hussam al-habibeh 17079a1bd9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 5 years ago
hussam al-habibeh 9d8514c83b post prescription 5 years ago
Mohammad Aljammal 6f2e764deb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hack_login
 Conflicts:
	lib/client/base_app_client.dart
	lib/routes.dart
5 years ago
Mohammad Aljammal 21252c6ae9 Merge branch 'feature-vital-sign' into 'development'
Feature vital sign

See merge request Cloud_Solution/doctor_app_flutter!201
5 years ago
mosazaid 78e2c662c8 finish vital sign feature, and adding makeReferralResponse 5 years ago
Elham Rababah efee00c79e finish add assessment 5 years ago
mosazaid 25d884c774 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/routes.dart
#	lib/util/helpers.dart
#	lib/util/translations_delegate_base.dart
#	lib/widgets/patients/profile/SOAP/add_SOAP_index.dart
#	pubspec.lock
5 years ago
hussam al-habibeh 0c18d96ba2 post procedure 5 years ago
mosazaid b5c937bd86 Working on vitalSigns,
Merge branch 'development' into feature-vital-sign

# Conflicts:
#	lib/routes.dart
5 years ago
hussam al-habibeh b2aade9b2b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
5 years ago
hussam al-habibeh c7bfe24207 post procedure 5 years ago
Elham Rababah ab9740ccdd remove Vida Auth from config 5 years ago
Elham Rababah edef444534 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/config/config.dart
	lib/core/service/base/lookup-service.dart
5 years ago
Elham Rababah dc4250a4de Post progress Note 5 years ago
hussam al-habibeh 47a350a811 prscription and procedure 5 years ago
hussam al-habibeh d3bf97fdd8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/routes.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/app_buttons_widget.dart
	lib/widgets/shared/app_text_form_field.dart
	lib/widgets/shared/app_texts_widget.dart
5 years ago
Elham Rababah 1491a04b39 PostPhysicalExam works 5 years ago
Elham Rababah cde56a82f2 Finish subjective 5 years ago
mosazaid d11a8e6209 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/core/service/base/base_service.dart
#	lib/locator.dart
5 years ago
mosazaid aafcd89222 working on vitalSigns feature 5 years ago
hussam al-habibeh 1ce6571668 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/routes.dart
	lib/screens/patients/profile/refer_patient_screen.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/app_text_form_field.dart
5 years ago
Sultan Khan 5585274b18 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah d4a1dcfc81 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
	lib/core/service/base/lookup-service.dart
5 years ago
hussam al-habibeh 749e870ea2 get procedures get prescription 5 years ago
Sultan Khan 5dcc03cfa8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah 74d315b887 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
5 years ago
mosazaid 47e9d2a558 Merge branch 'development' into feature--patient-referral
# Conflicts:
#	lib/client/base_app_client.dart
5 years ago
Elham Rababah bb651478a0 Finish subjective 5 years ago
mosazaid 4ac8fe4681 finish refferal module except accept/reject referral
&
Merge branch 'development' into feature--patient-referral

# Conflicts:
#	lib/client/base_app_client.dart
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah 9b0731d5c8 check activation code 5 years ago
Elham Rababah 7001940d0d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_new 5 years ago
mosazaid 7cefbb4dbd add referral pages 5 years ago
Elham Rababah a3dff8c9f8 Post Allergies service 5 years ago
Sultan Khan 8d58348267 dashboard changes 5 years ago
Elham Rababah ef6b1bc50e add master lookups 5 years ago
Sultan Khan e61f3f0281 add sick leave 5 years ago
Elham Rababah 9c018d3c55 first step from patient arrival 5 years ago
Elham Rababah 81352c2b0e small fix. 5 years ago
Elham Rababah 46cdd9482c First step from SOAP 5 years ago
Sultan Khan ba2697c917 sick leave 5 years ago
Elham Rababah 4eee5cd9d8 new login type 5 years ago
Sultan Khan 06f71a22fb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan ac747e7519 dashboard 5 years ago
hussam al-habibeh 6bbc629060 patients out and patients in screens design updates 5 years ago
Elham Rababah 0d8455faa7 Finish medicine search design 5 years ago
Mohammad Aljammal 146a53a6e5 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/config/config.dart
	lib/models/pharmacies/pharmacies_List_request_model.dart
	lib/screens/medicine/medicine_search_screen.dart
5 years ago
Sultan Khan 6eb2da3770 voice search 5 years ago
hussam al-habibeh efc5db9f5b versionID update 5 years ago
Sultan Khan 3f7ef48fd5 live care chages 5 years ago
hussam al-habibeh acaaca314e get clinic list after changing the language 5 years ago
hussam al-habibeh d866d8b9de get clinic list 5 years ago
Mohammad ALjammal c671059a03 fix issues in video call 5 years ago