Commit Graph

147 Commits (aa89a05f1d8bcfe18e7a4cf14fcb6f8727573019)

Author SHA1 Message Date
Mohammad Aljammal aa89a05f1d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	ios/Flutter/.last_build_id
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/medical/prescriptions_service.dart
	lib/core/viewModels/project_view_model.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/BookAppointment/BookConfirm.dart
	lib/pages/BookAppointment/DoctorProfile.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/MyAppointments/models/ArrivedButtons.dart
	lib/pages/MyAppointments/widgets/AppointmentActions.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/feedback/send_feedback_page.dart
	lib/pages/insurance/insurance_approval_screen.dart
	lib/pages/insurance/insurance_card_screen.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/pages/medical/balance/my_balance_page.dart
	lib/pages/medical/labs/laboratory_result_page.dart
	lib/pages/medical/labs/labs_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/patient_sick_leave_page.dart
	lib/pages/medical/prescriptions/prescription_details_page.dart
	lib/pages/medical/prescriptions/prescription_items_page.dart
	lib/pages/medical/radiology/radiology_details_page.dart
	lib/pages/medical/radiology/radiology_home_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/pages/medical/reports/reports_page.dart
	lib/pages/pharmacies/pharmacies_list_screen.dart
	lib/pages/settings/profile_setting.dart
	lib/services/authentication/auth_provider.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/buttons/floatingActionButton.dart
	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
	lib/widgets/data_display/medical/doctor_card.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Mohammad Aljammal 02d72fa27c fix issues 4 years ago
Mohammad Aljammal f38f53587b fix issues 4 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 4 years ago
Mohammad Aljammal 4e823c2be4 fix chart and duplicated data in Patient Lab Result 4 years ago
Mohammad Aljammal b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 4 years ago
Mohammad Aljammal 2f77592bac fix Prescriptions Service and design issues 4 years ago
Mohammad Aljammal 4d203c8a5b fix LabResult 4 years ago
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 4 years ago
Sultan Khan 81c8239412 bug fixes 4 years ago
Zohaib Kambrani 1155466d19 Packages and Offer Slider at home 4 years ago
Sultan Khan 7d3c1ac852 weather indicator updated 4 years ago
Sultan Khan 648d9d245d health weather indicator 4 years ago
Zohaib Kambrani 27182ee8db no message 4 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 4 years ago
Mohammad Aljammal 91cada6901 fix Advance Payment 4 years ago
Mohammad Aljammal 67cc5e2033 fix Prescriptions 4 years ago
Mohammad Aljammal 0966269537 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!116
4 years ago
Sultan Khan 30a8e24521 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljammal ddc7eca605 fix Insurance Cards 4 years ago
Mohammad Aljmma a9b11a6b03 fix lab result 4 years ago
Zohaib Kambrani 69d1e4bb0b no message 4 years ago
Mohammad Aljmma 770d28033d fix issues#26 & 27 & 28 4 years ago
Sultan Khan bedafa24cd insurance details 4 years ago
Mohammad Aljmma 8f38dc6077 fix issue #24 4 years ago
Mohammad Aljmma a1684bdd9e fix issue #17 & 18 4 years ago
Mohammad Aljmma e1f6ef5e5b fix Prescriptions history 4 years ago
haroon amjad 05ad8f8db5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Mohammad Aljmma a077d87dd8 fix user authentication data 4 years ago
haroon amjad ffbc7c4af4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/pages/landing/home_page.dart
4 years ago
Mohammad Aljmma 7d2f1cf318 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication 4 years ago
Mohammad Aljmma 570aa514cd fix user authentication data 4 years ago
haroon amjad b7b7ead3ba Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Elham Rababah 5ed4d76a54 Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 15a8e64e7c updates & fixes 4 years ago
Elham Rababah 41b919183f Fix bug on read notifications_page.dart 4 years ago
Elham Rababah 5bd3c7d9ce finish step from notifications_page and create notification_details_page 4 years ago
mosazaid 11ff27bae3 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
4 years ago
mosazaid 9a169ff77b finish home page and start working on order preview page 4 years ago
Elham Rababah 9f2beceb22 First step from notifications_page 4 years ago
Mohammad Aljmma e42f953bd1 fix prescription report issues 4 years ago
mosazaid d1ac4080ca working on pharmacy home page 4 years ago
Mohammad Aljmma e7e32a414b fix barcode 4 years ago
Mohammad Aljmma e10a0a4d54 add splash page fix language issues 4 years ago
Mohammad Aljmma d0ed776ff6 new home health service 4 years ago
jammal 9328f942ba done ER service 4 years ago
jammal 7dc55f3378 Merge branch 'home_health_care' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ios_issues
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart
	lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
jammal bd2254491c done ER service 4 years ago
Mohammad Aljammal d3d0fa00e7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
 Conflicts:
	lib/pages/landing/home_page.dart
4 years ago
Mohammad Aljammal 53bbafdc2b fix Authenticated User Object 4 years ago