haroon amjad
7c538b350f
LiveCare Scheduling finalized, Appointments in ToDo list categorized
4 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
4 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
4 years ago
Zohaib Iqbal Kambrani
bbd953ae43
Order Delivery Driver tracking [inprogress]
4 years ago
Mohammad Aljammal
ed729689a9
Merge branch 'design_issues' into 'development'
...
fix design issues
See merge request Cloud_Solution/diplomatic-quarter!237
4 years ago
Mohammad Aljammal
634c874eee
fix design issues
4 years ago
mosazaid
2843b1393e
some design enhancments
4 years ago
Mohammad Aljammal
de1b7cc1d0
fix merge issues
4 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
4 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
4 years ago
Mohammad Aljammal
298b4d6525
change color
4 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
4 years ago
enadhilal
10734d5994
connecting pages.
...
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
4 years ago
Mohammad Aljammal
6bda03e935
hot fixing
4 years ago
Fatimah Alshammari
c0920e7099
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/widgets/pharmacy/product_tile.dart
4 years ago
Fatimah Alshammari
5fa5e9b7c8
fixed orders and profile
4 years ago
Mohammad Aljammal
2059b76fc1
fix Medical profile
4 years ago
Mohammad Aljammal
9c12e949e8
hot fixes
4 years ago
Fatimah Alshammari
fda101840a
fixed order isuues
4 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
4 years ago
Fatimah Alshammari
4a84483698
fixed order details
4 years ago
Mohammad Aljammal
f38f53587b
fix issues
4 years ago
Mohammad Aljammal
08aa2de69b
fix Prescriptions Service and design issues
4 years ago
Mohammad Aljammal
5083080ba3
fix vital sign details
4 years ago
haroon amjad
b55681a056
Working on steps tracking
4 years ago
enadhilal
9c55571072
Merge branch 'pharmacy' into enad_pharmacy2
4 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
4 years ago
enadhilal
888a74fb9b
add these pages
...
Product Tile Component
Product Detail Page
Wishlist Page
Reviews Page
Brands Page + Search
4 years ago
Fatimah Alshammari
706980248a
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/home_page.dart
4 years ago
Mohammad Aljammal
77dcb918c3
Revert "Merge branch 'pharmacy-hussam' into 'master'"
...
This reverts merge request !149
4 years ago
Fatimah Alshammari
9b8103bfd6
fixe order and order details
4 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
4 years ago
mosazaid
4e5d6a9a00
finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished
4 years ago
umasoodch
0431eb1ac8
Merge branch 'master' into pharmacy
...
# Conflicts:
# lib/config/config.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
4 years ago
Fatimah Alshammari
d328c74fc4
fix order and orderdetails
4 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
4 years ago
Mohammad Aljmma
59defa4532
fix issue #15
4 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
4 years ago
Fatimah Alshammari
f137bd44c0
created order and order details UI pages
4 years ago
Elham Rababah
5bd3c7d9ce
finish step from notifications_page and create notification_details_page
4 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
4 years ago
mosazaid
d1ac4080ca
working on pharmacy home page
4 years ago
Mohammad Aljmma
89cfcd3cad
fix design issues
4 years ago
Mohammad Aljmma
894494ec4e
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
...
Conflicts:
ios/Flutter/.last_build_id
lib/main.dart
lib/pages/landing/home_page.dart
4 years ago
Mohammad Aljmma
874de15040
change the home page design
4 years ago
Mohammad Aljammal
94c25d2188
Merge branch 'loader' into 'diplomatic-quarter-live'
...
Loader
See merge request Cloud_Solution/diplomatic-quarter!84
4 years ago
haroon amjad
d5118bda11
Login / Register UI fixes
4 years ago
Elham Rababah
cd7c354458
loader first step
4 years ago
haroon amjad
3ae6df1dcb
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-live
4 years ago
haroon amjad
6a630f6d33
logo & colors changed for login & registration flow
4 years ago