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
|
8b468fe4b5
|
Updates & fixes
|
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
|
40656a65d8
|
update in progress
|
2 years ago |
haroon amjad
|
e03412214e
|
Ambulance request fixes
|
3 years ago |
haroon amjad
|
5f963b0327
|
Translation updates, CMC, HHC & RRT APIs updates
|
4 years ago |
haroon amjad
|
aadcfdc7bc
|
Insurance Approval fixes
|
4 years ago |
haroon amjad
|
4560037f97
|
updates
|
4 years ago |
Sikander Saleem
|
d605084a91
|
appointment list and detail ui changed
|
4 years ago |
Sikander Saleem
|
bb18645d85
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
5ab9dd1761
|
Appointment screen Changes & improvements.
|
4 years ago |
Sultan Khan
|
11ffed2ae3
|
bug fixes
|
4 years ago |
haroon amjad
|
90db04cee1
|
Jira Fixes
|
5 years ago |
Haroon Amjad
|
b0ea1fc262
|
updates & fixes
|
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
|
9d046fd971
|
updates & fixes
|
5 years ago |
Haroon Amjad
|
9d3c64200e
|
fixes
|
5 years ago |
haroon amjad
|
e5feef8a9d
|
Updates & UI Fixes
|
5 years ago |
haroon amjad
|
c5794e5c70
|
Dental flow in my appointments
|
5 years ago |
haroon amjad
|
db30fbdfd2
|
implementing livecare
|
5 years ago |
haroon amjad
|
59c279998c
|
working on vital signs integration
|
6 years ago |
haroon amjad
|
7972d01dff
|
Insurance Approval implemented
|
6 years ago |
haroon amjad
|
750746aabe
|
updates & fixes
|
6 years ago |
haroon amjad
|
c50530734d
|
added my appointments in medical file page
|
6 years ago |
Haroon Amjad
|
8ad2941836
|
Appointment payment finalised, Ask Doc implemeted & other updates
|
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 |
haroon amjad
|
b3e5047820
|
Payment method selection page created, Appointment details functions implemented
|
6 years ago |
haroon amjad
|
049d455e3c
|
Implementing appointment details functions
|
6 years ago |
haroon amjad
|
f5ddfabf50
|
Todo list implemented, Appointment details implemented, Appointment Reschedule implemented, Appointment Confirmed implemented
|
6 years ago |
Haroon Amjad
|
9eb9f01dbd
|
Get Clinic List API Implemented, Architecture for HTTP requests implemented
|
6 years ago |
haroon amjad
|
a0173c5b4d
|
Appointment Details page, ToDo List Page implemented
|
6 years ago |