Commit Graph

358 Commits (2ec9331d2f27e829f5c84e90a2ba2fef2b03f7bb)

Author SHA1 Message Date
Mohammad Aljammal 4d8f42b517 fix issues vital sign issue 5 years ago
Mohammad Aljammal 4f015a1cda Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 5 years ago
Mohammad Aljammal f6983c138a fix issues 5 years ago
Sultan Khan 37ab778fd0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan b505ed1be7 blood type added 5 years ago
Mohammad Aljammal 09a85d9127 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 5 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 5 years ago
Fatimah Alshammari e5bf7acc52 Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima
# Conflicts:
#	lib/core/viewModels/pharmacyModule/order_model_view_model.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/widgets/pharmacy/product_tile.dart
5 years ago
Fatimah Alshammari fda101840a fixed order isuues 5 years ago
Sultan Khan 6b1e7587a8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan a0baaac314 bug fixes 5 years ago
Mohammad Aljammal 9c18c69d90 hot fixes 5 years ago
Sultan Khan 040c8f38ab hot fixes 5 years ago
Mohammad Aljammal 3c2af11084 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
Zohaib Kambrani d8996cf879 Geofence Android Finished 5 years ago
Mohammad Aljammal 6d7cb1b970 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
 Conflicts:
	ios/Runner.xcodeproj/project.pbxproj
	lib/core/service/AuthenticatedUserObject.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mohammad Aljammal 4e2979cd64 fix merge issues 5 years ago
Mohammad Aljammal 7167d58ce2 fix merge issues 5 years ago
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
5 years ago
mosazaid 359eba2da0 make some updates in firebase version and update gradle, finish review order 5 years ago
Zohaib Kambrani 1dc9400ffc Geofencing work in progress on android 5 years ago
Mohammad Aljammal b29fdbb7d0 fix home issues 5 years ago
Mohammad Aljammal 02d72fa27c fix issues 5 years ago
Fatimah Alshammari 4a84483698 fixed order details 5 years ago
Mohammad Aljammal f38f53587b fix issues 5 years ago
Zohaib Kambrani 78928335ef Geofences Login check (unregister/register geozones on logout/logout) 5 years ago
Zohaib Kambrani 6f6ab8d987 no message 5 years ago
Mohammad Aljammal 19f12116c4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 5 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 5 years ago
Zohaib Kambrani b7088f70cd Merge master in to my branch with Geofence iOS 5 years ago
Haroon Amjad 5606c88715 hot fixes 5 years ago
Haroon Amjad 81b51bef51 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 5 years ago
Mohammad Aljammal 4e823c2be4 fix chart and duplicated data in Patient Lab Result 5 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Zohaib Kambrani 67f4b4e167 iOS Geofence in progress 5 years ago
Zohaib Kambrani 8457972fda no message 5 years ago
Mohammad Aljammal b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 5 years ago
Zohaib Kambrani 92ba977fca no message 5 years ago
mosazaid 6ac8d67b83 finish address add/edit/delete/select 5 years ago
Zohaib Kambrani 8d5d55a150 Geofencing in progress 5 years ago
Mohammad Aljammal a2ec01be5d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/landing/home_page.dart
	lib/pages/medical/radiology/radiology_details_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 2f77592bac fix Prescriptions Service and design issues 5 years ago
Mohammad Aljammal 62b923b25e fix send rad report email 5 years ago
Mohammad Aljammal 9cec304712 Merge branch 'sultan' into 'diplomatic-quarter-live'
bug fixes

