f883e1bd78
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/config/localized_values.dart
4 years ago
0b1014a91c
fix blood sugar service on my tracker
4 years ago
0f22a50a5d
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
4 years ago
9a5daed5c3
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
re-design child vaccine and fix some funcrionalities
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
# Conflicts:
# lib/config/localized_values.dart
4 years ago
c65983bfdb
code merged
4 years ago
bbd953ae43
Order Delivery Driver tracking [inprogress]
4 years ago
3a45239059
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
f5d478fd27
re-design child vaccine and fix some funcrionalities
4 years ago
4457b5f109
add translation to ER service
4 years ago
200334d8f8
Fix ER service
4 years ago
c9edb37a3c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc
...
Conflicts:
lib/config/localized_values.dart
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
lib/uitl/translations_delegate_base.dart
4 years ago
d7a046f9ca
fix issue on cmc
4 years ago
5bcc67b77d
Nearest Er fix design
4 years ago
634c874eee
fix design issues
4 years ago
ba4003cb56
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/locator.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/profile/profile.dart
4 years ago
52fa0f6f89
fixed orders
4 years ago
de1b7cc1d0
fix merge issues
4 years ago
3fb522e15f
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
lib/core/model/pharmacies/order_model.dart
lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
lib/core/viewModels/pharmacyModule/order_model_view_model.dart
lib/locator.dart
lib/main.dart
lib/pages/landing/landing_page_pharmcy.dart
lib/pages/parent_categorise_page.dart
lib/pages/pharmacies/screens/cart-order-page.dart
lib/pages/pharmacies/screens/cart-order-preview.dart
lib/pages/pharmacies/screens/pharmacy_module_page.dart
lib/pages/pharmacies/wishlist.dart
lib/pages/pharmacy/order/Order.dart
lib/pages/pharmacy/order/OrderDetails.dart
lib/pages/pharmacy/order/ProductReview.dart
lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
lib/pages/pharmacy/profile/profile.dart
lib/services/pharmacy_services/orderDetails_service.dart
lib/services/pharmacy_services/order_service.dart
lib/services/pharmacy_services/pharmacyAddress_service.dart
lib/services/pharmacy_services/wishList_service.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/borderedButton.dart
lib/widgets/others/app_scaffold_widget.dart
lib/widgets/pharmacy/product_tile.dart
4 years ago
c82f01cd1a
fix merge issues
4 years ago
16d1f667d4
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge
...
Conflicts:
android/app/build.gradle
lib/config/config.dart
lib/pages/pharmacy/profile/profile.dart
lib/widgets/pharmacy/product_tile.dart
4 years ago
38d58ebaaf
Merge branch 'pharmacy' into pharmacy_mosa_branch
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
# lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
# lib/services/pharmacy_services/pharmacyAddress_service.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
18dad434a0
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
...
Conflicts:
lib/config/config.dart
lib/core/service/client/base_app_client.dart
lib/core/service/weather_service.dart
lib/core/viewModels/dashboard_view_model.dart
lib/main.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
lib/pages/BookAppointment/Search.dart
lib/pages/ErService/AmbulanceReq.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/login.dart
lib/pages/login/register.dart
lib/pages/medical/allergies_page.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/doctor/doctor_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/prescriptions/prescriptions_home_page.dart
lib/pages/medical/vital_sign/vital_sign_details_screen.dart
lib/uitl/location_util.dart
lib/widgets/drawer/app_drawer_widget.dart
pubspec.yaml
4 years ago
10734d5994
connecting pages.
...
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
4 years ago
519a474d41
fix live care label and vital sign data
4 years ago
2059b76fc1
fix Medical profile
4 years ago
f6983c138a
fix issues
4 years ago
9c12e949e8
hot fixes
4 years ago
fda101840a
fixed order isuues
4 years ago
9c18c69d90
hot fixes
4 years ago
7167d58ce2
fix merge issues
4 years ago
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
d9759560c3
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
...
Conflicts:
lib/config/localized_values.dart
lib/pages/login/login.dart
4 years ago
02d72fa27c
fix issues
4 years ago
4a84483698
fixed order details
4 years ago
0f594059b5
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
a7dc2fdfd1
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
4 years ago
781fd1c287
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
3aa592e2b0
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
b759758a68
bug fixes
4 years ago
f38f53587b
fix issues
4 years ago
3308aa47e1
fixes
4 years ago
19f12116c4
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
4 years ago
de1e352e98
fix charts and vital sign
4 years ago
c67d41701d
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
5606c88715
hot fixes
4 years ago
92e6275162
Add Confirm send email dialog
4 years ago
051bd1e23f
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
4 years ago
97776ce99b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
4 years ago
b25bdbb6fa
fix LiveChatPage Service LabOrderResult MedicineSearch issues
4 years ago
75de755ccd
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/paymentService/payment_service.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
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
4 years ago
2f77592bac
fix Prescriptions Service and design issues
4 years ago
740a294867
Translation & bug fixes
4 years ago
c813deea29
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
d14e7e5223
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
e28209d4e8
bug fixes
4 years ago
9d3c64200e
fixes
4 years ago
eca2266f7b
hot fixing
4 years ago
4d203c8a5b
fix LabResult
4 years ago
554ed1b50a
fix insurance update
4 years ago
542335364e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
c050c3f189
voice command updated
4 years ago
378562b781
adding some changes in order pages like translate texts
4 years ago
459ba828d9
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
...
Conflicts:
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/landing/home_page.dart
lib/pages/medical/vital_sign/vital_sign_item.dart
lib/routes.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
4 years ago
706980248a
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/home_page.dart
4 years ago
77dcb918c3
Revert "Merge branch 'pharmacy-hussam' into 'master'"
...
This reverts merge request !149
4 years ago
9b8103bfd6
fixe order and order details
4 years ago
af1c59394c
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
496163a61a
voice command updated
4 years ago
9e8def6584
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_issues
...
Conflicts:
lib/config/localized_values.dart
4 years ago
4e2c955b09
add missing translation
4 years ago
dfa1952f4d
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
4 years ago
5dc3c53550
mousa and hussam branch
4 years ago
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
4 years ago
4c9a1862d2
make pharmacy home page load data even without login, and some mini changes
4 years ago
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
4 years ago
7ee7ef58c4
working on dynamic title on pharmacy
4 years ago
umasoodch
b5413d1749
Merge branch 'master' into pharmacy
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
8c5746f7b1
bug fixes
4 years ago
321d31b3bd
voice search page updated
4 years ago
64cbae3602
Search
4 years ago
81c8239412
bug fixes
4 years ago
1c23e28081
fix merge issues
4 years ago
ced86de9fe
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into images_info
...
Conflicts:
lib/config/localized_values.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/balance/my_balance_page.dart
lib/uitl/translations_delegate_base.dart
4 years ago
269f682bd5
Added info images description
4 years ago
35d0d3e441
finsi lakum points task
4 years ago
f1a8e09a59
Added info images description
4 years ago
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
4 years ago
7edb0c8009
Doctor rating dialog revamped
4 years ago
3daef6e53f
add images info
4 years ago
3ab513d9d0
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
713e44cf8b
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
4 years ago
ea195ea9bf
Finish translate CMC HHC
4 years ago
65fbd7af8e
referral finalised
4 years ago
1155466d19
Packages and Offer Slider at home
4 years ago
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
4 years ago
4e5d6a9a00
finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished
4 years ago
5bf63174c9
First step from translations
4 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
4 years ago
8de838a6dc
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
2fb0ccfdbd
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
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
4 years ago
0181043da8
Ereferral fixes, smartwatch health data integration
4 years ago
2185f5ce11
Merge branch 'hhc_cmc' into 'master'
...
Hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!138
4 years ago
27182ee8db
no message
4 years ago
54d8965773
done child Vaccination
4 years ago
97b8aeeff5
Version Control finished
4 years ago
909401cc7e
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
3ef22be7da
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
...
Conflicts:
lib/config/config.dart
4 years ago
a87855f445
Fix issues on hhc module
4 years ago
49974f81db
add translations to child Vaccination
4 years ago
e5feef8a9d
Updates & UI Fixes
4 years ago
0f80224016
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
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
4 years ago
b6d2878cf1
add Radiology translations and colors
4 years ago
d328c74fc4
fix order and orderdetails
4 years ago
b504f379de
fix lab result translations and colors
4 years ago
24b7bca471
no message
4 years ago
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
4 years ago
0966269537
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!116
4 years ago
3c1257b379
fix Medicine Search
4 years ago
30a8e24521
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
91be66ecdd
family file changes
4 years ago
6523a1dea9
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues
...
Conflicts:
lib/config/localized_values.dart
4 years ago
3589b21590
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
770d28033d
fix issues#26 & 27 & 28
4 years ago
b81af62551
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
b89c1f03b3
language translation fixes
4 years ago
8f38dc6077
fix issue #24
4 years ago
536682e953
merge
4 years ago
1eb6516ea6
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
3fef1b9d52
theme and login issues fixed
4 years ago
59defa4532
fix issue #15
4 years ago
5e8b61bf2d
fix issue #13
4 years ago
741126102d
fix issue #11
4 years ago
e1f6ef5e5b
fix Prescriptions history
4 years ago
283473a06a
theme changes
4 years ago
ddf032bb47
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# android/app/build.gradle
# android/app/src/main/AndroidManifest.xml
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/landing/home_page.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
f137bd44c0
created order and order details UI pages
4 years ago
4976870d2e
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
875bf10c73
settings page added
4 years ago
6a83538544
add info for Medical
4 years ago
64f970c40c
Fix issues after the merge
4 years ago
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
0443a37886
register page updated
4 years ago
5bd3c7d9ce
finish step from notifications_page and create notification_details_page
4 years ago
d939b2ec9b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
f8e05fc447
regiter issue
4 years ago
dade295656
fix merge issue
4 years ago
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
9a169ff77b
finish home page and start working on order preview page
4 years ago
9f2beceb22
First step from notifications_page
4 years ago
d1ac4080ca
working on pharmacy home page
4 years ago
479aea4df8
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
...
Conflicts:
lib/uitl/translations_delegate_base.dart
4 years ago
d4be20b07b
add icons
4 years ago
e10a0a4d54
add splash page fix language issues
4 years ago
1553e71e7d
New loading dialog added into appointment flow
4 years ago
856ab52439
fix ui issues
4 years ago
d5118bda11
Login / Register UI fixes
4 years ago
deb828b4dd
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
9328f942ba
done ER service
4 years ago
1e00b9a4d8
added my-profile
4 years ago
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
f03a711dff
symptom checker gender page updated
4 years ago
29f0402cbd
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
...
Conflicts:
lib/config/config.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/pages/AlHabibMedicalService/ health_calculators.dart
lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/services/appointment_services/GetDoctorsList.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
4 years ago
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
84bb68789d
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
...
Conflicts:
lib/config/config.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
lib/pages/ContactUs/findus/hospitrals_page.dart
lib/pages/ContactUs/findus/pharmacies_page.dart
4 years ago
06416b4934
add Not authenticated Page
4 years ago
83ab1b4d61
fix issues in the services logic and add some translation
4 years ago
ea86e88e2e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
7fdc0da9dc
livecare scheduling implemented
4 years ago
c9256a654a
LiveCare Scheduling updates
4 years ago
3ffff9686d
Done allergies service
4 years ago
03ff56f2de
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
9f06ce7d1d
done EyeMeasurements service
4 years ago
4ac77593ad
add payment service page and translations
4 years ago
da7fa1038a
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
57ed83a139
Merge branch 'vaccine' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into patient_sick_leave
...
Conflicts:
lib/config/config.dart
4 years ago
63e6d06e74
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
8e96c79d05
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
...
Conflicts:
lib/config/localized_values.dart
4 years ago
33bd972984
add my vaccines item screen
4 years ago
7908506d5f
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
153335538a
done monthly reports
4 years ago
a98bc226e6
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
68466c8d03
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
...
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/models/Appointments/DoctorListResponse.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/uitl/translations_delegate_base.dart
pubspec.yaml
4 years ago
fe66ee5993
fix lab result issues
4 years ago
f6a3f0e615
family file
4 years ago
51078227ab
Dental appointment flow implemented
4 years ago
1b3a780a29
add ar lan for medical profile
4 years ago
4ffbb80f3d
ER
4 years ago
ef4a57223c
fix DoctorView.dart UI issues
4 years ago
13adb46319
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/config/shared_pref_kay.dart
4 years ago
f669adcb9d
Location service implemented
4 years ago
54b766de81
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
4 years ago
01a011a03d
done dashboard page
4 years ago
3247378c02
search
4 years ago
895c09efa4
parking service
4 years ago
8516f7de1b
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
4 years ago
30c0963063
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
...
Conflicts:
lib/config/localized_values.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
4 years ago
8989fbc9b7
done design dashboard
4 years ago
Mohammad Aljammal
Fatimah Alshammari
Zohaib Iqbal Kambrani
Sultan Khan
mosazaid
Elham Rababah
enadhilal
Mohammad Aljammal
haroon amjad
Haroon Amjad
hussam al-habibeh
umasoodch
Elham Rababah
Zohaib Kambrani
Mohammad Aljmma