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
|
165f3fb9f6
|
NFC Check removed for appo checkin
|
2 years ago |
haroon amjad
|
01db5408c9
|
fixes
|
2 years ago |
haroon amjad
|
eef6f78fd6
|
Updates
|
2 years ago |
Sultan khan
|
f2079d4bbd
|
payment fix
|
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
|
f8fb336740
|
Location checkin privilege applied
|
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
|
5c8bb241b3
|
Next Actions handled when navigating from My Appointments to ToDo list
|
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 |
haroon amjad
|
7c426b90e5
|
updates
|
2 years ago |
haroon amjad
|
dd0099236d
|
Insurance dialog added post registration
|
2 years ago |
haroon amjad
|
cb2bacf539
|
Update insurance for cash patient in ToDo List
|
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
|
720c0ac6e9
|
changes & Deletion
|
2 years ago |
haroon amjad
|
55f1e4166e
|
updates
|
2 years ago |
Sultan khan
|
0c534cffae
|
code update in progress
|
2 years ago |
Sultan khan
|
40656a65d8
|
update in progress
|
2 years ago |
devamirsaleemahmad
|
cb56750e6b
|
models updates -> 3.13.6
|
2 years ago |
Sultan khan
|
b45cbbcf29
|
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
|
9ed454f67a
|
Cash patient check implemented
|
2 years ago |
haroon amjad
|
49963911ba
|
Patient eligibility change
|
2 years ago |
haroon amjad
|
275c99a4ce
|
updates
|
2 years ago |
haroon amjad
|
7c68779324
|
Nphies integration
|
2 years ago |
haroon amjad
|
17acae0a95
|
updates
|
3 years ago |
haroon amjad
|
5045cc6faa
|
Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices
|
3 years ago |
haroon amjad
|
74b0acefd3
|
Updates & fixes
|
3 years ago |
haroon amjad
|
0e01835327
|
Target SDK & Compile SDK bumped to 33
|
3 years ago |
Zohaib Iqbal Kambrani
|
35b129fb68
|
migrated project to latest flutter sdk
|
3 years ago |
haroon amjad
|
22a0e456bc
|
Manual Insurance Updates, Service ID fixes, Tamara Fixes
|
3 years ago |
haroon amjad
|
e80ac2481a
|
Ancillary order & manual insurance update
|
3 years ago |
haroon amjad
|
442a94ac08
|
Updates & fixes
|
3 years ago |
haroon amjad
|
3709ebcb32
|
Updates
|
3 years ago |
haroon amjad
|
e03412214e
|
Ambulance request fixes
|
3 years ago |
haroon amjad
|
dfa88b7de7
|
Updates, fixes & release VersionID 9.1
|
3 years ago |
haroon amjad
|
21cf9da900
|
HMS Core & LiveCare Schedule fixes
|
3 years ago |
haroon amjad
|
58a6dc6a6f
|
Tamara & Apple Pay Fixes + Other Updates
|
3 years ago |
haroon amjad
|
3896f02d13
|
Timezone Updates
|
4 years ago |
haroon amjad
|
ca43849d9d
|
CMC Updates
|
4 years ago |
haroon amjad
|
4ba229c436
|
Updates
|
4 years ago |
haroon amjad
|
eb3f5b5cb5
|
Updates & fixes
|
4 years ago |
haroon amjad
|
7018696328
|
E-Cens sign off
|
4 years ago |
Zohaib Iqbal Kambrani
|
1c6a62776c
|
Analytics statements align to bottom of block
|
4 years ago |
haroon amjad
|
f50bfda330
|
updates
|
4 years ago |
haroon amjad
|
9057a96d7f
|
Updates & fixes
|
4 years ago |
haroon amjad
|
842e099953
|
DateTime Fixes
|
4 years ago |
haroon amjad
|
a9e48e487f
|
HHC Fixes
|
4 years ago |
haroon amjad
|
f1129cc14c
|
updates & fixes
|
4 years ago |
haroon amjad
|
c3538ebdb6
|
Updates & fixes
|
4 years ago |
haroon amjad
|
8d988ba994
|
updates & fixes
|
4 years ago |
haroon amjad
|
aae48f2555
|
Android permission dialog updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
99bdd25bd3
|
added more analytics logs
|
4 years ago |
Zohaib Iqbal Kambrani
|
936b7c28f9
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
Covid updates & other fixes
# Conflicts: Resolved
# lib/config/config.dart
# lib/pages/webRTC/signaling.dart
# lib/widgets/drawer/app_drawer_widget.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
4 years ago |
haroon amjad
|
927db41068
|
Covid updates & other fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
a398220033
|
no message
|
4 years ago |
haroon amjad
|
f879991b50
|
OBGyne updates
|
4 years ago |
haroon amjad
|
907181a56c
|
Merge branch 'development_v2.5' into haroon_development_2.5
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
4b4ac4819f
|
no message
|
4 years ago |
haroon amjad
|
3eb7a4325b
|
updates & fixes
|
4 years ago |
Zohaib Iqbal
|
364ff3344a
|
Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/login/register-info.dart
# lib/pages/medical/balance/confirm_payment_page.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
a2efbf6494
|
no message
|
4 years ago |
Zohaib Iqbal Kambrani
|
940a19d4d7
|
Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5
* 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
ancillary orders update
Updates & fixes
fix category issue
fixes & updates
lakum fix
Updates & fixes
fix translation issue
Compare duplication fixed
Updates & fixes
Updates & fixes
fix compare issue
pharmacy fixes
fix categories & cantact design
pharmacy fixes
Updates & fixes
fix conflict
Updates & fixes
Updates & fixes
Login fixes
# Conflicts: Resolved
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/BookAppointment/SearchResults.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
d974a7430c
|
Google Analytics as per e-Cense document
|
4 years ago |
haroon amjad
|
ea8d700d22
|
updates & fixes
|
4 years ago |
haroon amjad
|
efced34ffa
|
Updates
|
4 years ago |
haroon amjad
|
0acc134e6e
|
Updates & fixes
|
4 years ago |
haroon amjad
|
40d649dfa4
|
Updates & fixes
|
4 years ago |
Sikander Saleem
|
2a92478d01
|
nfc plugin improvement.
|
4 years ago |
haroon amjad
|
b752b42a34
|
Updates & fixes
|
4 years ago |
haroon amjad
|
c253ec3110
|
LiveCare UI revamped
|
4 years ago |
haroon amjad
|
894cc0e336
|
Updates & fixes
|
4 years ago |
haroon amjad
|
ddf764897a
|
Pharmacy Payment method design fix, Blood Donation fix
|
4 years ago |
haroon amjad
|
2cff7c3246
|
LiveCare design fixes
|
4 years ago |
haroon amjad
|
4b0382d7c4
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Mirza.Shafique
|
a273bacc17
|
design fixes 1.1
|
4 years ago |
Haroon Amjad
|
59dac89118
|
updates
|
4 years ago |
haroon amjad
|
1dcfe44e96
|
Translations
|
4 years ago |
Mirza.Shafique
|
4cf9a9b2c2
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
Mirza.Shafique
|
3dbef4095f
|
Payment page design
|
4 years ago |
haroon amjad
|
5f963b0327
|
Translation updates, CMC, HHC & RRT APIs updates
|
4 years ago |
haroon amjad
|
f60684ad08
|
Notifications UI redesigned
|
4 years ago |
haroon amjad
|
b475adb5c3
|
Updates & fixes
|
4 years ago |
Mirza.Shafique
|
d48a4ff4e3
|
Back Button on Landing Page
|
4 years ago |
haroon amjad
|
5163c826ad
|
Updates & fixes
|
4 years ago |
haroon amjad
|
184942e891
|
Covid Payment fixes
|
4 years ago |
Mirza.Shafique
|
9b160958bb
|
Covid New Design 3
|
4 years ago |
Mirza.Shafique
|
b80e2ea16e
|
Covid New Design 2
|
4 years ago |
Mirza.Shafique
|
5b330b2a25
|
Covid New Design
|
4 years ago |
haroon amjad
|
f946a7be4d
|
updates & fixes
|
4 years ago |
haroon amjad
|
f795ba24c5
|
updates & fixes
|
4 years ago |
haroon amjad
|
5396138962
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
# lib/pages/ToDoList/payment_method_select.dart
# lib/pages/medical/balance/confirm_payment_page.dart
|
4 years ago |
haroon amjad
|
3bb0a8b85b
|
Apple Pay finalized, Translation issues fixed, other updates
|
4 years ago |