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 |
haroon amjad
|
70176e0cb1
|
updates
|
2 years ago |
Sultan khan
|
359a177797
|
updates
|
2 years ago |
haroon amjad
|
beb3453ff5
|
updates
|
2 years ago |
Sultan khan
|
f2079d4bbd
|
payment fix
|
2 years ago |
haroon amjad
|
a0bca92195
|
CR Implemented
|
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 |
devamirsaleemahmad
|
fb62ce2f19
|
Calender Fix Ios 17+
|
2 years ago |
devamirsaleemahmad
|
1ddac14efb
|
Calender Permission Fix Ios 17+
|
2 years ago |
Aamir Muhammad
|
a24afd4302
|
Calender Permission
|
2 years ago |
Aamir Muhammad
|
f211fd5617
|
Call Notification Fix
|
2 years ago |
Sultan khan
|
8c46d2577d
|
updated with assets
|
2 years ago |
Aamir Muhammad
|
b4bc99369f
|
Changes into Rating Bar
|
2 years ago |
haroon amjad
|
245716119e
|
Location based Check In implemented
|
2 years ago |
haroon amjad
|
6dd5fda997
|
Location check in implementing
|
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 |
Sultan khan
|
413535ef0b
|
null safety fixed.
|
2 years ago |
devamirsaleemahmad
|
d6f51f6c82
|
changes
|
2 years ago |
haroon amjad
|
7d2744d29c
|
Lab report CR implemented
|
2 years ago |
haroon amjad
|
47ccf68b3a
|
updates
|
2 years ago |
haroon amjad
|
a6a541b903
|
Lab Orders CR implementation contd.
|
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
|
cb2bacf539
|
Update insurance for cash patient in ToDo List
|
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 |
devamirsaleemahmad
|
3f1ba19c64
|
changes & Null to Dynamic
|
2 years ago |
haroon amjad
|
13b2db47b5
|
HMC color change applied in my appointments
|
2 years ago |
haroon amjad
|
185f54d26d
|
updates & fixes
|
2 years ago |
haroon amjad
|
0a478e077a
|
QR Code checkin implemented
|
2 years ago |
devamirsaleemahmad
|
8544b3ce3d
|
changes & Deletion
|
2 years ago |
devamirsaleemahmad
|
2c9e51aef0
|
changes
|
2 years ago |
Sultan khan
|
40656a65d8
|
update in progress
|
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 |
devamirsaleemahmad
|
dfc6e86442
|
models updates -> 3.13.6
|
2 years ago |
Sultan khan
|
aa605a2e47
|
file updated
|
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
|
af5b0766a2
|
CR 6654, Disable update manual insurance temporarily.
|
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
|
9ed454f67a
|
Cash patient check implemented
|
2 years ago |
haroon amjad
|
49963911ba
|
Patient eligibility change
|
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
|
1300dadce1
|
Inpatient advance payment
|
3 years ago |
haroon amjad
|
a9ae44ca89
|
Implemented checks for InPatient CR
|
3 years ago |
haroon amjad
|
dd79b1dfca
|
InPatient pending advance payment done
|
3 years ago |
haroon amjad
|
4afdf5545e
|
Translations added
|
3 years ago |
haroon amjad
|
3353c93de9
|
fixes
|
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
|
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
|
0e054429ef
|
Meal Plan implementation completed
|
3 years ago |
haroon amjad
|
38648df897
|
Meal Plan development continued
|
3 years ago |
haroon amjad
|
6877244d0e
|
CR# 5805 Ask Doc Improvements dev completed.
|
3 years ago |
haroon amjad
|
60d5ba4a9e
|
Birth Notification implemented
|
3 years ago |
haroon amjad
|
cf30762eec
|
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
|
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
|
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 |
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
|
b304332526
|
Patient app release to stores 10.4
|
3 years ago |
haroon amjad
|
128bd2ec54
|
Inpatient services implementation
|
3 years ago |
haroon amjad
|
e81a1b8bcc
|
iOS Firebase fix
|
3 years ago |
haroon amjad
|
5045cc6faa
|
Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices
|
3 years ago |
haroon amjad
|
bc8a979438
|
Upload to stores
|
3 years ago |
haroon amjad
|
4ecab57173
|
Pharma LiveCare updates
|
3 years ago |
haroon amjad
|
da423fe12a
|
Pharma LiveCare updates
|
3 years ago |
haroon amjad
|
74b0acefd3
|
Updates & fixes
|
3 years ago |
haroon amjad
|
98abc5a069
|
updates
|
3 years ago |
Sultan khan
|
9683b3f42f
|
Dubai Reminder fixed.
|
3 years ago |
haroon amjad
|
6bdb7a3305
|
Updates & fixes
|
3 years ago |
haroon amjad
|
0e01835327
|
Target SDK & Compile SDK bumped to 33
|
3 years ago |
haroon amjad
|
e50a67ea12
|
Vida Plus changes
|
3 years ago |
haroon amjad
|
2e72d6a550
|
LiveCare contact added
|
3 years ago |
haroon amjad
|
aafdf3760d
|
added sick leave status text & color
|
3 years ago |
haroon amjad
|
25af2c23ef
|
Sick leave CR, LiveCare support call, Appo calendar changes
|
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
|
3709ebcb32
|
Updates
|
3 years ago |
haroon amjad
|
f6191d9bf7
|
updates & fixes
|
3 years ago |
haroon amjad
|
7ae4e7d616
|
updates & fixes
|
3 years ago |
haroon amjad
|
106334c9cf
|
updates & 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 |
Zohaib Iqbal Kambrani
|
8c29b5f8e6
|
WebRTC or Opentok
|
4 years ago |
haroon amjad
|
2ba744c3a6
|
Timezone fixes & Activate/Deactivate file changes
|
4 years ago |
haroon amjad
|
3896f02d13
|
Timezone Updates
|
4 years ago |
haroon amjad
|
ca43849d9d
|
CMC Updates
|
4 years ago |
haroon amjad
|
11529c65c5
|
updates
|
4 years ago |
haroon amjad
|
eb3f5b5cb5
|
Updates & fixes
|
4 years ago |
haroon amjad
|
3396b4253b
|
Updates & fixes
|
4 years ago |
haroon amjad
|
8b7a6e7689
|
ED Online Check-In
|
4 years ago |
haroon amjad
|
f9a733884d
|
Calendar fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
fb4fb8d29e
|
Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
Google analytics events update
Updates
Updates & fixes
DateTime Fixes
HHC Fixes
updates & fixes
Updates & fixes
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
|
4 years ago |
haroon amjad
|
1faf27959a
|
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 |
Zohaib Iqbal Kambrani
|
612d9eb019
|
Project Filter Applied on Packages & Offers
|
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 |
haroon amjad
|
d344169399
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
# lib/pages/BookAppointment/BookSuccess.dart
|
4 years ago |
haroon amjad
|
a918d409fb
|
updates & fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
99bdd25bd3
|
added more analytics logs
|
4 years ago |
Zohaib Iqbal Kambrani
|
9890d2caec
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
mobile number updates
video call setup with flutter 2.8, firebase modifications
|
4 years ago |
Zohaib Iqbal Kambrani
|
687bc543ab
|
OpenTok Video Call
|
4 years ago |
Sikander Saleem
|
7490d238e4
|
Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5
# Conflicts:
# lib/uitl/push-notification-handler.dart
|
4 years ago |
Sikander Saleem
|
67b87449a9
|
video call setup with flutter 2.8, firebase modifications
|
4 years ago |
haroon amjad
|
8c96de866b
|
updates
|
4 years ago |
haroon amjad
|
32edb2e71e
|
updates
|
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
|
a26b17f52d
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
Translation fixes
OBGyne updates
updates
OB Gyne appo updates
no message
updates & fixes
no message
no message
Ancillary Orders completed
updates & fixes
# Conflicts: Resolved
# lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
a8e1ba6b86
|
no message
|
4 years ago |
haroon amjad
|
ac5077e9e7
|
Translation fixes
|
4 years ago |
haroon amjad
|
736edad018
|
OB Gyne appo updates
|
4 years ago |
haroon amjad
|
4b4ac4819f
|
no message
|
4 years ago |
haroon amjad
|
efced34ffa
|
Updates
|
4 years ago |
haroon amjad
|
19dadd2b35
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
4 years ago |
Zohaib Iqbal
|
259e27d4a7
|
Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/uitl/app_shared_preferences.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
ab8b62bc3a
|
Packages and offers fixes, HMG Internet work in progress,
|
4 years ago |
haroon amjad
|
7f5f3ababe
|
Registration fix
|
4 years ago |
haroon amjad
|
0acc134e6e
|
Updates & fixes
|
4 years ago |
haroon amjad
|
eb6b0aefc0
|
Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2
See merge request Cloud_Solution/diplomatic-quarter!580
|
4 years ago |
haroon amjad
|
693f8cb090
|
Updates & fixes
|
4 years ago |