Commit Graph

918 Commits (8bdcfcb7647cfdac67ba96445112bfadb43e4247)

Author SHA1 Message Date
devamirsaleemahmad 8bdcfcb764 Changes & Latest Merges 3.3 2 years ago
devamirsaleemahmad 0e8c1a8b2f Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/book_reminder_page.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/ToDoList/widgets/paymentDialog.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	pubspec.yaml
2 years ago
Sultan khan 649521c31f Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Sultan khan c96c151f44 null safety issue fixed. 2 years ago
devamirsaleemahmad d6f51f6c82 changes 2 years ago
devamirsaleemahmad 8f591654a5 changes 2 years ago
devamirsaleemahmad cbc38940ea changes 2 years ago
devamirsaleemahmad ed748a626b changes 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 772992e3ff updates 2 years ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 2 years ago
haroon amjad 13b2db47b5 HMC color change applied in my appointments 2 years ago
haroon amjad 6bd6572e7e Lab, Rad & prescription disabled in my appointments screen in case of ER appointment (Clinic ID 10) & project is Vida Plus. 2 years ago
devamirsaleemahmad 8544b3ce3d changes & Deletion 2 years ago
devamirsaleemahmad 720c0ac6e9 changes & Deletion 2 years ago
haroon amjad 55f1e4166e updates 2 years ago
devamirsaleemahmad 2c9e51aef0 changes 2 years ago
Sultan khan 40656a65d8 update in progress 2 years ago
devamirsaleemahmad 49d3df8c87 changes 2 years ago
devamirsaleemahmad c1fd6313b1 changes 2 years ago
devamirsaleemahmad 1c19b36d2d models updates -> 3.13.6 2 years ago
devamirsaleemahmad 9c2948db29 models updates -> 3.13.6 2 years ago
Sultan khan 391331f508 code update in progress 2 years ago
devamirsaleemahmad 971bab465c models updates -> 3.13.6 2 years ago
devamirsaleemahmad 03d550936e models updates -> 3.13.6 2 years ago
devamirsaleemahmad cb56750e6b models updates -> 3.13.6 2 years ago
devamirsaleemahmad 511c9788da models updates -> 3.13.6 2 years ago
devamirsaleemahmad 2a4059fd66 models updates -> 3.13.6 2 years ago
devamirsaleemahmad 3523daa9fa updates -> 3.13.6 2 years ago
devamirsaleemahmad 6ff864c4cd updates -> 3.13.6 2 years ago
devamirsaleemahmad e8e7a726f5 updates -> 3.13.6 2 years ago
Sultan khan b45cbbcf29 updates 2 years ago
haroon amjad 7c804f77fb updates & fixes 2 years ago
haroon amjad d11b12ac9a no message 2 years ago
haroon amjad 3f6c05825d updates 2 years ago
haroon amjad 4e962bda07 Merge branch 'development_v3.3' into PatientApp_VIDA_Plus_3.3
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/service/medical/ask_doctor_services.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/pages/conference/web_rtc/call_home_page_.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/pages/webRTC/call_page.dart
#	lib/pages/webRTC/signaling.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/SignalRUtil.dart
#	lib/uitl/utils.dart
#	lib/widgets/others/floating_button_search.dart
2 years ago
haroon amjad b2f390c19d CR 6204 implemented 2 years ago
haroon amjad 14928ad833 CR 6204 2 years ago
haroon amjad 34d3cf2945 CR 6204 Lab reports enhancements in progress 2 years ago
haroon amjad df610690d5 updates 2 years ago
haroon amjad 38661621e3 updates & fixes 2 years ago
haroon amjad 0f863cd259 Updates & fixes 2 years ago
haroon amjad 66600fe66c Medical report CR implemented 2 years ago
haroon amjad 75685b1f61 Project selection added in Laser & advance payment 2 years ago
haroon amjad 7702960bb5 InPatient medical report & view medical report commented out 2 years ago
haroon amjad 2455f48fe1 View medical report done 2 years ago
haroon amjad e4e3377c5c update 2 years ago
haroon amjad 44d8f0efe2 InPatient medical report contd. 2 years ago
haroon amjad a17b941c63 InPatient Medical Report continued 2 years ago