Commit Graph

62 Commits (4231c8505553604059765d4fb2a69b8f61c9f484)

Author SHA1 Message Date
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
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 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
haroon amjad 55f1e4166e updates 2 years ago
Sultan khan 40656a65d8 update in progress 2 years ago
haroon amjad 965df33253 Appointment actions fixes 2 years ago
haroon amjad 657248803f Ask doc disabled for LiveCare appointments 2 years ago
haroon amjad dfc2889df7 dental reschedule fix 3 years ago
haroon amjad 62b9b3e35c calendar permission handled in iOS 3 years ago
Sultan khan 9683b3f42f Dubai Reminder fixed. 3 years ago
haroon amjad e03412214e Ambulance request fixes 3 years ago
Zohaib Iqbal Kambrani 1c6a62776c Analytics statements align to bottom of block 4 years ago
haroon amjad 72e5d0a2be Pharma LiveCare 4 years ago
Zohaib Iqbal Kambrani 99bdd25bd3 added more analytics logs 4 years ago
haroon amjad 9c0337aa01 updates & fixes 4 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 4 years ago
haroon amjad e564cdc7e5 Updates & fixes 4 years ago
haroon amjad 5163c826ad Updates & fixes 4 years ago
haroon amjad a075d53dd5 UI updates & fixes 4 years ago
haroon amjad eeb20073cb Medicine prescriptions fixes from appointment details page 4 years ago
haroon amjad b1128be94f Updates & fixes 4 years ago
Mirza.Shafique 3af1676730 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/insurance/insurance_card_screen.dart
#	lib/pages/medical/balance/advance_payment_page.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
Mirza.Shafique a234618df8 Update, Insurance card and My Balance Design 4 years ago
haroon amjad ebcc2559ce Ask doctor issue resolved, Translation & font family issues resolved 4 years ago
haroon amjad 8e7786cb96 updates & fixes 4 years ago
Mirza.Shafique e1e3741abf Event Reminder 4 years ago
Sikander Saleem ca363adee2 merge & improvements 4 years ago
Sikander Saleem d605084a91 appointment list and detail ui changed 4 years ago
Sikander Saleem 5ab9dd1761 Appointment screen Changes & improvements. 4 years ago
Mohammad Aljammal d9fabbab17 Fix feedback 4 years ago
haroon amjad a32501f3dc My invoices implementation continued 4 years ago
mosazaid 116a4af845 fix-design 5 years ago
mosazaid e5474b3062 fix perscription pages bugs 5 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
haroon amjad deb0b40cfe fixes 5 years ago
Mohammad Aljammal 5e29dff448 fix issues insurance and medical profile order 5 years ago
Haroon Amjad b0ea1fc262 updates & fixes 5 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 9d046fd971 updates & fixes 5 years ago
haroon amjad 740a294867 Translation & bug fixes 5 years ago
haroon amjad 9ecaaa1b12 radiology fix in appointment details 5 years ago
Haroon Amjad 9d3c64200e fixes 5 years ago
haroon amjad c4bb75eab4 Doctor rating fixed 5 years ago
haroon amjad a1f91d99b3 added countdown timer in my appointments 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 e5feef8a9d Updates & UI Fixes 5 years ago
haroon amjad 1553e71e7d New loading dialog added into appointment flow 5 years ago
haroon amjad 3354058738 Branding updated according to DQ 5 years ago
haroon amjad 7fdc0da9dc livecare scheduling implemented 5 years ago
haroon amjad c9256a654a LiveCare Scheduling updates 5 years ago