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
|
5 years ago |
Mohammad Aljammal
|
4d3371e882
|
Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/screens/live_care/end_call_screen.dart
lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
lib/util/helpers.dart
lib/widgets/patients/profile/patient-profile-app-bar.dart
lib/widgets/shared/app_scaffold_widget.dart
|
5 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
|
5 years ago |
Mohammad Aljammal
|
7614b4aa5c
|
fix the video call issues
|
5 years ago |
Elham Rababah
|
3cf4ef4348
|
check if special in home page
|
5 years ago |
Elham Rababah
|
363b55069f
|
first step form Special Clinic
|
5 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
|
5 years ago |
Elham Rababah
|
1edd375fd7
|
first step from special clinic
|
5 years ago |
hussam al-habibeh
|
110a1983c7
|
flutter vervion 2 migration
|
5 years ago |
Elham Rababah
|
176c0ab97c
|
first step from live care fixes
|
5 years ago |
Elham Rababah
|
ecb600c4fc
|
small fixes
|
5 years ago |
Elham Rababah
|
f81e0b58cb
|
Merge branches 'development' and 'login_home_design' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_home_design
Conflicts:
lib/screens/home/home_screen.dart
|
5 years ago |
Elham Rababah
|
792c85e28a
|
fix live care icon size
|
5 years ago |
Elham Rababah
|
39887f3ead
|
fix issue on design
|
5 years ago |
mosazaid
|
0afe3b3afd
|
livecare changes
|
5 years ago |
Elham Rababah
|
1f8a90e47b
|
add letterspaceing
|
5 years ago |
mosazaid
|
5d0a7a4045
|
livecare changes
|
5 years ago |
Elham Rababah
|
60b5d474c1
|
home design fixes for small and large screen
|
5 years ago |
Elham Rababah
|
c671b60097
|
home design fixes
|
5 years ago |
Elham Rababah
|
d0173bd061
|
home design fixes
|
5 years ago |
Elham Rababah
|
259ea53319
|
home design
|
5 years ago |
Elham Rababah
|
a5ea23c38e
|
improve home page to match the xd
|
5 years ago |
Elham Rababah
|
cc7fedc8f5
|
add middle screen height size
|
5 years ago |
Elham Rababah
|
01abd02d19
|
move referral patient
|
5 years ago |
Elham Rababah
|
4a9748739e
|
improve home design
|
5 years ago |
Elham Rababah
|
70020f35c9
|
fixes in dashboard
|
5 years ago |
Elham Rababah
|
acffc72f56
|
prevent scrolling on home page
|
5 years ago |
Elham Rababah
|
dc22e3f46e
|
fix bottom sheet
|
5 years ago |
Elham Rababah
|
2bff3a594c
|
first step from fix home page design
|
5 years ago |
Mohammad Aljammal
|
725c87fe8b
|
Add favorite procedure templates for lab and radiology
|
5 years ago |
Elham Rababah
|
1bc01e0ad1
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor
|
5 years ago |
Elham Rababah
|
97a855ab70
|
return condition in home page
|
5 years ago |
Elham Rababah
|
5778a4a887
|
view list of Live care patient
|
5 years ago |
mosazaid
|
186461f3a8
|
hot fix
|
5 years ago |
mosazaid
|
67e0cac742
|
add livecare to home
|
5 years ago |
Mohammad Aljammal
|
16dac03b24
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_home_design
Conflicts:
lib/locator.dart
lib/screens/home/home_screen.dart
|
5 years ago |
Mohammad Aljammal
|
f6539c82a6
|
add live care card in home page
|
5 years ago |
mosazaid
|
9e552668c7
|
Merge branch 'development' into medical-profile-services
|
5 years ago |
mosazaid
|
2fabe85b30
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
1cc55d809c
|
fix authentication service
|
5 years ago |
Elham Rababah
|
164a7fd2fc
|
fix merge issues
|
5 years ago |
Elham Rababah
|
56698a82fd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into merge_dev_into_auth_refactor
Conflicts:
lib/core/service/home/auth_service.dart
lib/core/viewModel/auth_view_model.dart
lib/core/viewModel/imei_view_model.dart
lib/locator.dart
lib/screens/auth/login_screen.dart
lib/screens/home/home_screen.dart
lib/screens/patients/patient_search/patient_search_screen.dart
lib/widgets/auth/verification_methods.dart
|
5 years ago |
Elham Rababah
|
0adcfeccce
|
fix auth bug
|
5 years ago |
Elham Rababah
|
6815e47814
|
remove doctor profile view model
|
5 years ago |
Elham Rababah
|
2e71706cab
|
add UNVERIFIED status
|
5 years ago |
mosazaid
|
12bb283a68
|
Merge branch 'development' into home-refactoring
# Conflicts:
# lib/screens/home/home_screen.dart
|
5 years ago |
mosazaid
|
72ee88d567
|
working on dashboard
|
5 years ago |
Mohammad Aljammal
|
8e4321b3da
|
Migration dev to Zohaib branch
|
5 years ago |
Mohammad Aljammal
|
b3ae86db31
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ZohaibKambrani
Conflicts:
lib/screens/patients/DischargedPatientPage.dart
lib/screens/patients/ReferralDischargedPatientDetails.dart
lib/screens/patients/insurance_approvals_details.dart
lib/screens/patients/patients_screen.dart
lib/screens/patients/profile/note/progress_note_screen.dart
lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
lib/screens/prescription/update_prescription_form.dart
lib/screens/sick-leave/add-sickleave.dart
lib/widgets/patients/PatientCard.dart
pubspec.lock
|
5 years ago |
mosazaid
|
2023ce9b55
|
Merge branch 'development' into home-refactoring
# Conflicts:
# lib/core/viewModel/dashboard_view_model.dart
# lib/screens/home/home_screen.dart
|
5 years ago |