Commit Graph

64 Commits (6f2c947687a4b67122335e0e2d55f39652ba8ff6)

Author SHA1 Message Date
haroon amjad 7c538b350f LiveCare Scheduling finalized, Appointments in ToDo list categorized 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 519a474d41 fix live care label and vital sign data 4 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 4 years ago
Mohammad Aljammal 5e29dff448 fix issues insurance and medical profile order 4 years ago
Haroon Amjad b0ea1fc262 updates & fixes 4 years ago
haroon amjad 8c9762c24f Fixes 4 years ago
Mohammad Aljammal 7bc8fdb819 fix merge issues 4 years ago
Mohammad Aljammal a57d5eb69f hot fixes 4 years ago
Mohammad Aljammal 8329c534a3 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
haroon amjad 781fd1c287 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Haroon Amjad 3308aa47e1 fixes 4 years ago
haroon amjad bf999e611b my appointment fix 4 years ago
Haroon Amjad b9269f525a hot fixes 4 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad 9d046fd971 updates & fixes 4 years ago
haroon amjad 740a294867 Translation & bug fixes 4 years ago
haroon amjad 9ecaaa1b12 radiology fix in appointment details 4 years ago
Haroon Amjad 9d3c64200e fixes 4 years ago
haroon amjad c4bb75eab4 Doctor rating fixed 4 years ago
haroon amjad a1f91d99b3 added countdown timer in my appointments 4 years ago
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 4 years ago
haroon amjad f1a8e09a59 Added info images description 4 years ago
Zohaib Kambrani 27182ee8db no message 4 years ago
haroon amjad e5feef8a9d Updates & UI Fixes 4 years ago
haroon amjad 21c7c94ef2 updates & fixes 4 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
4 years ago
Mohammad Aljmma 216c5609c6 fix issue # 6 & 7 & 8 4 years ago
Mohammad Aljmma e1f6ef5e5b fix Prescriptions history 4 years ago
haroon amjad 9096ccd4d4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad 10efccbce8 my appointment fixes 4 years ago
haroon amjad ff3368eefb Login check implemented for appointment & ToDo 4 years ago
haroon amjad 1553e71e7d New loading dialog added into appointment flow 4 years ago
haroon amjad 3354058738 Branding updated according to DQ 4 years ago
haroon amjad dfa7e0e02f updates & fixes 4 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
4 years ago
Sultan Khan 8f18d1025a voice search 4 years ago
haroon amjad 7fdc0da9dc livecare scheduling implemented 4 years ago
haroon amjad c9256a654a LiveCare Scheduling updates 4 years ago
Sultan Khan 0a2cb22042 design issues fixed 4 years ago
haroon amjad cbf19f0cd1 Merge branch 'master' into 'Haroon'
# Conflicts:
#   lib/core/service/client/base_app_client.dart
4 years ago
Mohammad Aljammal b0f0b87345 fix merge issues 4 years ago
haroon amjad c5794e5c70 Dental flow in my appointments 4 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
4 years ago
haroon amjad 3e5ef26b29 my appointment sorting implemented 4 years ago
Mohammad Aljammal ef4a57223c fix DoctorView.dart UI issues 4 years ago
haroon amjad db30fbdfd2 implementing livecare 4 years ago