Commit Graph

48 Commits (6a74cdd2da0aeea6130701aa0e6097ab0fc4e31e)

Author SHA1 Message Date
Aamir Muhammad 77651f9652 Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/uitl/push-notification-handler.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/uitl/utils_new.dart
#	lib/widgets/avatar/large_avatar.dart
#	lib/widgets/bottom_navigation/bottom_navigation_item.dart
#	lib/widgets/bottom_options/BottomSheet.dart
#	lib/widgets/data_display/medical/medical_profile_item.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
devamirsaleemahmad 23b7d85911 changes 2 years ago
devamirsaleemahmad 4231c85055 Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/patient_lab_orders.dart
#	lib/core/model/labs/request_patient_lab_special_result.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/model/privilege/VidaPlusProjectListModel.dart
#	lib/core/model/radiology/final_radiology.dart
#	lib/core/model/radiology/request_send_rad_report_email.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/service/medical/radiology_service.dart
#	lib/core/service/privilege_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/medical/radiology_view_model.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/models/anicllary-orders/ancillary_order_list_model.dart
#	lib/models/anicllary-orders/ancillary_orders_proc_list.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/Blood/confirm_payment_page.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/insurance/insurance_update_screen.dart
#	lib/pages/login/login.dart
#	lib/pages/medical/ask_doctor/doctor_response.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/pages/medical/balance/my_balance_page.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/pages/medical/radiology/radiology_home_page.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/splashPage.dart
#	lib/uitl/utils.dart
#	lib/widgets/bottom_navigation/bottom_navigation_item.dart
#	lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	lib/widgets/data_display/medical/doctor_card.dart
#	lib/widgets/data_display/medical/medical_profile_item.dart
#	pubspec.yaml
2 years ago
haroon amjad 13b2db47b5 HMC color change applied in my appointments 2 years ago
Sultan khan 40656a65d8 update in progress 2 years ago
devamirsaleemahmad cb56750e6b models updates -> 3.13.6 2 years ago
haroon amjad 38648df897 Meal Plan development continued 3 years ago
haroon amjad 2ba744c3a6 Timezone fixes & Activate/Deactivate file changes 4 years ago
haroon amjad 3896f02d13 Timezone Updates 4 years ago
haroon amjad 40cbca565a fixes 4 years ago
haroon amjad a2e25f7a7a Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Mirza.Shafique 999a45c711 App Expendable Design Change 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
Sikander Saleem cfa3ca62b6 prescription tab bar improvement. 4 years ago
Sikander Saleem 9fdebc2db7 ask doctor ui redesigned 4 years ago
Sikander Saleem ca363adee2 merge & improvements 4 years ago
Sikander Saleem d605084a91 appointment list and detail ui changed 5 years ago
Sikander Saleem 970887b0c5 changes 5 years ago
Sikander Saleem e9db30d3da otp clear when wrong code entered. 5 years ago
haroon amjad 3f29bbd6b3 Updates & fixes 5 years ago
Sikander Saleem 5b778f0493 appointment ui (cont.) & improvement. 5 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
Mohammad Aljammal 298b4d6525 change color 5 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 5 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
5 years ago
haroon amjad bf999e611b my appointment fix 5 years ago
Haroon Amjad b9269f525a hot fixes 5 years ago
Haroon Amjad 9d3c64200e fixes 5 years ago
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 5 years ago
haroon amjad f1a8e09a59 Added info images description 5 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
5 years ago
Mohammad Aljmma 216c5609c6 fix issue # 6 & 7 & 8 5 years ago
Mohammad Aljmma e1f6ef5e5b fix Prescriptions history 5 years ago
haroon amjad 9096ccd4d4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 10efccbce8 my appointment fixes 5 years ago
haroon amjad ff3368eefb Login check implemented for appointment & ToDo 5 years ago
haroon amjad 1553e71e7d New loading dialog added into appointment flow 5 years ago
Sultan Khan 8f18d1025a voice search 5 years ago
Sultan Khan 0a2cb22042 design issues fixed 5 years ago
haroon amjad cbf19f0cd1 Merge branch 'master' into 'Haroon'
# Conflicts:
#   lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal b0f0b87345 fix merge issues 5 years ago
haroon amjad c5794e5c70 Dental flow in my appointments 5 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
5 years ago
haroon amjad 3e5ef26b29 my appointment sorting implemented 5 years ago
Mohammad Aljammal ef4a57223c fix DoctorView.dart UI issues 6 years ago
haroon amjad db30fbdfd2 implementing livecare 6 years ago
Haroon Amjad 41c922bfeb Appointment payment implemented, Book Success implemented, Appointment flow implemented 6 years ago
haroon amjad 28fde5c500 My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates 6 years ago