mosazaid
0444b21101
Merge branch 'development' into hmg-services-fixing
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan
d33918c932
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Mohammad Aljammal
e964afd4f2
Merge branch 'fix_security_issue' into 'development'
...
fix security issues in pharmacy
See merge request Cloud_Solution/diplomatic-quarter!261
5 years ago
Mohammad Aljammal
d477481856
fix security issues in pharmacy
5 years ago
Sikander Saleem
aef4c7bfac
H2O feature improvement
5 years ago
mosazaid
822defbd04
working on bmi calculator design and functionality
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
Mohammad Aljammal
484cca086e
fix my my Trackers
5 years ago
Mohammad Aljammal
db2376f50c
fix blood and weight on my trackers
5 years ago
Sultan Khan
ccd2fc5068
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
mosazaid
38d52b52c8
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
5 years ago
mosazaid
174534d8a5
fix Blood donation functionality and design
5 years ago
Mohammad Aljammal
405f67be1e
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!249
5 years ago
Fatimah Alshammari
7a516cae51
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
5 years ago
Mohammad Aljammal
f883e1bd78
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/config/localized_values.dart
5 years ago
Mohammad Aljammal
0b1014a91c
fix blood sugar service on my tracker
5 years ago
Fatimah Alshammari
0f22a50a5d
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
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
Zohaib Iqbal Kambrani
bbd953ae43
Order Delivery Driver tracking [inprogress]
5 years ago
mosazaid
3a45239059
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid
f5d478fd27
re-design child vaccine and fix some funcrionalities
5 years ago
Mohammad Aljammal
4457b5f109
add translation to ER service
5 years ago
Mohammad Aljammal
200334d8f8
Fix ER service
5 years ago
Elham Rababah
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
5 years ago
Elham Rababah
d7a046f9ca
fix issue on cmc
5 years ago
Mohammad Aljammal
b63025a9b3
return CMC HHC
5 years ago
Mohammad Aljammal
30ddea6419
hot fixing
5 years ago
Mohammad Aljammal
634c874eee
fix design issues
5 years ago
Fatimah Alshammari
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
5 years ago
Fatimah Alshammari
52fa0f6f89
fixed orders
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
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
5 years ago
mosazaid
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
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
4263672f00
fim last vital sign data
5 years ago
Mohammad Aljammal
519a474d41
fix live care label and vital sign data
5 years ago
Fatimah Alshammari
c0920e7099
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/widgets/pharmacy/product_tile.dart
5 years ago
Mohammad Aljammal
754e60eb72
fix send email lab result
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
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
Sultan Khan
2c50402aa8
language issue fixed
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
Sultan Khan
ce7a64e86e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
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
Mohammad Aljammal
4d203c8a5b
fix LabResult
5 years ago
Sultan Khan
542335364e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
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
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
Fatimah Alshammari
706980248a
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljammal
77dcb918c3
Revert "Merge branch 'pharmacy-hussam' into 'master'"
...
This reverts merge request !149
5 years ago
Fatimah Alshammari
9b8103bfd6
fixe order and order details
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
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
Sultan Khan
e3e868e47c
flutter tts updated
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
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
Mohammad Aljammal
dc898a799d
Add Privileges
5 years ago
Sultan Khan
3ab513d9d0
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
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
Sultan Khan
8de838a6dc
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
2fb0ccfdbd
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
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
Sultan Khan
909401cc7e
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
a9cb645833
health weather indicator
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
Sultan Khan
799fca346b
health weather indicator
5 years ago
Sultan Khan
8612ae91c4
sultan
5 years ago
Sultan Khan
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
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
Mohammad Aljammal
b785f87dac
fix App drawer after logout
5 years ago
Mohammad Aljammal
ddc7eca605
fix Insurance Cards
5 years ago
Mohammad Aljmma
6523a1dea9
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues
...
Conflicts:
lib/config/localized_values.dart
5 years ago
Mohammad Aljmma
a9b11a6b03
fix lab result
5 years ago
Zohaib Kambrani
69d1e4bb0b
no message
5 years ago
Sultan Khan
3589b21590
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljmma
770d28033d
fix issues#26 & 27 & 28
5 years ago
Mohammad Aljmma
ed7b9d609f
fix lab result
5 years ago
haroon amjad
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
5 years ago
haroon amjad
b89c1f03b3
language translation fixes
5 years ago
Sultan Khan
1f4f81b454
insurance card details
5 years ago
Sultan Khan
bedafa24cd
insurance details
5 years ago
Mohammad Aljmma
8f38dc6077
fix issue #24
5 years ago
Sultan Khan
1eb6516ea6
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
3fef1b9d52
theme and login issues fixed
5 years ago
Mohammad Aljmma
a1684bdd9e
fix issue #17 & 18
5 years ago
Mohammad Aljmma
e1f6ef5e5b
fix Prescriptions history
5 years ago
hussam al-habibeh
69ea8b7bd7
daynmic products listing
5 years ago
Sultan Khan
d1336eec8b
login type
5 years ago
Sultan Khan
f05b235cd0
login issue
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
7d2f1cf318
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication
5 years ago
Mohammad Aljmma
570aa514cd
fix user authentication data
5 years ago
haroon amjad
b7b7ead3ba
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
f0897881d1
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Elham Rababah
124d388ee1
Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
...
Conflicts:
lib/pages/BookAppointment/components/DocAvailableAppointments.dart
lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
5 years ago
Mohammad Aljmma
4a4d5248a2
fix status issue
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
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
5 years ago
haroon amjad
15a8e64e7c
updates & fixes
5 years ago
Elham Rababah
41b919183f
Fix bug on read notifications_page.dart
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
Elham Rababah
5bd3c7d9ce
finish step from notifications_page and create notification_details_page
5 years ago
Mohammad Aljmma
747cffacfc
fix lab result
5 years ago
mosazaid
2095f2c62a
fix merge issue
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
Elham Rababah
9f2beceb22
First step from notifications_page
5 years ago
Mohammad Aljmma
e42f953bd1
fix prescription report issues
5 years ago
Mohammad Aljmma
f79d8eb8f9
fix login issues
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
e7e32a414b
fix barcode
5 years ago
Mohammad Aljmma
e10a0a4d54
add splash page fix language issues
5 years ago
Mohammad Aljmma
d0ed776ff6
new home health service
5 years ago
jammal
9328f942ba
done ER service
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
jammal
bd2254491c
done ER 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
Elham Rababah
c0a54c8cbc
remove commit
5 years ago
Sultan Khan
8095e56b32
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
3ad928902b
voice command
5 years ago
Elham Rababah
a359a6cd1a
fix the loader issue
5 years ago
Amjad amireh
83735ab68d
modified Child vaccintion note
5 years ago
Mohammad Aljammal
06416b4934
add Not authenticated Page
5 years ago
Elham Rababah
83ab1b4d61
fix issues in the services logic and add some translation
5 years ago
Amjad amireh
67e3a13a95
child Vaccines add new child modified
5 years ago
Amjad amireh
cb2a78e2ee
child Vaccines
5 years ago
Elham Rababah
9ebc6980dd
change the checkup item based on service
5 years ago
Amjad amireh
1d29aa36a2
child Vaccines
5 years ago
Amjad amireh
fe17c20bdf
child Vaccines
5 years ago
Mohammad Aljammal
1ce55e687f
Ambulance Service second step
5 years ago
Amjad amireh
6830996f9c
child Vaccines
5 years ago
Elham Rababah
31b217aa19
First step from CMC
5 years ago
Amjad amireh
e14d619edd
child Vaccines
5 years ago
Amjad amireh
0e4ff1f804
child Vaccines
5 years ago
Elham Rababah
0b9a834673
Finish cancel order
5 years ago
Amjad amireh
9ab0d66888
child Vaccines
5 years ago
Elham Rababah
293c557b54
First step from Home health care service
5 years ago
Mohammad Aljammal
3d6eafe473
Ambulance Service first step
5 years ago
Mohammad Aljammal
0d12210116
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
5 years ago
Mohammad Aljammal
c7d396875e
Ambulance Service steps
5 years ago
Elham Rababah
0a60b27ab4
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
...
Conflicts:
lib/locator.dart
5 years ago
Mohammad Aljammal
ac871bb416
Merge branch 'Blood_Donation' into 'master'
...
Blood donation
See merge request Cloud_Solution/diplomatic-quarter!58
5 years ago
Mohammad Aljammal
f543126152
Ambulance Service
5 years ago
Elham Rababah
dd76ae05a7
fix H2O page issue
5 years ago
Amjad amireh
a00b3a133c
Blood Denote
5 years ago
Amjad amireh
5e50c0dc32
Blood Denote
5 years ago
Elham Rababah
bf6a8cecc6
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
...
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/landing/landing_page.dart
pubspec.yaml
5 years ago
Elham Rababah
3fab844ac9
improve E-referral
5 years ago
Elham Rababah
37d9eae9ea
improve E-referral
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
Mohammad Aljammal
d6a27a8e28
change medical profile icons
5 years ago
Mohammad Aljammal
3ffff9686d
Done allergies service
5 years ago
Elham Rababah
a00bc8268e
improve E-referral
5 years ago
Elham Rababah
91a8b94382
Merge branch 'E_referral' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
...
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/landing/landing_page.dart
5 years ago
Elham Rababah
b1b6c77d62
Finish H2O Services
5 years ago
Elham Rababah
b853bede68
first step from h2o
5 years ago
Mohammad Aljammal
82c2577d36
Done ask doctor service
5 years ago
Elham Rababah
ae147b5988
first step from search referrals
5 years ago
Mohammad Aljammal
2952fd56ab
Done Active Medications Service
5 years ago
Elham Rababah
1e3ff89dbd
finish new e-referral except calling the service
5 years ago
Amjad amireh
24693f2992
Contact us
5 years ago
Elham Rababah
f582eee991
make index page of add new referral as page controller
5 years ago
Amjad amireh
6aa6b85f4b
Contact us
5 years ago
Mohammad Aljammal
9f06ce7d1d
done EyeMeasurements service
5 years ago
Amjad amireh
c2b7507005
Contact us
5 years ago
Elham Rababah
7840ec4c3b
finish activation process until step 2
5 years ago
Mohammad Aljammal
c01e6095f2
done my trackers
5 years ago
Elham Rababah
f1f3b6bd56
first step from e-referral
5 years ago
haroon amjad
b9a0438ebb
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
5 years ago
haroon amjad
a5fd9f53ab
Payment flow implemented in advance payment
5 years ago
Mohammad Aljammal
14f3e08077
Merge branch 'amjad_amireh' into 'master'
...
edit card_position.dart
See merge request Cloud_Solution/diplomatic-quarter!47
5 years ago
haroon amjad
38c980be81
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
5 years ago
Mohammad Aljammal
a0300738e8
done My balance
5 years ago
Amjad amireh
368db03ab8
edit card_position.dart
5 years ago
Mohammad Aljammal
4dd3f9ad01
done Patient Sick Leave
5 years ago
Mohammad Aljammal
57ed83a139
Merge branch 'vaccine' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into patient_sick_leave
...
Conflicts:
lib/config/config.dart
5 years ago
Mohammad Aljammal
11f9daa3ff
add PatientSickLeave
5 years ago
Mohammad Aljammal
fbb4b326a8
Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
...
Conflicts:
lib/locator.dart
pubspec.yaml
5 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
5 years ago
Mohammad Aljammal
33bd972984
add my vaccines item screen
5 years ago
Amjad amireh
62d96a3f1c
edit card_position.dart
5 years ago
Mohammad Aljammal
9159928e27
edit on vaccine service
5 years ago
Mohammad Aljammal
ed1c04ab25
ER
5 years ago
Mohammad Aljammal
294a752338
ER
5 years ago
haroon amjad
8387af844a
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
5 years ago
haroon amjad
0628aef62a
applied dental change in SearchByClinic
5 years ago
Mohammad Aljammal
b7f73bf397
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into monthly_reports
5 years ago
Mohammad Aljammal
153335538a
done monthly reports
5 years ago
Mohammad Aljammal
20f9f6f06c
ER
5 years ago
haroon amjad
cbf19f0cd1
Merge branch 'master' into 'Haroon'
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal
b0f0b87345
fix merge issues
5 years ago
haroon amjad
c5794e5c70
Dental flow in my appointments
5 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
5 years ago
Mohammad Aljammal
fe66ee5993
fix lab result issues
5 years ago
haroon amjad
51078227ab
Dental appointment flow implemented
5 years ago
Mohammad Aljammal
d52e612bff
Merge branch 'insurance' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
...
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/medical/medical_profile_page.dart
pubspec.yaml
5 years ago
Mohammad Aljammal
1b3a780a29
add ar lan for medical profile
5 years ago
hussam al-habibeh
3a79ddb488
vaccine service
5 years ago
Mohammad Aljammal
4ffbb80f3d
ER
5 years ago
Mohammad Aljammal
ef4a57223c
fix DoctorView.dart UI issues
5 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
5 years ago
Mohammad Aljammal
d16ea676cf
done parking service ,fix design issues in home page and add new icon
5 years ago
Mohammad Aljammal
01a011a03d
done dashboard page
5 years ago
Mohammad Aljammal
4bc806671a
Merge branch 'amjad_amireh' into 'master'
...
filter doctor by department
See merge request Cloud_Solution/diplomatic-quarter!33
5 years ago
Mohammad Aljammal
9e47dc19f9
filter doctor by department
5 years ago
Sultan Khan
3247378c02
search
5 years ago
Mohammad Aljammal
895c09efa4
parking service
5 years ago
Sultan Khan
8516f7de1b
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 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
5 years ago
Mohammad Aljammal
8989fbc9b7
done design dashboard
5 years ago
Sultan Khan
8887ba85fe
family file
5 years ago
Sultan Khan
cb99b2a7a7
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
327c4585a6
family file change
5 years ago
haroon amjad
760db6a873
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/locator.dart
5 years ago
Mohammad Aljammal
9cf5c80aae
add time line and appointment rate
5 years ago
Mohammad Aljammal
f5b16734c6
add time line
5 years ago
Mohammad Aljammal
f6d30178bf
done medical report
5 years ago
Mohammad Aljammal
b6319c558c
Merge branch 'report_service' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
...
Conflicts:
lib/locator.dart
lib/pages/medical/medical_profile_page.dart
5 years ago
Mohammad Aljammal
75fdf28036
fix lab Result
5 years ago
Mohammad Aljammal
8495260c5a
fix issues in feedback
5 years ago
haroon amjad
db30fbdfd2
implementing livecare
5 years ago
haroon amjad
59c279998c
working on vital signs integration
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
Mohammad Aljammal
5619b8c06f
fix issues in feedback
6 years ago
Mohammad Aljammal
2b0e35a907
fix issues in base app client
6 years ago
haroon amjad
73cf37a3a5
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
6 years ago
haroon amjad
b9d913e6a5
Merge fixes & updates
6 years ago
Sultan Khan
03b34115c4
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
3b2f9251dc
search
6 years ago
Mohammad Aljammal
a5e63817f2
done vital sign
6 years ago
Mohammad Aljammal
32e2732c43
feedback service
6 years ago
Amjad Amireh
97dbe62f93
done report service
6 years ago
haroon amjad
7972d01dff
Insurance Approval implemented
6 years ago
Mohammad Aljammal
37b874fe3f
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
6 years ago
Sultan Khan
3f0c60aea5
sessionID
6 years ago
Mohammad Aljammal
a1fa2c0727
done vital sign
6 years ago
Sultan Khan
adbdd2dd0d
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
621870eca1
family file changes
6 years ago
hussam al-habibeh
f77d4fac66
insurance translation
6 years ago
Mohammad Aljammal
2e0afdb49c
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
...
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/prescriptions/prescriptions_home_page.dart
6 years ago
hussam al-habibeh
492cfa084b
insurance card and insurance update and insurance approval
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
5ea0df9f1e
Merge remote-tracking branch 'origin/sultan' into sultan
...
# Conflicts:
# lib/uitl/date_uitl.dart
6 years ago
Mohammad Aljammal
7d230ea14c
fix issues
6 years ago
Mohammad Aljammal
cfd5b2ccff
feedback Service done
6 years ago
Sultan Khan
8e3fb6831d
registration changes
6 years ago
Mohammad Aljammal
29768feefd
merge master
6 years ago
Mohammad Aljammal
05222207da
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
...
Conflicts:
lib/config/config.dart
lib/core/service/client/base_app_client.dart
6 years ago
Mohammad Aljammal
a12197fe70
labs result done add some file to git ignore for ios
6 years ago
Sultan Khan
0bc529f420
login changes
6 years ago
Mohammad Aljammal
1bbbd18373
labs services
6 years ago
Sultan Khan
9d0a2e1e43
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
8d0834ff3e
login inprogress
6 years ago
Mohammad Aljammal
940b327561
done Prescriptions
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
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
b0989d6ca0
login pages changes
6 years ago
Sultan Khan
76aeeffad7
login page changes
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
hussam al-habibeh
31d2816e64
design for search medicine and return medicine list
6 years ago
Sultan Khan
5a08cb720c
login changes
6 years ago
Sultan Khan
f8d8e1c685
new pages added
6 years ago
Mohammad Aljammal
257cc92691
add MVVM and di Mohammad Aljammal and Elham Rababah
6 years ago