Sultan khan
|
30c14c2167
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
# ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
# lib/core/model/reports/Reports.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/medical/ask_doctor_view_model.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/PrescriptionReport.dart
# lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/medical/eye/EyeHomePage.dart
# lib/pages/medical/reports/report_list_widget.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/location_util.dart
# lib/uitl/utils.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
3 years ago |
 haroon amjad
|
e5d8505c2d
|
Updates & fixes
|
3 years ago |
|
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
|
3 years ago |
|
haroon amjad
|
c6c4f933b2
|
Invoice Type param added in Labs & Rad
|
3 years ago |
devamirsaleemahmad
|
23b7d85911
|
changes
|
3 years ago |
|
devamirsaleemahmad
|
971bab465c
|
models updates -> 3.13.6
|
3 years ago |
|
devamirsaleemahmad
|
cb56750e6b
|
models updates -> 3.13.6
|
3 years ago |
|
Sultan khan
|
b45cbbcf29
|
updates
|
3 years ago |
|
haroon amjad
|
7c804f77fb
|
updates & fixes
|
3 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
|
3 years ago |
|
haroon amjad
|
b2f390c19d
|
CR 6204 implemented
|
3 years ago |
|
haroon amjad
|
14928ad833
|
CR 6204
|
3 years ago |
|
haroon amjad
|
34d3cf2945
|
CR 6204 Lab reports enhancements in progress
|
3 years ago |
|
haroon amjad
|
b92e45aa93
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
cf30762eec
|
updates
|
3 years ago |
|
haroon amjad
|
420aef3195
|
Updates
|
3 years ago |
|
haroon amjad
|
17e7886907
|
VidaPlus Project changes
|
3 years ago |
|
Sultan khan
|
ddcd0bb73c
|
Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into PatientApp_VIDA_Plus_3.3
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
# lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/uitl/LocalNotification.dart
# lib/uitl/push-notification-handler.dart
# lib/widgets/others/bottom_bar.dart
# lib/widgets/others/floating_button_search.dart
# pubspec.yaml
|
3 years ago |
|
haroon amjad
|
5a741bf270
|
Sickleave changes
|
3 years ago |
haroon amjad
|
e50a67ea12
|
Vida Plus changes
|
4 years ago |
|
haroon amjad
|
c8ec536267
|
Sickleave CR done
|
4 years ago |
|
haroon amjad
|
25af2c23ef
|
Sick leave CR, LiveCare support call, Appo calendar changes
|
4 years ago |
|
haroon amjad
|
833818e6e3
|
Rad & Lab email issues fixes
|
4 years ago |
|
haroon amjad
|
0acc134e6e
|
Updates & fixes
|
5 years ago |
|
haroon amjad
|
e96157c74a
|
Covid certificate passport CR implemented
|
5 years ago |
|
haroon amjad
|
73097d15de
|
Covid Lab result generate certificate implemented
|
5 years ago |
Mohammad Aljammal
|
4263672f00
|
fim last vital sign data
|
6 years ago |
|
Mohammad Aljammal
|
754e60eb72
|
fix send email lab result
|
6 years ago |
Mohammad Aljammal
|
de1e352e98
|
fix charts and vital sign
|
6 years ago |
|
Mohammad Aljammal
|
b25bdbb6fa
|
fix LiveChatPage Service LabOrderResult MedicineSearch issues
|
6 years ago |
|
Mohammad Aljammal
|
4d203c8a5b
|
fix LabResult
|
6 years ago |
Mohammad Aljmma
|
a9b11a6b03
|
fix lab result
|
6 years ago |
|
Mohammad Aljmma
|
ed7b9d609f
|
fix lab result
|
6 years ago |
|
Mohammad Aljmma
|
e1f6ef5e5b
|
fix Prescriptions history
|
6 years ago |
|
Mohammad Aljmma
|
570aa514cd
|
fix user authentication data
|
6 years ago |
|
Mohammad Aljammal
|
fe66ee5993
|
fix lab result issues
|
6 years ago |
|
Mohammad Aljammal
|
32e2732c43
|
feedback service
|
6 years ago |
|
Mohammad Aljammal
|
a1fa2c0727
|
done vital sign
|
6 years ago |
|
Mohammad Aljammal
|
a12197fe70
|
labs result done add some file to git ignore for ios
|
6 years ago |
|
Mohammad Aljammal
|
1bbbd18373
|
labs services
|
6 years ago |