See merge request Cloud_Solution/diplomatic-quarter!168
5 years ago
Sultan Khan 21ccf1ef86 bug fixes 5 years ago
Mohammad Aljammal 4d203c8a5b fix LabResult 5 years ago
enadhilal 9c55571072 Merge branch 'pharmacy' into enad_pharmacy2 5 years ago
enadhilal c22ca4e29e Merge branch 'pharmacy' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/locator.dart
#	lib/pages/base/base_view.dart
#	lib/pages/landing/home_page.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/product_tile.dart
5 years ago
enadhilal 888a74fb9b add these pages
​Product Tile Component
Product Detail Page
​Wishlist Page
​Reviews Page
Brands Page + Search
5 years ago
Fatimah Alshammari 706980248a Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/home_page.dart
5 years ago
Fatimah Alshammari 9b8103bfd6 fixe order and order details 5 years ago
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 5 years ago
hussam al-habibeh a1906a4072 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
5 years ago
hussam al-habibeh 800565407d 12/6 5 years ago
mosazaid 4c9a1862d2 make pharmacy home page load data even without login, and some mini changes 5 years ago
haroon amjad 257dc3d76d Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
create terms-condition in pharmacy order page

See merge request Cloud_Solution/diplomatic-quarter!154
5 years ago
umasoodch b5413d1749 Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid 709ba2ce97 create terms-condition in pharmacy order page 5 years ago
Sultan Khan f5b7d35f23 bug fixes 5 years ago
hussam al-habibeh 64cbae3602 Search 5 years ago
Sultan Khan 81c8239412 bug fixes 5 years ago
mosazaid 35d0d3e441 finsi lakum points task 5 years ago
haroon amjad 47b030eb82 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	ios/Flutter/.last_build_id
#	lib/config/config.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad 7edb0c8009 Doctor rating dialog revamped 5 years ago
Mohammad Aljammal 3daef6e53f add images info 5 years ago
haroon amjad 65fbd7af8e referral finalised 5 years ago
Zohaib Kambrani 1155466d19 Packages and Offer Slider at home 5 years ago
mosazaid 98f660e29b Merge branch 'pharmacy' 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/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
mosazaid 4e5d6a9a00 finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished 5 years ago
haroon amjad 82e23efd32 working on ereferral 5 years ago
umasoodch 0431eb1ac8 Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/locator.dart
#	lib/pages/base/base_view.dart
#	lib/pages/landing/home_page.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
5 years ago
haroon amjad 6846a8501a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad 0181043da8 Ereferral fixes, smartwatch health data integration 5 years ago
Mohammad Aljammal 2185f5ce11 Merge branch 'hhc_cmc' into 'master'
Hhc cmc

See merge request Cloud_Solution/diplomatic-quarter!138
5 years ago
Elham Rababah 05deaa6322 Address Added Successfully 5 years ago
Elham Rababah 68e4b92717 Address Added Successfully 5 years ago
Sultan Khan de2a5e55eb Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 7d3c1ac852 weather indicator updated 5 years ago
Sultan Khan 648d9d245d health weather indicator 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
Elham Rababah ed56476d81 second step from location fixes 5 years ago
Mohammad Aljammal 54d8965773 done child Vaccination 5 years ago
haroon amjad 97b8aeeff5 Version Control finished 5 years ago
Elham Rababah 7aa7af6de7 finish CMC module 5 years ago
haroon amjad 92db2b2be9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Elham Rababah 3ef22be7da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
 Conflicts:
	lib/config/config.dart
5 years ago
Elham Rababah a87855f445 Fix issues on hhc module 5 years ago
Sultan Khan 340b9770c8 login 5 years ago
Mohammad Aljammal a556e8c1f8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	lib/config/config.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
5 years ago
Fatimah Alshammari d328c74fc4 fix order and orderdetails 5 years ago
Mohammad Aljammal 0ac599ea1c fix vital Sign 5 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 5 years ago
Sultan Khan 391e178484 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 8d499704dc family file changes 5 years ago
Mohammad Aljammal 91cada6901 fix Advance Payment 5 years ago
Mohammad Aljammal dcbc0de69f fix prescription 5 years ago
Mohammad Aljammal 0d098def04 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master
 Conflicts:
	assets/app_icons/config.json
	assets/app_icons/fonts/DQIcons.ttf
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/d_q_icons_icons.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/rateAppointment/rate_appointment_doctor.dart
	lib/uitl/utils.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal 67cc5e2033 fix Prescriptions 5 years ago
Mohammad Aljammal 0966269537 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!116
5 years ago
Sultan Khan 30a8e24521 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago