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 |
devamirsaleemahmad
|
9d1b153739
|
Dropdown Changed
|
2 years ago |
haroon amjad
|
b579e494c1
|
updates
|
2 years ago |
Sultan khan
|
413535ef0b
|
null safety fixed.
|
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 |
haroon amjad
|
7f753014df
|
Inpatient advance payment projectID param issue resolved
|
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
|
b10383c3ff
|
Translation updates
|
2 years ago |
haroon amjad
|
dd0099236d
|
Insurance dialog added post registration
|
2 years ago |
haroon amjad
|
1997dbe128
|
updates
|
2 years ago |
haroon amjad
|
c7ee76d816
|
updates
|
2 years ago |
haroon amjad
|
e4492cbc1f
|
Medical instructions updates
|
2 years ago |
haroon amjad
|
cb2bacf539
|
Update insurance for cash patient in ToDo List
|
2 years ago |
haroon amjad
|
4fcc698f50
|
CR 6654 done
|
2 years ago |
haroon amjad
|
bbee4dba66
|
CR 6654 cancel manual insurance update CR done.
|
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 |
haroon amjad
|
d5dd8757e9
|
Privileges added for QR & NFC CheckIn options
|
2 years ago |
haroon amjad
|
772992e3ff
|
updates
|
2 years ago |
devamirsaleemahmad
|
3f1ba19c64
|
changes & Null to Dynamic
|
2 years ago |
haroon amjad
|
41cd55e02b
|
paymentRequestID added in the request
|
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 |
haroon amjad
|
ee5fb615db
|
updates & fixes
|
2 years ago |
haroon amjad
|
185f54d26d
|
updates & fixes
|
2 years ago |
haroon amjad
|
0a478e077a
|
QR Code checkin implemented
|
2 years ago |
haroon amjad
|
542501f5c5
|
updates
|
2 years ago |
haroon amjad
|
a5e0de08ce
|
updates for ancillary
|
2 years ago |
devamirsaleemahmad
|
8544b3ce3d
|
changes & Deletion
|
2 years ago |
devamirsaleemahmad
|
720c0ac6e9
|
changes & Deletion
|
2 years ago |
haroon amjad
|
55f1e4166e
|
updates
|
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 |
devamirsaleemahmad
|
1c34843bc5
|
Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6
|
2 years ago |
Sultan khan
|
6a8de14d5d
|
code update in progress
|
2 years ago |
devamirsaleemahmad
|
519f396e76
|
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
|
6a6ac76973
|
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
|
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 |
devamirsaleemahmad
|
dfc6e86442
|
models updates -> 3.13.6
|
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 |
devamirsaleemahmad
|
50816d452e
|
Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6
|
2 years ago |
devamirsaleemahmad
|
b3587688b8
|
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 |
Sultan khan
|
04244675e1
|
code updated.
|
2 years ago |
Sultan khan
|
6f8be66f42
|
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.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 |
Sultan khan
|
1eb38b1dc4
|
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
|
2 years ago |
devamirsaleemahmad
|
3523daa9fa
|
updates -> 3.13.6
|
2 years ago |
Faiz Hashmi
|
1492efdedb
|
changes to build app
|
2 years ago |
devamirsaleemahmad
|
6ff864c4cd
|
updates -> 3.13.6
|
2 years ago |
Sultan khan
|
8bf5479f56
|
code updated.
|
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 |
haroon amjad
|
dac842f50c
|
fixes for inpatient advance
|
2 years ago |
haroon amjad
|
d11b12ac9a
|
no message
|
2 years ago |
haroon amjad
|
c5e88ac7ba
|
fixes
|
2 years ago |
haroon amjad
|
645e266af8
|
Vida plus updates sent to stores
|
2 years ago |
haroon amjad
|
f0a4bd6925
|
Commented the CRs code
|
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
|
0f4f98f31c
|
fixes
|
2 years ago |
haroon amjad
|
af5b0766a2
|
CR 6654, Disable update manual insurance temporarily.
|
2 years ago |
haroon amjad
|
b2f390c19d
|
CR 6204 implemented
|
2 years ago |
haroon amjad
|
14928ad833
|
CR 6204
|
2 years ago |
haroon amjad
|
34d3cf2945
|
CR 6204 Lab reports enhancements in progress
|
2 years ago |
haroon amjad
|
df610690d5
|
updates
|
2 years ago |
haroon amjad
|
e780df90e1
|
updates
|
2 years ago |
haroon amjad
|
d8e9f36844
|
updates
|
2 years ago |
haroon amjad
|
c0595a8dc6
|
updates
|
2 years ago |
Sultan khan
|
abcf82346e
|
Excluded change
|
2 years ago |
haroon amjad
|
31144c7c27
|
updates
|
2 years ago |
haroon amjad
|
2048747a62
|
ancillary updates
|
2 years ago |
haroon amjad
|
9ed454f67a
|
Cash patient check implemented
|
2 years ago |
haroon amjad
|
49963911ba
|
Patient eligibility change
|
2 years ago |
haroon amjad
|
4dd16bde59
|
Inpatient medical report fixes
|
2 years ago |
haroon amjad
|
a58e4452b8
|
ancillary changes
|
2 years ago |
haroon amjad
|
38661621e3
|
updates & fixes
|
2 years ago |
haroon amjad
|
6f20f1b871
|
InPatient Discharge Medications
|
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
|
275c99a4ce
|
updates
|
2 years ago |
haroon amjad
|
0f863cd259
|
Updates & fixes
|
2 years ago |
haroon amjad
|
652c19cdf8
|
updates
|
2 years ago |
haroon amjad
|
5ddf8d4b7a
|
View Dr response fix
|
2 years ago |
haroon amjad
|
66600fe66c
|
Medical report CR implemented
|
2 years ago |
haroon amjad
|
fb9a4d5297
|
Laser clinic changes
|
2 years ago |
haroon amjad
|
6b121e7f39
|
Store build version 4.5.026
|
2 years ago |
haroon amjad
|
75685b1f61
|
Project selection added in Laser & advance payment
|
2 years ago |
haroon amjad
|
e64a91855f
|
fixes
|
2 years ago |
haroon amjad
|
7702960bb5
|
InPatient medical report & view medical report commented out
|
2 years ago |
haroon amjad
|
3642ca6a47
|
InPatient advance payment updates
|
2 years ago |
haroon amjad
|
1300dadce1
|
Inpatient advance payment
|
2 years ago |
haroon amjad
|
4a7ca9cd46
|
InPatient advance payment history implemented
|
2 years ago |
haroon amjad
|
5c5ed35df8
|
Clinic & Doctor ID added
|
2 years ago |
haroon amjad
|
2bf8d454f5
|
updates
|
2 years ago |
haroon amjad
|
c58e180c91
|
Updates
|
2 years ago |
haroon amjad
|
965df33253
|
Appointment actions fixes
|
2 years ago |
haroon amjad
|
7c68779324
|
Nphies integration
|
2 years ago |
haroon amjad
|
3e63d80655
|
Ancillary order updates
|
2 years ago |
haroon amjad
|
ae0fca865d
|
InPatient Advance payment API implemented
|
2 years ago |
haroon amjad
|
a9ae44ca89
|
Implemented checks for InPatient CR
|
2 years ago |
haroon amjad
|
2455f48fe1
|
View medical report done
|
2 years ago |
haroon amjad
|
dd79b1dfca
|
InPatient pending advance payment done
|
2 years ago |
haroon amjad
|
4afdf5545e
|
Translations added
|
2 years ago |
haroon amjad
|
d251ca0e1c
|
Inpatient medical instructions implemented
|
2 years ago |
haroon amjad
|
786dd76f57
|
updates
|
2 years ago |
haroon amjad
|
e4e3377c5c
|
update
|
2 years ago |
haroon amjad
|
3353c93de9
|
fixes
|
3 years ago |
haroon amjad
|
44d8f0efe2
|
InPatient medical report contd.
|
3 years ago |
haroon amjad
|
da0a164b0e
|
updates
|
3 years ago |
haroon amjad
|
a17b941c63
|
InPatient Medical Report continued
|
3 years ago |
haroon amjad
|
9b3c07d3b1
|
Added AED in advance payment
|
3 years ago |
haroon amjad
|
657248803f
|
Ask doc disabled for LiveCare appointments
|
3 years ago |
haroon amjad
|
d261557cd7
|
Admitted patient API changed
|
3 years ago |
haroon amjad
|
ff23f3a8cb
|
fixes
|
3 years ago |
haroon amjad
|
b2ec6c76bf
|
ancillary fix
|
3 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
|
3 years ago |
haroon amjad
|
b92e45aa93
|
Updates & fixes
|
3 years ago |
haroon amjad
|
a60f66a069
|
Updates
|
3 years ago |
haroon amjad
|
3fb8876c31
|
Manual Insurance Card Update
|
3 years ago |
haroon amjad
|
fe606b7823
|
InPatient Advance Payment
|
3 years ago |
haroon amjad
|
1eccaf0aac
|
Regex added to allow characters only.
|
3 years ago |
haroon amjad
|
1a45dd57e9
|
LiveCare Fix
|
3 years ago |
haroon amjad
|
047877fb08
|
Add Doctor response rate comments validation
|
3 years ago |
haroon amjad
|
20572f463a
|
meal plan dev completed
|
3 years ago |
Sultan khan
|
5d6b50a1da
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
|
3 years ago |
Sultan khan
|
83859e05f1
|
family file approve reject button refresh
|
3 years ago |
haroon amjad
|
0e054429ef
|
Meal Plan implementation completed
|
3 years ago |
haroon amjad
|
d9404d3abe
|
Medical Report changes
|
3 years ago |
haroon amjad
|
bc27121c4e
|
meal plan updates
|
3 years ago |
haroon amjad
|
96f948a8c8
|
updates
|
3 years ago |
haroon amjad
|
4b0a41d7d8
|
updates
|
3 years ago |
haroon amjad
|
94296cec0d
|
meal plan continued
|
3 years ago |
haroon amjad
|
38648df897
|
Meal Plan development continued
|
3 years ago |
haroon amjad
|
d073eb9d5f
|
MealPlan implementation continued
|
3 years ago |
haroon amjad
|
77ab9373f8
|
Meal Plan APIs implementation continued
|
3 years ago |
haroon amjad
|
b337343df3
|
Project ID fix in ancillary orders
|
3 years ago |
Sultan khan
|
27373b6972
|
doctor header.
|
3 years ago |
Sultan khan
|
5e4ca336c2
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
|
3 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
|
3 years ago |
haroon amjad
|
710e6274db
|
mealplan updates
|
3 years ago |
Sultan khan
|
0306c777ed
|
rating bug fixed
|
3 years ago |
haroon amjad
|
31d8443f87
|
insert call info updates
|
3 years ago |
haroon amjad
|
f2ab76eb24
|
updates
|
3 years ago |
haroon amjad
|
9f44b25353
|
Meal Plan API integration in progress
|
3 years ago |
haroon amjad
|
7bc105c6c7
|
updates
|
3 years ago |
haroon amjad
|
12af8bb8a9
|
updates
|
3 years ago |
haroon amjad
|
6877244d0e
|
CR# 5805 Ask Doc Improvements dev completed.
|
3 years ago |
haroon amjad
|
792b3ea249
|
no message
|
3 years ago |
Sultan khan
|
f29d33d7e7
|
Changes for voice command search
|
3 years ago |
haroon amjad
|
e4fe4baa27
|
nearest appo crash fixed
|
3 years ago |
haroon amjad
|
3fda1da16a
|
updates
|
3 years ago |
haroon amjad
|
83ca5e8e4c
|
ask doctor date param added
|
3 years ago |
haroon amjad
|
58e598843b
|
sickleave
|
3 years ago |
haroon amjad
|
2d93b9753d
|
Ask doctor improvements
|
3 years ago |
haroon amjad
|
f28fcbd006
|
AdvanceNumber_VP added
|
3 years ago |
haroon amjad
|
17acae0a95
|
updates
|
3 years ago |
haroon amjad
|
101f2dcab8
|
updates
|
3 years ago |
haroon amjad
|
60d5ba4a9e
|
Birth Notification implemented
|
3 years ago |
haroon amjad
|
078482c21d
|
updates
|
3 years ago |
haroon amjad
|
cf30762eec
|
updates
|
3 years ago |
haroon amjad
|
420aef3195
|
Updates
|
3 years ago |
haroon amjad
|
2437d2da9c
|
Updates
|
3 years ago |
haroon amjad
|
01ee9a2710
|
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
|
3 years ago |
haroon amjad
|
77f3d0a238
|
radiology API fixes
|
3 years ago |
haroon amjad
|
e098705374
|
localized strings
|
3 years ago |
haroon amjad
|
7280e2a1d7
|
Birth Notification UI Implemented
|
3 years ago |
haroon amjad
|
17e7886907
|
VidaPlus Project changes
|
3 years ago |
haroon amjad
|
a7a06f4083
|
Home page change
|
3 years ago |
haroon amjad
|
b64ba9211e
|
Inpatient services in dev
|
3 years ago |
haroon amjad
|
906fd5fd6a
|
Inpatient services in dev
|
3 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
|
3 years ago |
haroon amjad
|
15c4f016df
|
update to stores for version 10.5
|
3 years ago |
haroon amjad
|
3675d05911
|
config changes
|
3 years ago |
Sultan khan
|
0514fecae2
|
lab report email change
|
3 years ago |
haroon amjad
|
badc13d41a
|
sickleave CR Enabled
|
3 years ago |
Sultan khan
|
83c15196c8
|
VIDA PLUS CHANGE
|
3 years ago |