 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 |
Sultan khan
|
f2079d4bbd
|
payment fix
|
2 years ago |
|
Sultan khan
|
62dc3c162a
|
updated 3.13.6
|
2 years ago |
|
Aamir Muhammad
|
542864c89c
|
Gif Loader & My Family Fixes
|
2 years ago |
 haroon amjad
|
f8fb336740
|
Location checkin privilege applied
|
2 years ago |
|
Sultan khan
|
8c46d2577d
|
updated with assets
|
2 years ago |
|
Sultan khan
|
8c520d9431
|
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
|
2 years ago |
|
Sultan khan
|
432e64e51d
|
updates
|
2 years ago |
|
Aamir Muhammad
|
b4bc99369f
|
Changes into Rating Bar
|
2 years ago |
|
haroon amjad
|
245716119e
|
Location based Check In implemented
|
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
|
413535ef0b
|
null safety fixed.
|
2 years ago |
|
Sultan khan
|
c96c151f44
|
null safety issue fixed.
|
2 years ago |
|
haroon amjad
|
7c426b90e5
|
updates
|
2 years 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
|
2 years ago |
|
Sultan khan
|
ec13edc28b
|
updates.
|
2 years ago |
|
devamirsaleemahmad
|
8f591654a5
|
changes
|
2 years ago |
|
haroon amjad
|
dd0099236d
|
Insurance dialog added post registration
|
2 years ago |
|
devamirsaleemahmad
|
cbc38940ea
|
changes
|
2 years ago |
|
devamirsaleemahmad
|
ed748a626b
|
changes
|
2 years ago |
|
devamirsaleemahmad
|
23b7d85911
|
changes
|
2 years ago |
|
haroon amjad
|
81de6f9848
|
updated app to stores Version ID 11.0
|
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 |
|
devamirsaleemahmad
|
3f1ba19c64
|
changes & Null to Dynamic
|
2 years ago |
|
haroon amjad
|
13b2db47b5
|
HMC color change applied in my appointments
|
2 years ago |
|
haroon amjad
|
0a478e077a
|
QR Code checkin implemented
|
2 years ago |
|
haroon amjad
|
542501f5c5
|
updates
|
2 years ago |
|
devamirsaleemahmad
|
720c0ac6e9
|
changes & Deletion
|
2 years 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
|
2 years ago |
|
Sultan khan
|
0c534cffae
|
code update in progress
|
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
|
47801ecb36
|
changes
|
2 years 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
|
2 years ago |
|
devamirsaleemahmad
|
c1fd6313b1
|
changes
|
2 years ago |
|
Sultan khan
|
c63a1fadf5
|
code updated in-progress
|
2 years 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
|
2 years ago |
|
Sultan khan
|
aa605a2e47
|
file updated
|
2 years ago |
|
devamirsaleemahmad
|
1c19b36d2d
|
models updates -> 3.13.6
|
2 years ago |
|
devamirsaleemahmad
|
b26f535749
|
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 |
|
Sultan khan
|
04244675e1
|
code updated.
|
2 years ago |
|
Sultan khan
|
8bf5479f56
|
code updated.
|
2 years ago |
|
Sultan khan
|
b45cbbcf29
|
updates
|
2 years ago |
|
haroon amjad
|
7c804f77fb
|
updates & fixes
|
2 years ago |
|
haroon amjad
|
d11b12ac9a
|
no message
|
2 years ago |
|
haroon amjad
|
645e266af8
|
Vida plus updates sent to stores
|
2 years ago |
|
haroon amjad
|
3f6c05825d
|
updates
|
2 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
|
2 years ago |
|
haroon amjad
|
df610690d5
|
updates
|
2 years ago |
|
haroon amjad
|
d8e9f36844
|
updates
|
2 years ago |
|
haroon amjad
|
c0595a8dc6
|
updates
|
2 years ago |
|
haroon amjad
|
31144c7c27
|
updates
|
2 years ago |
|
haroon amjad
|
72ee34f9a7
|
Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/uitl/translations_delegate_base.dart
|
2 years ago |
|
haroon amjad
|
6b121e7f39
|
Store build version 4.5.026
|
2 years ago |
|
haroon amjad
|
e64a91855f
|
fixes
|
2 years ago |
|
haroon amjad
|
c58e180c91
|
Updates
|
2 years ago |
|
haroon amjad
|
7c68779324
|
Nphies integration
|
2 years ago |
|
haroon amjad
|
ae0fca865d
|
InPatient Advance payment API implemented
|
2 years ago |
|
haroon amjad
|
da0a164b0e
|
updates
|
2 years ago |
|
haroon amjad
|
f624c70cee
|
Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
2 years ago |
|
haroon amjad
|
b92e45aa93
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
a60f66a069
|
Updates
|
2 years ago |
|
haroon amjad
|
3fb8876c31
|
Manual Insurance Card Update
|
2 years ago |
|
haroon amjad
|
96f948a8c8
|
updates
|
2 years ago |
|
haroon amjad
|
38648df897
|
Meal Plan development continued
|
2 years ago |
|
Sultan khan
|
27373b6972
|
doctor header.
|
2 years ago |
|
Sultan khan
|
68f39d965c
|
Merge branch 'sultan_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
# lib/widgets/new_design/doctor_header.dart
# pubspec.yaml
|
2 years ago |
|
Sultan khan
|
0306c777ed
|
rating bug fixed
|
2 years ago |
|
Sultan khan
|
f29d33d7e7
|
Changes for voice command search
|
2 years ago |
|
haroon amjad
|
2d93b9753d
|
Ask doctor improvements
|
2 years ago |
|
haroon amjad
|
60d5ba4a9e
|
Birth Notification implemented
|
2 years ago |
|
haroon amjad
|
2437d2da9c
|
Updates
|
2 years ago |
|
haroon amjad
|
7280e2a1d7
|
Birth Notification UI Implemented
|
2 years ago |
|
haroon amjad
|
17e7886907
|
VidaPlus Project changes
|
2 years ago |
|
haroon amjad
|
906fd5fd6a
|
Inpatient services in dev
|
2 years ago |
|
haroon amjad
|
2fea4b2b07
|
Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/pages/landing/widgets/services_view.dart
|
2 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
|
2 years ago |
|
haroon amjad
|
b304332526
|
Patient app release to stores 10.4
|
3 years ago |
|
haroon amjad
|
5a741bf270
|
Sickleave changes
|
3 years ago |
|
haroon amjad
|
9d2df00d87
|
Get General instructions implemented
|
3 years ago |
|
haroon amjad
|
0e4e285954
|
InPatient CR dev
|
3 years ago |
|
haroon amjad
|
701eedf147
|
updates
|
3 years ago |
|
haroon amjad
|
670991eca4
|
Lab result fix
|
3 years ago |
|
haroon amjad
|
af90ab3aa3
|
Sickleave & chart changes
|
3 years ago |
|
haroon amjad
|
128bd2ec54
|
Inpatient services implementation
|
3 years ago |
|
haroon amjad
|
dc859b01f7
|
updates & fixes
|
3 years ago |
haroon amjad
|
1eed379889
|
Lab result flowchart fix
|
3 years ago |
|
haroon amjad
|
63426a691d
|
Ancillary orders family members issue resolved
|
3 years ago |
|
haroon amjad
|
5045cc6faa
|
Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices
|
3 years ago |
|
haroon amjad
|
a20d6c7c28
|
Livecare updates
|
3 years ago |
|
haroon amjad
|
4ecab57173
|
Pharma LiveCare updates
|
3 years ago |
|
haroon amjad
|
da423fe12a
|
Pharma LiveCare updates
|
3 years ago |
|
haroon amjad
|
4f50c3ff8e
|
Pharmacy LiveCare revamped
|
3 years ago |
|
haroon amjad
|
74b0acefd3
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
8e14084467
|
updates
|
3 years ago |
|
haroon amjad
|
98abc5a069
|
updates
|
3 years ago |