Mohammad Aljammal
|
b63025a9b3
|
return CMC HHC
|
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
|
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 |
Mohammad Aljammal
|
9c12e949e8
|
hot fixes
|
4 years ago |
Mohammad Aljammal
|
7167d58ce2
|
fix merge issues
|
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 |
Mohammad Aljammal
|
02d72fa27c
|
fix issues
|
4 years ago |
Haroon Amjad
|
5606c88715
|
hot fixes
|
4 years ago |
Mohammad Aljammal
|
b25bdbb6fa
|
fix LiveChatPage Service LabOrderResult MedicineSearch issues
|
4 years ago |
mosazaid
|
6ac8d67b83
|
finish address add/edit/delete/select
|
4 years ago |
Mohammad Aljammal
|
5083080ba3
|
fix vital sign 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 |
Zohaib Kambrani
|
27182ee8db
|
no message
|
4 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
|
4 years ago |
Sultan Khan
|
857fc813cd
|
button feedback
|
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 |
Sultan Khan
|
6e152951b4
|
notification count
|
4 years ago |
Sultan Khan
|
d2f391ab7f
|
setting page inprogress
|
4 years ago |
Sultan Khan
|
1eb6516ea6
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
3fef1b9d52
|
theme and login issues fixed
|
4 years ago |
Mohammad Aljmma
|
b913e5a7b7
|
fix issue#6
|
4 years ago |
Mohammad Aljmma
|
e1f6ef5e5b
|
fix Prescriptions history
|
4 years ago |
mosazaid
|
9a169ff77b
|
finish home page and start working on order preview page
|
4 years ago |
Mohammad Aljmma
|
e10a0a4d54
|
add splash page fix language issues
|
4 years ago |
Mohammad Aljmma
|
856ab52439
|
fix ui issues
|
4 years ago |
Mohammad Aljmma
|
874de15040
|
change the home page design
|
4 years ago |
Sultan Khan
|
3ad928902b
|
voice command
|
4 years ago |
Elham Rababah
|
0a60b27ab4
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
Conflicts:
lib/locator.dart
|
4 years ago |
Amjad amireh
|
675d544514
|
Blood Denote
|
4 years ago |
Elham Rababah
|
1e3ff89dbd
|
finish new e-referral except calling the service
|
4 years ago |
Mohammad Aljammal
|
153335538a
|
done monthly reports
|
4 years ago |
Mohammad Aljammal
|
9cf5c80aae
|
add time line and appointment rate
|
4 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
|
4 years ago |
Mohammad Aljammal
|
8de50bfe74
|
medical - my doctor and prescription services and pages
|
4 years ago |
Sultan Khan
|
76aeeffad7
|
login page changes
|
4 years ago |
Mohammad Aljammal
|
257cc92691
|
add MVVM and di Mohammad Aljammal and Elham Rababah
|
4 years ago |
Mohammad Aljammal
|
198a1854a9
|
add documentation Mohammad Aljammal and Elham Rababah
|
4 years ago |
Mohammad Aljammal
|
3ed5c3878f
|
init project structure By Mohammad and Elham
|
4 years ago |