Commit Graph

3133 Commits (b4bc99369f92086bed97e8f5ab672bdf66cfb541)
 

Author SHA1 Message Date
Aamir Muhammad b4bc99369f Changes into Rating Bar 12 months ago
devamirsaleemahmad 8bdcfcb764 Changes & Latest Merges 3.3 12 months 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
12 months ago
devamirsaleemahmad 9d1b153739 Dropdown Changed 12 months ago
haroon amjad b579e494c1 updates 12 months ago
Sultan khan 413535ef0b null safety fixed. 12 months ago
Sultan khan 649521c31f Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 12 months ago
Sultan khan c96c151f44 null safety issue fixed. 12 months ago
devamirsaleemahmad d6f51f6c82 changes 12 months ago
haroon amjad 7c426b90e5 updates 12 months ago
Sultan khan 1a5687a27c Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/BookAppointment/widgets/DoctorView.dart
#	lib/uitl/app_toast.dart
12 months ago
Sultan khan ec13edc28b updates. 12 months ago
devamirsaleemahmad 8f591654a5 changes 12 months ago
haroon amjad dd0099236d Insurance dialog added post registration 12 months ago
haroon amjad c7ee76d816 updates 12 months ago
haroon amjad cb2bacf539 Update insurance for cash patient in ToDo List 12 months ago
haroon amjad 4fcc698f50 CR 6654 done 12 months ago
haroon amjad bbee4dba66 CR 6654 cancel manual insurance update CR done. 12 months ago
devamirsaleemahmad cbc38940ea changes 12 months ago
devamirsaleemahmad ed748a626b changes 12 months ago
devamirsaleemahmad 23b7d85911 changes 12 months ago
haroon amjad 81de6f9848 updated app to stores Version ID 11.0 12 months 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
12 months ago
haroon amjad d5dd8757e9 Privileges added for QR & NFC CheckIn options 12 months ago
haroon amjad 772992e3ff updates 12 months ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 12 months ago
haroon amjad 13b2db47b5 HMC color change applied in my appointments 1 year ago
haroon amjad 6bd6572e7e Lab, Rad & prescription disabled in my appointments screen in case of ER appointment (Clinic ID 10) & project is Vida Plus. 1 year ago
haroon amjad 0a478e077a QR Code checkin implemented 1 year ago
haroon amjad 542501f5c5 updates 1 year ago
haroon amjad a5e0de08ce updates for ancillary 1 year ago
devamirsaleemahmad 8544b3ce3d changes & Deletion 1 year ago
devamirsaleemahmad 720c0ac6e9 changes & Deletion 1 year ago
haroon amjad 55f1e4166e updates 1 year ago
Sultan khan 4d52f639aa Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/livecare/live_care_payment_page.dart
#	lib/pages/medical/smart_watch_health_data/steps/stepsTracker.dart
#	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
#	lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart
#	lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
#	lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart
1 year ago
Sultan khan 0c534cffae code update in progress 1 year ago
devamirsaleemahmad 2c9e51aef0 changes 1 year ago
devamirsaleemahmad 1c34843bc5 Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6 1 year ago
Sultan khan 6a8de14d5d code update in progress 1 year ago
devamirsaleemahmad 519f396e76 changes 1 year ago
Sultan khan 40656a65d8 update in progress 1 year ago
devamirsaleemahmad 49d3df8c87 changes 1 year ago
devamirsaleemahmad 47801ecb36 changes 1 year ago
devamirsaleemahmad d8836d5e89 Merge branch 'dev_v3.13.6_automigrate' into dev_v3.13.6
# Conflicts:
#	lib/main.dart
#	lib/uitl/CalendarUtils.dart
#	lib/uitl/app_shared_preferences.dart
1 year ago
devamirsaleemahmad c1fd6313b1 changes 1 year ago
Sultan khan c63a1fadf5 code updated in-progress 1 year ago
Sultan khan 6a6ac76973 Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 1 year ago
Sultan khan 8a42bf8b2f Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/widgets/buttons/custom_text_button.dart
1 year ago
devamirsaleemahmad dfc6e86442 models updates -> 3.13.6 1 year ago
Sultan khan aa605a2e47 file updated 1 year ago