Commit Graph

59 Commits (f53f2f7cababd2f630098bc77bf0f091d94daf1e)

Author SHA1 Message Date
haroon amjad a4a2389a78 updates & fixes 3 years ago
haroon amjad a075d53dd5 UI updates & fixes 3 years ago
haroon amjad 4ac0845003 updates & fixes 3 years ago
haroon amjad 7467da7409 Imports organized 3 years ago
haroon amjad f946a7be4d updates & fixes 3 years ago
haroon amjad 5396138962 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
#	lib/pages/ToDoList/payment_method_select.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
3 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 3 years ago
Mirza.Shafique afb08fcd0a Booking Filters Update 3 years ago
Mirza.Shafique a234618df8 Update, Insurance card and My Balance Design 3 years ago
haroon amjad 4469ae1209 updates & fixes 3 years ago
haroon amjad e679c7df0d updates & fixes 3 years ago
Sikander Saleem 889ae24f07 merge changes-3 3 years ago
Haroon Amjad fde658fd5d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
3 years ago
Mirza.Shafique e934e7cd2c Merge Fix 3 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 3 years ago
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 3 years ago
haroon amjad 6b675acc94 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
4 years ago
Mohammad Aljammal 9a850d0ca3 fix advance payment 4 years ago
haroon amjad f754e48034 Merge branch 'development' into Haroon
# Conflicts:
#	lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 4 years ago
haroon amjad accc39d972 jira bug fixes 4 years ago
Sultan Khan b891c1bd80 theme issue 4 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 4 years ago
haroon amjad b6c617888b Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad 7c538b350f LiveCare Scheduling finalized, Appointments in ToDo list categorized 4 years ago
mosazaid 174534d8a5 fix Blood donation functionality and design 4 years ago
Mohammad Aljammal b63025a9b3 return CMC HHC 4 years ago
Mohammad Aljammal 30ddea6419 hot fixing 4 years ago
Mohammad Aljammal 298b4d6525 change color 4 years ago
Mohammad Aljammal f77d2b497e fix issues 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 591d56e624 change the info images and change the out patient color 4 years ago
Mohammad Aljammal 2059b76fc1 fix Medical profile 4 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 4 years ago
Mohammad Aljammal 9c18c69d90 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 b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 4 years ago
Mohammad Aljammal 9e8def6584 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Mohammad Aljammal 4e2c955b09 add missing translation 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 d284ceac04 advance payment & payment flow issues fixed 4 years ago
Mohammad Aljammal 91cada6901 fix Advance Payment 4 years ago
Mohammad Aljammal ddc7eca605 fix Insurance Cards 4 years ago
haroon amjad 506e32e8c8 Payment issues resolved 4 years ago
haroon amjad 15a8e64e7c updates & fixes 4 years ago
haroon amjad 6fd7a3fa3d updates 4 years ago
haroon amjad dfa7e0e02f updates & fixes 4 years ago