Mohammad Aljammal
ed5079e3a0
Merge branch 'pharmacy-bugs' into 'development'
...
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!334
5 years ago
hussam al-habibeh
50d3a42743
fixing dashboard issue
5 years ago
hussam al-habibeh
1ed76e91aa
fixing dashboard issue
5 years ago
Sultan khan
a67e320a8e
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!333
5 years ago
hussam al-habibeh
6dc0d89f61
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
...
Conflicts:
lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
lib/uitl/utils.dart
5 years ago
hussam al-habibeh
981e78936e
jira bugs
5 years ago
Zohaib Iqbal Kambrani
08e0ce52c8
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
fix bugs
5 years ago
Zohaib Iqbal Kambrani
4abdd9bde7
no message
5 years ago
Zohaib Iqbal Kambrani
882d5f090a
Merge branch 'zik-analytics' into ZohaibIqbalKambrani
...
* zik-analytics:
no message
5 years ago
mosazaid
2e33c2b240
fix bugs
5 years ago
Mirza.Shafique
d37f225c1b
Home page 1.2
5 years ago
Mirza.Shafique
5dc88f51c3
Home Page 1.0
5 years ago
Zohaib Iqbal Kambrani
dbf525c484
no message
5 years ago
Sultan Khan
14ef096c32
changes and fixes
5 years ago
Sultan khan
15f620d720
Merge branch 'Jul_fixes' into 'development'
...
Jul fixes
See merge request Cloud_Solution/diplomatic-quarter!322
5 years ago
Mirza.Shafique
58d5734f1a
Bug Fix: 873, 878 to 881
5 years ago
Elham Rababh
c6a68083a4
PAP-667: fix blood type
5 years ago
Elham Rababh
c14adccb49
PAP-667: add unit to home page
5 years ago
Sultan Khan
cd7845b1a4
bug fix
5 years ago
Sultan Khan
3d6858d0ec
bug fixes
5 years ago
Zohaib Iqbal Kambrani
b91ce441e2
Merge branch 'development' into ZohaibIqbalKambrani
...
# Conflicts: Resolved
# lib/core/model/pharmacies/order_model.dart
# lib/core/service/client/base_app_client.dart
# lib/main.dart
# lib/pages/landing/home_page.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/order/TrackDriver.dart
# lib/routes.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
5 years ago
Zohaib Iqbal Kambrani
6f2c947687
Packages And offers..
5 years ago
haroon amjad
e0ebb922ed
pharmacy fixes
5 years ago
haroon amjad
b9a12341d5
updates & fixes
5 years ago
Fatimah Alshammari
747763c4be
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
5 years ago
Fatimah Alshammari
a46dddea9a
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/core/model/pharmacies/order_model.dart
# lib/pages/pharmacies/product-brands.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/profile/profile.dart
5 years ago
Sultan Khan
1a35fe37b6
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
e61c26b853
Auto SMS, Themes, Voice Command
5 years ago
haroon amjad
da3ad90ddd
added app-wide route transition animation
5 years ago
haroon amjad
d8e11f7187
Merge branch 'development' into Haroon
5 years ago
haroon amjad
deb0b40cfe
fixes
5 years ago
enadhilal
0cb493d56c
Merge branch 'development' into enad_pharmacy2
...
# Conflicts:
# lib/pages/pharmacies/product_detail.dart
5 years ago
enadhilal
0c6fb67718
fixed issues
5 years ago
mosazaid
125dd27a00
Merge branch 'development' into fix-pharmacy
5 years ago
mosazaid
5d0a122689
fix bugs
5 years ago
Sultan Khan
144ef52c70
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
b3e6c4efda
voice command changes
5 years ago
haroon amjad
f72c860516
Merge branch 'development' into Haroon
5 years ago
haroon amjad
69649ff7f8
added verified icon in homepage when patient is logged in
5 years ago
Elham Rababah
8a1924cca2
fix images in hhc
5 years ago
Sultan Khan
d33918c932
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
9fca52efca
voice command
5 years ago
Mohammad Aljammal
d477481856
fix security issues in pharmacy
5 years ago
Sikander Saleem
8f37fbf260
Qr icon added, notify me api added & improvements
5 years ago
Sultan Khan
3ac69692be
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
0213264b7f
bug fixes
5 years ago
Mohammad Aljammal
3e441c55b2
fix bottom nav bar
5 years ago
Sultan Khan
ccd2fc5068
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
haroon amjad
6945230965
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/pages/landing/home_page.dart
# lib/pages/medical/smart_watch_health_data/health_data_list.dart
# lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
5 years ago
Zohaib Iqbal Kambrani
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
5 years ago
Sultan Khan
c65983bfdb
code merged
5 years ago
Sultan Khan
86cf9300e1
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
...
* 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter : (136 commits)
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
some design enhancments
fix design
fix android
fix merge issues
fix merge issues
commit
fix merge issues
change color
return privilege
return privilege
fix issues
...
5 years ago
Elham Rababah
d7a046f9ca
fix issue on cmc
5 years ago
Zohaib Iqbal Kambrani
e2bce87e34
resolve merge conflicts.
5 years ago
Mohammad Aljammal
30ddea6419
hot fixing
5 years ago
Zohaib Iqbal Kambrani
dc83b476d6
Merge branch 'development' into ZohaibIqbalKambrani
...
# Conflicts:
# android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
# ios/Flutter/.last_build_id
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mohammad Aljammal
ed729689a9
Merge branch 'design_issues' into 'development'
...
fix design issues
See merge request Cloud_Solution/diplomatic-quarter!237
5 years ago
Mohammad Aljammal
634c874eee
fix design issues
5 years ago
mosazaid
2843b1393e
some design enhancments
5 years ago
Mohammad Aljammal
de1b7cc1d0
fix merge issues
5 years ago
Mohammad Aljammal
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
5 years ago
Mohammad Aljammal
952e106531
return privilege
5 years ago
Mohammad Aljammal
f77d2b497e
fix issues
5 years ago
Mohammad Aljammal
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
5 years ago
enadhilal
10734d5994
connecting pages.
...
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
5 years ago
Mohammad Aljammal
6bda03e935
hot fixing
5 years ago
Mohammad Aljammal
5e3f6363cf
fix issues
5 years ago
Sultan Khan
8becd4f920
login issue fixed
5 years ago
Sultan Khan
73c8e00852
bug fixes
5 years ago
Sultan Khan
18f492e52f
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
d53031b0e6
blood type update for family files
5 years ago
Mohammad Aljammal
2059b76fc1
fix Medical profile
5 years ago
Mohammad Aljammal
4d8f42b517
fix issues vital sign issue
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
Zohaib Kambrani
508bc191be
geofencing login check fix
5 years ago
Sultan Khan
a0baaac314
bug fixes
5 years ago
Zohaib Kambrani
d8bd7d145d
no message
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
d28870a629
fix merge issues
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
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
Zohaib Kambrani
1dc9400ffc
Geofencing work in progress on android
5 years ago
Sultan Khan
e312671e24
hot fixes
5 years ago
Sultan Khan
cf642da661
landing page
5 years ago
Sultan Khan
eec67ac930
big fixes
5 years ago
Sultan Khan
99ee5b4545
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljammal
b29fdbb7d0
fix home issues
5 years ago
Sultan Khan
8a554aa2f8
auth services fixed
5 years ago
Sultan Khan
3aa592e2b0
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
b759758a68
bug fixes
5 years ago
Mohammad Aljammal
f38f53587b
fix issues
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
53775d113d
commented code offers and packages
5 years ago
Zohaib Kambrani
9947b30d3f
fix merge conflict
5 years ago
Zohaib Kambrani
9ea779e48a
no message
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
8457972fda
no message
5 years ago
haroon amjad
951d9b553f
fixes & updates
5 years ago
Zohaib Kambrani
92ba977fca
no message
5 years ago
Sultan Khan
557b8e814f
voice command
5 years ago
haroon amjad
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
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
5083080ba3
fix vital sign details
5 years ago
haroon amjad
1db5b15dcd
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
5 years ago
haroon amjad
9ecaaa1b12
radiology fix in appointment details
5 years ago
Sultan Khan
9d9d77ee3a
bug fixes
5 years ago
Sultan Khan
c813deea29
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
188b72bb90
voice command
5 years ago
Sultan Khan
e28209d4e8
bug fixes
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
Sultan Khan
ce7a64e86e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
haroon amjad
33956db22a
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/config/config.dart
5 years ago
Mohammad Aljammal
9dfd8a71dc
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
...
Conflicts:
lib/locator.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/login/confirm-login.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/widgets/bottom_navigation/bottom_nav_bar.dart
lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Sultan Khan
7f44677242
voice command priv
5 years ago
Mohammad Aljammal
935e72975c
add new privilege
5 years ago
Sultan Khan
542335364e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
c050c3f189
voice command updated
5 years ago
haroon amjad
cf6686e413
Merge branch 'master' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari
ed68eed9df
added links for profile
5 years ago
Mohammad Aljammal
2e2a29145c
fix merge issues
5 years ago
Mohammad Aljammal
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
5 years ago
Mohammad Aljammal
77dcb918c3
Revert "Merge branch 'pharmacy-hussam' into 'master'"
...
This reverts merge request !149
5 years ago
Sultan Khan
af1c59394c
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
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
5dc3c53550
mousa and hussam branch
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
Sultan Khan
8c5746f7b1
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
Mohammad Aljammal
dc898a799d
Add Privileges
5 years ago
haroon amjad
ff0d66ccdb
Covid test translations
5 years ago
Zohaib Kambrani
1155466d19
Packages and Offer Slider at home
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
Sultan Khan
8de838a6dc
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Zohaib Kambrani
27182ee8db
no message
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
603833db37
login changes
5 years ago
haroon amjad
e5feef8a9d
Updates & UI Fixes
5 years ago
Mohammad Aljammal
fa01d132c7
merger DQ live and fix some issues on Child Vaccines
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
Sultan Khan
22676fcbd1
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
5bb780c4ac
push
5 years ago
Mohammad Aljammal
2731c5b1d4
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!127
5 years ago
Sultan Khan
7c33c06c0c
fingerprint
5 years ago
Mohammad Aljammal
0ac599ea1c
fix vital Sign
5 years ago
haroon amjad
21c7c94ef2
updates & fixes
5 years ago
Sultan Khan
8d499704dc
family file changes
5 years ago
Mohammad Aljammal
f70ca95a38
fix merge issues
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
939840bbe7
fix master
5 years ago
Sultan Khan
2f454055b9
login fixed
5 years ago
Sultan Khan
6e152951b4
notification count
5 years ago
Sultan Khan
00b0154987
my family
5 years ago
Sultan Khan
fdef34a394
viral sign issue
5 years ago
Zohaib Kambrani
69d1e4bb0b
no message
5 years ago
Sultan Khan
1eb6516ea6
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljmma
741126102d
fix issue #11
5 years ago
Mohammad Aljmma
bfaacb2719
fix issue#3
5 years ago
Mohammad Aljmma
5b3a4e674d
fix issue#2
5 years ago
Mohammad Aljmma
27594f15b8
fix issue#1
5 years ago
Sultan Khan
283473a06a
theme changes
5 years ago
Zohaib Kambrani
0c71fbad5f
no message
5 years ago
Fatimah Alshammari
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
5 years ago
Fatimah Alshammari
f137bd44c0
created order and order details UI pages
5 years ago
haroon amjad
9868a43e7b
Merge branch 'master' into pharmacy
...
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/home_page.dart
5 years ago
haroon amjad
506e32e8c8
Payment issues resolved
5 years ago
haroon amjad
05ad8f8db5
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Mohammad Aljmma
a077d87dd8
fix user authentication data
5 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
5 years ago
Mohammad Aljmma
570aa514cd
fix user authentication data
5 years ago
haroon amjad
ee67852970
Bottom navbar count & ToDo list fixed
5 years ago
haroon amjad
5020c24e8b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/services/authentication/auth_provider.dart
5 years ago
Sultan Khan
b9b5797cbc
login issue fixed
5 years ago
haroon amjad
89022231d7
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
hussam al-habibeh
6162833bba
offers products page
5 years ago
hussam al-habibeh
7815005e21
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
...
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/widgets/others/app_scaffold_widget.dart
5 years ago
hussam al-habibeh
69a6bc2812
offers page
5 years ago
haroon amjad
4f53d058d4
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 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
5 years ago
mosazaid
9a169ff77b
finish home page and start working on order preview page
5 years ago
Mohammad Aljmma
e42f953bd1
fix prescription report issues
5 years ago
haroon amjad
ff3368eefb
Login check implemented for appointment & ToDo
5 years ago
hussam al-habibeh
e74e168e88
Merge branch 'pharmacy_module_feature_home_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
...
Conflicts:
android/app/build.gradle
lib/config/config.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
5 years ago
hussam al-habibeh
f7cee8f484
pharmacy module app && category home page
5 years ago
mosazaid
d1ac4080ca
working on pharmacy home page
5 years ago
Mohammad Aljmma
59d592778b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
5 years ago
Mohammad Aljmma
e7e32a414b
fix barcode
5 years ago
haroon amjad
aeab57beab
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/main.dart
# lib/pages/landing/home_page.dart
5 years ago
haroon amjad
f5a2870fac
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
Implemented Badge count on ToDo list & my appointments
5 years ago
Mohammad Aljmma
d4be20b07b
add icons
5 years ago
Mohammad Aljmma
e10a0a4d54
add splash page fix language issues
5 years ago
umasoodch
23083fd5ad
Merge branch 'master' into pharmacy
...
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljmma
856ab52439
fix ui issues
5 years ago
haroon amjad
6fd7a3fa3d
updates
5 years ago
Mohammad Aljmma
89cfcd3cad
fix design issues
5 years ago
Mohammad Aljmma
874de15040
change the home page design
5 years ago
Mohammad Aljammal
50dffe9af9
Merge branch 'Haroon' into 'master'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!74
5 years ago
Mohammad Aljmma
d0ed776ff6
new home health service
5 years ago
haroon amjad
dfa7e0e02f
updates & fixes
5 years ago
Fatimah Alshammari
1e00b9a4d8
added my-profile
5 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
5 years ago
enadhilal
5445cced89
Merge branch 'master' into enad_pharmacy2
...
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
5 years ago
jammal
57f938aa09
fix ios issues
5 years ago
jammal
0fceca8f3e
fix ios issues
5 years ago
enadhilal
068382e76f
add call for backend service
5 years ago
Mohammad Aljammal
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
5 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
5 years ago
Mohammad Aljammal
53bbafdc2b
fix Authenticated User Object
5 years ago
Sultan Khan
3ad928902b
voice command
5 years ago
haroon amjad
41d50e23e3
covid drivethru implemented
5 years ago
Mohammad Aljammal
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
5 years ago
Mohammad Aljammal
06416b4934
add Not authenticated Page
5 years ago
Elham Rababah
31b217aa19
First step from CMC
5 years ago
Sultan Khan
227731f8f8
Merge
5 years ago
Elham Rababah
293c557b54
First step from Home health care service
5 years ago
Sultan Khan
ea86e88e2e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
5c859034d6
voice search
5 years ago
Mohammad Aljammal
f543126152
Ambulance Service
5 years ago
haroon amjad
929e289a6f
started implementing Covid-19 DriveThru Test Module
5 years ago
haroon amjad
7fdc0da9dc
livecare scheduling implemented
5 years ago
Mohammad Aljammal
3946f0355c
Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
...
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/landing/landing_page.dart
5 years ago
Sultan Khan
03ff56f2de
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
591e9e9a4c
updated
5 years ago
Mohammad Aljammal
82226e62e1
Merge branch 'insurance' into 'master'
...
HMG Service layout
See merge request Cloud_Solution/diplomatic-quarter!52
5 years ago
Mohammad Aljammal
2952fd56ab
Done Active Medications Service
5 years ago
hussam al-habibeh
3c5adc0a1d
HMG Service layout
5 years ago
Amjad amireh
c2cfea7360
Contact us
5 years ago
Amjad amireh
c2b7507005
Contact us
5 years ago
haroon amjad
478917b240
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
5 years ago
Mohammad Aljammal
4ac77593ad
add payment service page and translations
5 years ago
haroon amjad
38c980be81
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
5 years ago
haroon amjad
5400d534db
updates for push notifications
5 years ago
Sultan Khan
0a2cb22042
design issues fixed
6 years ago
Mohammad Aljammal
8e96c79d05
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
...
Conflicts:
lib/config/localized_values.dart
6 years ago
Mohammad Aljammal
9159928e27
edit on vaccine service
6 years ago
Mohammad Aljammal
b0f0b87345
fix merge issues
6 years ago
Mohammad Aljammal
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
6 years ago
Mohammad Aljammal
fe66ee5993
fix lab result issues
6 years ago
Mohammad Aljammal
02ce04a397
medical_profile_page.dart
6 years ago
Mohammad Aljammal
1b3a780a29
add ar lan for medical profile
6 years ago
Mohammad Aljammal
4ffbb80f3d
ER
6 years ago
Mohammad Aljammal
ef4a57223c
fix DoctorView.dart UI issues
6 years ago
haroon amjad
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
6 years ago
Mohammad Aljammal
91e5a20fd0
fix merge issues
6 years ago
Mohammad Aljammal
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
6 years ago
Mohammad Aljammal
d16ea676cf
done parking service ,fix design issues in home page and add new icon
6 years ago
Mohammad Aljammal
01a011a03d
done dashboard page
6 years ago
haroon amjad
96b7d00b4b
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
6 years ago
haroon amjad
30e08b4417
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/pages/login/login.dart
6 years ago
haroon amjad
7a8392a97e
updates
6 years ago
Mohammad Aljammal
895c09efa4
parking service
6 years ago
Sultan Khan
8516f7de1b
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Mohammad Aljammal
4adc2916b4
fix merge issues
6 years ago
Mohammad Aljammal
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
6 years ago
Mohammad Aljammal
8989fbc9b7
done design dashboard
6 years ago
haroon amjad
61dba06236
Twilio implemented in LiveCare
6 years ago
haroon amjad
cc4f5c0615
updates
6 years ago
haroon amjad
5f1413a2ac
implementing Twilio in LiveCare
6 years ago
haroon amjad
db30fbdfd2
implementing livecare
6 years ago
Sultan Khan
47c42808fd
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
913729fc58
speech search
6 years ago
Sultan Khan
3b2f9251dc
search
6 years ago
haroon amjad
7972d01dff
Insurance Approval implemented
6 years ago
Mohammad Aljammal
125360ced7
fix merge issues
6 years ago
Mohammad Aljammal
002efe3b45
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
...
Conflicts:
lib/pages/landing/landing_page.dart
6 years ago
Mohammad Aljammal
cfd5b2ccff
feedback Service done
6 years ago
Sultan Khan
8e3fb6831d
registration changes
6 years ago
Sultan Khan
9d0a2e1e43
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
41b438fd74
login page changes
6 years ago
Mohammad Aljammal
ec09721869
fix merge issues
6 years ago
Mohammad Aljammal
5874f4ba21
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
...
Conflicts:
lib/pages/landing/landing_page.dart
6 years ago
Mohammad Aljammal
1ac420ef7c
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
6 years ago
Sultan Khan
3a15c16883
login changes
6 years ago
Mohammad Aljammal
43349542da
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
6 years ago
Mohammad Aljammal
8de50bfe74
medical - my doctor and prescription services and pages
6 years ago
hussam al-habibeh
e92cb2e1ac
Design and return Pharmacy List
6 years ago
Sultan Khan
31fe444150
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
76aeeffad7
login page changes
6 years ago
Mohammad Aljammal
93bfcbc20f
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
...
Conflicts:
lib/pages/landing/landing_page.dart
pubspec.yaml
6 years ago
Mohammad Aljammal
e147787be9
merge search and return medicine
6 years ago
Mohammad Aljammal
01b230accf
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into SearchMedicineAndReturnMedicineList
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/main.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
pubspec.yaml
6 years ago
Mohammad Aljammal
4bc68c6afd
merge sultan
6 years ago
Mohammad Aljammal
2d5b725818
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_merge
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
6 years ago
Mohammad Aljammal
b2875fbce3
merge haroun
6 years ago
hussam al-habibeh
31d2816e64
design for search medicine and return medicine list
6 years ago