Sultan khan
|
4338da513d
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter 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/radiology/final_radiology.dart
# lib/core/model/radiology/request_send_rad_report_email.dart
# lib/core/model/rate/appoitment_rated.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/viewModels/medical/labs_view_model.dart
# lib/core/viewModels/medical/radiology_view_model.dart
# lib/models/Authentication/check_activation_code_request.dart
# lib/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/pages/DrawerPages/notifications/notification_details_page.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/landing/landing_page.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/login/confirm-login.dart
# lib/pages/login/login.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/services/authentication/auth_provider.dart
# lib/splashPage.dart
# lib/uitl/push-notification-handler.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
2 years ago |
haroon amjad
|
512db615be
|
Language ID fixes & app update to stores, VersionID 11.5
|
2 years ago |
haroon amjad
|
724a26ca68
|
Updates
|
2 years ago |
haroon amjad
|
cfd8b5e8a5
|
Language ID Changes
|
2 years ago |
haroon amjad
|
80167378d9
|
lat long fixes
|
2 years ago |
haroon amjad
|
c6c4f933b2
|
Invoice Type param added in Labs & Rad
|
2 years ago |
haroon amjad
|
421bae2037
|
updates
|
2 years ago |
Aamir Muhammad
|
6f99aca8a5
|
Inpatient Cr Merge
|
2 years ago |
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 |
haroon amjad
|
beb3453ff5
|
updates
|
2 years ago |
devamirsaleemahmad
|
2def9f3744
|
Merges From 3.3
|
2 years ago |
devamirsaleemahmad
|
d73cc13100
|
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/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/splashPage.dart
# lib/uitl/utils.dart
|
2 years ago |
haroon amjad
|
1ecb8ebfe9
|
updated to stores version 11.3
|
2 years ago |
Sultan khan
|
8c46d2577d
|
updated with assets
|
2 years ago |
Sultan khan
|
432e64e51d
|
updates
|
2 years ago |
haroon amjad
|
245716119e
|
Location based Check In implemented
|
2 years ago |
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 |