haroon amjad
6f92a093ab
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/config.dart
4 years ago
haroon amjad
41822d2cf1
Merge branch 'development' into haroon-new-design
4 years ago
Zohaib Iqbal Kambrani
8b1ac05012
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
...
* development_new_design_2.0: (105 commits)
app bar back icon issue
improvements
emergency nearest ui changes
Zoom Avatar implementation
no message
Child Vaccine 3
register
register page
Working on Health data
Child Vaccine 2
registration
Ereferral fixed, HHC moved to new APIs, Notification new design implemented
registration done
Child Vaccine 1.0
In App Review
In App Review
oder log merge fix
design fixes 3
Chart fix & In-App update implemented
design fixes 1.1
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
Zohaib Iqbal Kambrani
aad071ac67
Packages and Offers apply token
4 years ago
Fatimah Alshammari
e494c9304d
fixed issues
4 years ago
haroon amjad
494b1f221d
Updates & fixes
4 years ago
Sikander Saleem
706832a1cb
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
# lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
# lib/locator.dart
# lib/main.dart
# lib/pages/final_products_page.dart
# lib/pages/landing/home_page.dart
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/cart-order-preview.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/widgets/ProductTileItem.dart
# lib/pages/search_products_page.dart
# lib/services/pharmacy_services/product_detail_service.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/buttons/secondary_button.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/others/app_scafold_detail_page.dart
# lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
haroon amjad
5f963b0327
Translation updates, CMC, HHC & RRT APIs updates
4 years ago
Elham Rababh
2526d6bc6f
fix issue in cart page
4 years ago
haroon amjad
e62e3dae1b
CMC APIs coverting to RC
4 years ago
haroon amjad
cb220031dd
Updates & fixes
4 years ago
haroon amjad
01ca8b8f84
updates & fixes
4 years ago
Mohammad Aljammal
eb19daa98f
fix car count
4 years ago
haroon amjad
503ab739ca
prescription availability design revamped
4 years ago
mosazaid
594b2710b3
fix bugs pharmacy home
4 years ago
Haroon Amjad
062ca5c11c
EReferral fixes
4 years ago
haroon amjad
46d800c0c6
UI updates & fixes
4 years ago
haroon amjad
a075d53dd5
UI updates & fixes
4 years ago
haroon amjad
bf4709fef6
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/pages/medical/prescriptions/prescription_details_page.dart
4 years ago
haroon amjad
b51989e798
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/pages/pharmacies/compare.dart
# lib/pages/pharmacies/my_reviews.dart
# lib/pages/pharmacies/wishlist.dart
4 years ago
Sikander Saleem
f0bb94c422
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad
7467da7409
Imports organized
4 years ago
Fatimah Alshammari
8c0dca781c
fixed compare issues and arabic version
4 years ago
haroon amjad
aadcfdc7bc
Insurance Approval fixes
4 years ago
Mirza.Shafique
4f85652562
Merge branch 'mirza_home_page' into development_new_design_2.0
4 years ago
Mirza.Shafique
f577905dcb
eye measurment new design
4 years ago
haroon amjad
44d59ed01a
updates & fixes
4 years ago
Mohammad Aljammal
55f9bbcba4
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!379
4 years ago
haroon amjad
faff3b90cb
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/core/service/er/am_service.dart
4 years ago
haroon amjad
e9ec2e2faf
Ambulance request APIs revamped
4 years ago
haroon amjad
4c2b70fcb5
Merge branch 'development' into Haroon
4 years ago
haroon amjad
21c3686e05
Ambulance request services revamping
4 years ago
Fatimah Alshammari
239ad530ce
fixed isuues
4 years ago
Fatimah Alshammari
72ba0c7c74
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
4 years ago
Fatimah Alshammari
f3b545ff74
fixed products issues
4 years ago
haroon amjad
73097d15de
Covid Lab result generate certificate implemented
4 years ago
haroon amjad
5f521556dc
Dental flow fixes
4 years ago
haroon amjad
3235f489b9
Merge branch 'development' into Haroon
4 years ago
haroon amjad
5009e48f64
Updates in Ambulance Request & Covid test
4 years ago
Sultan Khan
57d87dfc03
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Sultan Khan
11ffed2ae3
bug fixes
4 years ago
Mohammad Aljammal
d9fabbab17
Fix feedback
5 years ago
Zohaib Iqbal Kambrani
bf303a7be0
RRT Implementation
5 years ago
Sultan khan
f54b9a63aa
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!328
5 years ago
Sikander Saleem
eb9005510d
bug fixes and insurance approvals improvements.
5 years ago
Sultan Khan
14ef096c32
changes and fixes
5 years ago
hussam al-habibeh
fefde8f575
jira bugs
5 years ago
Mirza.Shafique
58d5734f1a
Bug Fix: 873, 878 to 881
5 years ago
hussam al-habibeh
446021eb90
adding doctor list to health calculator
5 years ago
hussam al-habibeh
854352d9ce
jira bugs
5 years ago
mosazaid
b623bd0dce
Merge branch 'development' into fix_bugs
5 years ago
mosazaid
e5474b3062
fix perscription pages bugs
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
Zohaib Iqbal Kambrani
f410ce20ca
Packages and Offers in Progress
5 years ago
Mohammad Aljammal
861dba9a94
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
ec401d4848
Done Ed online
5 years ago
Mohammad Aljammal
cacb6722b9
Merge branch 'pharmacy-bugs' into 'development'
...
daynimic listing
See merge request Cloud_Solution/diplomatic-quarter!279
5 years ago
hussam al-habibeh
2723422bbf
daynimic listing
5 years ago
Mohammad Aljammal
50a45528d1
Merge branch 'pharmacy-bug-fixes' into 'development'
...
bug-fixes
See merge request Cloud_Solution/diplomatic-quarter!276
5 years ago
Fatimah Alshammari
8624d695dc
fixed order details
5 years ago
mosazaid
44287db553
bug-fixes
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
mosazaid
f3cdd08857
adding fharmacy payment feature
5 years ago
Fatimah Alshammari
42bf76f712
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/config/config.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
5 years ago
Fatimah Alshammari
ac32ba998c
fixed order isuee
5 years ago
Zohaib Iqbal Kambrani
516df96e21
no message
5 years ago
Fatimah Alshammari
ef8312f2b8
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/pages/pharmacies/product_detail.dart
5 years ago
Fatimah Alshammari
ce64da11e4
homepage and product details design
5 years ago
mosazaid
cbe422cbc6
Merge branch 'hmg-services-fixing' into development
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem
aef4c7bfac
H2O feature improvement
5 years ago
mosazaid
822defbd04
working on bmi calculator design and functionality
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
Zohaib Iqbal Kambrani
bbd953ae43
Order Delivery Driver tracking [inprogress]
5 years ago
Mohammad Aljammal
200334d8f8
Fix ER service
5 years ago
Elham Rababah
d7a046f9ca
fix issue on cmc
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
Mohammad Aljammal
519a474d41
fix live care label and vital sign data
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
Mohammad Aljammal
4e2979cd64
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
Mohammad Aljammal
4e823c2be4
fix chart and duplicated data in Patient Lab Result
5 years ago
Zohaib Kambrani
67f4b4e167
iOS Geofence in progress
5 years ago
Zohaib Kambrani
8457972fda
no message
5 years ago
Mohammad Aljammal
b25bdbb6fa
fix LiveChatPage Service LabOrderResult MedicineSearch issues
5 years ago
Zohaib Kambrani
92ba977fca
no message
5 years ago
mosazaid
6ac8d67b83
finish address add/edit/delete/select
5 years ago