haroon amjad
|
eef6f78fd6
|
Updates
|
2 years ago |
haroon amjad
|
8b468fe4b5
|
Updates & fixes
|
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 |
devamirsaleemahmad
|
6671dea8d8
|
Delete Event on Calender
|
2 years ago |
Sultan khan
|
f534ee6f58
|
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/reminder_dialog.dart
|
2 years ago |
Sultan khan
|
62dc3c162a
|
updated 3.13.6
|
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
|
1ecb8ebfe9
|
updated to stores version 11.3
|
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
|
cbc38940ea
|
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 |
devamirsaleemahmad
|
3f1ba19c64
|
changes & Null to Dynamic
|
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
|
55f1e4166e
|
updates
|
2 years ago |
Sultan khan
|
40656a65d8
|
update in progress
|
2 years ago |
devamirsaleemahmad
|
cb56750e6b
|
models updates -> 3.13.6
|
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
|
965df33253
|
Appointment actions fixes
|
3 years ago |
haroon amjad
|
657248803f
|
Ask doc disabled for LiveCare appointments
|
3 years ago |
haroon amjad
|
38648df897
|
Meal Plan development continued
|
3 years ago |
haroon amjad
|
dfc2889df7
|
dental reschedule fix
|
3 years ago |
haroon amjad
|
62b9b3e35c
|
calendar permission handled in iOS
|
3 years ago |
Sultan khan
|
9683b3f42f
|
Dubai Reminder fixed.
|
3 years ago |
Zohaib Iqbal Kambrani
|
35b129fb68
|
migrated project to latest flutter sdk
|
3 years ago |
haroon amjad
|
e03412214e
|
Ambulance request fixes
|
3 years ago |
haroon amjad
|
58a6dc6a6f
|
Tamara & Apple Pay Fixes + Other Updates
|
3 years ago |
Zohaib Iqbal Kambrani
|
8bd5a71318
|
Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
Timezone fixes & Activate/Deactivate file changes
Updates
Timezone Updates
CMC Updates
updates
Updates
Laser Male back image added
Updates & fixes
E-Cens sign off
Analtyics at registration and liveacare payment fail
analytics events update
Analytics
no message
Updates & fixes
ED Online Check-In
Calendar fixes
updates & fixes
Analytics statements align to bottom of block
Analytics for login registration
updates
# Conflicts: Fixed
# lib/analytics/flows/appointments.dart
|
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
|
eb3f5b5cb5
|
Updates & fixes
|
4 years ago |
haroon amjad
|
7018696328
|
E-Cens sign off
|
4 years ago |
haroon amjad
|
4cbccd8efb
|
analytics events update
|
4 years ago |
Zohaib Iqbal Kambrani
|
a01b8b82da
|
no message
|
4 years ago |
haroon amjad
|
3396b4253b
|
Updates & fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
1c6a62776c
|
Analytics statements align to bottom of block
|
4 years ago |
haroon amjad
|
1faf27959a
|
Updates
|
4 years ago |
haroon amjad
|
72e5d0a2be
|
Pharma LiveCare
|
4 years ago |
Zohaib Iqbal Kambrani
|
99bdd25bd3
|
added more analytics logs
|
4 years ago |
Zohaib Iqbal Kambrani
|
d974a7430c
|
Google Analytics as per e-Cense document
|
4 years ago |
Sikander Saleem
|
9ba7b3b44b
|
Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/medical/smart_watch_health_data/syncHealthData.dart
# lib/pages/vaccine/my_vaccines_screen.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# pubspec.yaml
|
4 years ago |
haroon amjad
|
9c0337aa01
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
2a92478d01
|
nfc plugin improvement.
|
4 years ago |
haroon amjad
|
f029aaa1c6
|
Fixes & code optimizations
|
4 years ago |
Mirza.Shafique
|
a273bacc17
|
design fixes 1.1
|
4 years ago |
haroon amjad
|
5f963b0327
|
Translation updates, CMC, HHC & RRT APIs updates
|
4 years ago |
haroon amjad
|
e564cdc7e5
|
Updates & fixes
|
4 years ago |
haroon amjad
|
40cbca565a
|
fixes
|
4 years ago |
haroon amjad
|
58c78656bf
|
Rating dialog updates
|
4 years ago |
haroon amjad
|
e62e3dae1b
|
CMC APIs coverting to RC
|
4 years ago |
Sikander Saleem
|
1346eab593
|
h2o today page, prescription & schedule appointment improvements.
|
4 years ago |
haroon amjad
|
230d87c473
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
|
4 years ago |
haroon amjad
|
01ca8b8f84
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
b4031e973e
|
chevron icon to arrow forward
|
4 years ago |
haroon amjad
|
2690bddcac
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
5163c826ad
|
Updates & fixes
|
4 years ago |
Sikander Saleem
|
df31c82fd5
|
doctor header review on tap improvement.
|
4 years ago |
haroon amjad
|
89e1aa70c0
|
updates
|
4 years ago |
Sultan Khan
|
5fe0214e04
|
bug fixes
|
4 years ago |
Sultan Khan
|
5b988dff4f
|
BUG FIXES
|
4 years ago |
haroon amjad
|
184942e891
|
Covid Payment fixes
|
4 years ago |
haroon amjad
|
19e6954bc8
|
updates
|
4 years ago |
haroon amjad
|
5c64ce4795
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/MyAppointments/SchedulePage.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sultan Khan
|
c54146b3ba
|
sechedule fix
|
4 years ago |
haroon amjad
|
a075d53dd5
|
UI updates & fixes
|
4 years ago |
haroon amjad
|
92bfe27a6e
|
updates & fixes
|
4 years ago |
haroon amjad
|
a2e25f7a7a
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Mirza.Shafique
|
999a45c711
|
App Expendable Design Change
|
4 years ago |
haroon amjad
|
eeb20073cb
|
Medicine prescriptions fixes from appointment details page
|
4 years ago |
haroon amjad
|
b1128be94f
|
Updates & fixes
|
4 years ago |
haroon amjad
|
7467da7409
|
Imports organized
|
4 years ago |
haroon amjad
|
aadcfdc7bc
|
Insurance Approval fixes
|
4 years ago |
Mirza.Shafique
|
3af1676730
|
Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
# lib/pages/insurance/insurance_card_screen.dart
# lib/pages/medical/balance/advance_payment_page.dart
# lib/pages/medical/balance/confirm_payment_page.dart
|
4 years ago |
Mirza.Shafique
|
a234618df8
|
Update, Insurance card and My Balance Design
|
4 years ago |
haroon amjad
|
ebcc2559ce
|
Ask doctor issue resolved, Translation & font family issues resolved
|
4 years ago |
haroon amjad
|
8e7786cb96
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
62ca009404
|
improvement.
|
4 years ago |
Sultan Khan
|
ad7527ee65
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
|
4 years ago |
Sultan Khan
|
233a273316
|
shcedule page
|
4 years ago |
Mirza.Shafique
|
590ea48ea9
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/book_reminder_page.dart
# lib/pages/MyAppointments/SchedulePage.dart
|
4 years ago |
Mirza.Shafique
|
e1e3741abf
|
Event Reminder
|
4 years ago |
Sultan Khan
|
abcd207554
|
schedule page fix
|
4 years ago |
haroon amjad
|
3abd7227ec
|
fixes
|
4 years ago |
haroon amjad
|
9cf9e297cf
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
# lib/pages/MyAppointments/AppointmentDetails.dart
|
4 years ago |
haroon amjad
|
4560037f97
|
updates
|
4 years ago |
Sikander Saleem
|
402cf5936a
|
improvement.
|
4 years ago |
Sikander Saleem
|
1a0e1f47a6
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/BookAppointment/components/DocAvailableAppointments.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sultan Khan
|
1726f8cc11
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
Mirza.Shafique
|
ebf293736d
|
Booking appointment Marge
|
4 years ago |
Sikander Saleem
|
cfa3ca62b6
|
prescription tab bar improvement.
|
4 years ago |
Sikander Saleem
|
9fdebc2db7
|
ask doctor ui redesigned
|
4 years ago |
Sikander Saleem
|
ca363adee2
|
merge & improvements
|
5 years ago |
Mohammad Aljammal
|
8b3a0b3ada
|
Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
|
5 years ago |
Sikander Saleem
|
d605084a91
|
appointment list and detail ui changed
|
5 years ago |
Sultan Khan
|
1a501a3b2a
|
calendar events changes
|
5 years ago |
Sultan Khan
|
4325bd3448
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Sultan Khan
|
5fe6a6c3dd
|
doctor schedule
|
5 years ago |