Commit Graph

1324 Commits (981089632f7d219a402f401e8e10621de406d202)

Author SHA1 Message Date
taha.alam 636a67b720 WD: lab result changes of IRR. 9 months ago
haroon amjad 1080a59106 Lab report download enabled 9 months ago
haroon amjad f74a3301da SAR new symbol integrated 9 months ago
taha.alam 9047ebf723 Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_CR_7211_Lab_report_changes
# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
#	android/build.gradle
#	android/gradle.properties
#	android/settings.gradle
#	lib/config/localized_values.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/data_display/medical/LabResult/Lab_Result_details_wideget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	pubspec.yaml
9 months ago
Haroon Amjad 04413aa7d6 lab report updates 9 months ago
taha.alam 2a37777b9a Merge branch 'dev_v3.13.6_search_hospital_by_region' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region 10 months ago
taha.alam c2f38f1b7f Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region
# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/MainActivity.kt
#	android/app/src/main/res/values/strings.xml
10 months ago
sultan khan 2ab0d0b682 WD:get current location place change and live care ui changes 10 months ago
taha.alam 4c4ae6caef WD: Translation of words added and download button added 10 months ago
haroon amjad 780f645cbe Updates & fixes, CR 6038 Ask Dr changes implemented 10 months ago
taha.alam 3d27fbdea8 WD: lab report changes 10 months ago
haroon amjad 880611f7bb Insurance card details button removed, Autofill for WhatsApp for android implemented, Updated to stores VersionID 17.3 10 months ago
haroon amjad b677be9e3c Updates & fixes 11 months ago
taha.alam c6787ff966 WD: doctor list by region and sorting by name and distance 11 months ago
taha.alam cd460ee31b WIP: doctor list by region 11 months ago
haroon amjad 229efb2e25 Medical report In-App view & share enabled & update sent to stores VersionID 17.2 11 months ago
haroon amjad 32cf61d1bf Download & Share options added for Ready Medical Report. 11 months ago
haroon amjad b5eaedb721 Update to stores VersionID 17.1, CR 5047 & CR 7241. 11 months ago
haroon amjad 3f22d69058 Merge branch 'dev_v3.13.6' into dev_3.13.6_CR5047_LiveCare_Enhancements
# Conflicts:
#	lib/config/config.dart
#	lib/main.dart
#	lib/splashPage.dart
#	lib/uitl/CalendarUtils.dart
#	lib/uitl/translations_delegate_base.dart
11 months ago
haroon amjad 0e73d6d23e updates 11 months ago
haroon amjad 65d7f3f9b9 Font family fixes 11 months ago
haroon amjad d474eb9a24 Code commented for Lab result widget, ER Online CheckIn QR & location check-in & Patient occupation selection to publish laser clinic changes to store - VersionID 17.0 11 months ago
haroon amjad 9909cfaa57 QRCode & Location checkin implemented in ER Online Check-In 11 months ago
haroon amjad baa7790b89 Patient occupation selection implemented 12 months ago
haroon amjad cfcba179c4 CR 7241 Lab result enhancement code merged 12 months ago
haroon amjad b80e171d25 Merge branch 'dev_3.3_LabReportEnhancementCR' into dev_3.13.6_Development
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/model/labs/patient_lab_orders.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/charts/show_chart.dart
#	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	lib/widgets/my_rich_text.dart
12 months ago
haroon amjad cd7da0dd70 Penguin SDK changes & crashlytics 12 months ago
haroon amjad 20bfdc3652 Project Name Top & Bottom changes implemented 1 year ago
haroon amjad 091f3b0830 CRs 5656, 5801 & 6265 (InPatient CRs & ER Online Check-In) update to stores with versionID 16.8 1 year ago
haroon amjad 8e46738982 bug fixes 1 year ago
haroon amjad f58e07d789 Merge branch 'dev_v3.13.6' into dev_3.13.6_CR5047_LiveCare_Enhancements
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/conference/zoom/call_screen.dart
#	lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad 71542e9db6 Inpatient module code merged & code fixes 1 year ago
haroon amjad 6a555ace41 ER Online CheckIn & InPatient CR implemented 1 year ago
haroon amjad 42dbe066fd Merge branch 'dev_3.3_ER_Online_CheckIn' into dev_3.13.6_merge_ER_Online_CheckIn
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
#	lib/pages/landing/widgets/services_view.dart
#	lib/services/payfort_services/payfort_service.dart
#	lib/services/payfort_services/payfort_view_model.dart
#	lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad 18b4fc5317 Patient app update 1 year ago
haroon amjad 3d44aa2e64 Sickleave updates 1 year ago
haroon amjad 605f02afe2 Sickleave CR updates & changes 1 year ago
haroon amjad 073cb9f7e8 Update to stores 16.5:
1. Indoor navigation
2. Walkin Appointment
3. Derma Package
4. NPHIES Eligibility
1 year ago
haroon amjad 7ddd932c51 no message 1 year ago
haroon amjad a6ee6869cc Merge commit '81b94814ce4f0a1e4626fe07a9b7933246d71336' into dev_v3.13.6 1 year ago
Haroon Amjad 69493934b1 Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/QRCode.dart
1 year ago
Haroon Amjad 057994dfd2 Merge branch 'dev_3.13.6_CR6750' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/uitl/translations_delegate_base.dart
1 year ago
taha.alam 936682ff95 WD: clinic by hospital 1 year ago
haroon amjad 8862cc6c06 Release issues resolved 1 year ago
haroon amjad fd70387b2d Merge branch 'dev_v3.13.6' into dev_v3.13.6_PenguinIn
# Conflicts:
#	pubspec.yaml
1 year ago
taha.alam 633059b0be WD: Location dialog is added. 1 year ago
haroon amjad b64cf0bf6c SFCalendar issue fixed & update to stores 16.4 1 year ago
haroon amjad db91921de1 update to stores version 16.3 1 year ago
Aamir.Muhammad e045c375d2 Merge branch 'refs/heads/dev_v3.13.6' into dev_v3.13.6_PenguinIn_3.22-IOS
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad f42223292a Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
#	lib/config/config.dart
1 year ago
haroon amjad 536c95c825 Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/drawer/app_drawer_widget.dart
1 year ago
haroon amjad b6ba9fff2f Updates n fixes 1 year ago
haroon amjad 6f0cfebc89 Translation updates as requested by QA 1 year ago
haroon amjad b6adfb2534 ER Online Check-In CR implemented 1 year ago
haroon amjad 2d82b97680 updates 1 year ago
Haroon Amjad 029f174a6c Penguin scenarios implemented 1 year ago
haroon amjad 393ea45d2c updates 1 year ago
haroon amjad 98389e3f68 LiveCare Call Type implemented 1 year ago
haroon amjad 9f629afb9c Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/app_shared_preferences.dart
1 year ago
haroon amjad d3d8d1f121 Update to stores 16.0 1 year ago
haroon amjad 50ba0372db language updates 1 year ago
haroon amjad 34778d91d7 language fixes 1 year ago
haroon amjad a39d2840e0 Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804 1 year ago
haroon amjad 66ec7b5ca4 Derma package appointment booking fixes 1 year ago
haroon amjad ed037edf22 Apple Pay fixes 1 year ago
haroon amjad 53015422e5 PenguinIn integration with HMG App 1 year ago
haroon amjad 0eaeb75207 Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750 1 year ago
haroon amjad ca8533190a Walkin appointment booking implementation contd 1 year ago
haroon amjad 31aa09e35b translation fix 1 year ago
haroon amjad d65325f998 Payment flow integration for Walk-In appointments 1 year ago
Sultan khan 554548bc9a CR updates 1 year ago
Sultan khan 9501c2ea9a derma CR 6804 CHANGES and language on initial load issue fix. 1 year ago
haroon amjad 984459d314 Walkin appointment implementation contd 1 year ago
haroon amjad b3f2904e9a Waiting appointment implementation contd. 1 year ago
haroon amjad 52e63fe5e4 Update to stores 15.9 1 year ago
haroon amjad d0e743dcc9 Family members issue fixed in android 1 year ago
haroon amjad 8edf65daf1 Updates & Fixes 1 year ago
haroon amjad c948a1780c Update to stores VersionID 15.8 1 year ago
haroon amjad 5b7b40c732 Updates & fixes 1 year ago
haroon amjad c97fd25cdd Zoom integration updates & other stability fixes 1 year ago
Aamir.Muhammad d9cf383648 Merge branch 'refs/heads/development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/reports/report_home_page.dart
1 year ago
haroon amjad f65fe26fd2 ER Online CheckIn implementation contd 2 years ago
haroon amjad 3a65113149 Update to stores 15.7 2 years ago
haroon amjad f5df1b1d01 ER Online CheckIn implementation Contd 2 years ago
Aamir.Muhammad 8441a0ef00 Merge remote-tracking branch 'origin/development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/pages/login/login.dart
#	lib/pages/medical/medical_profile_page_new.dart
#	lib/services/clinic_services/get_clinic_service.dart
#	lib/uitl/utils.dart
#	lib/widgets/dialogs/radio_selection_dialog.dart
2 years ago
haroon amjad 96d5c3ce1d My Instructions added 2 years ago
haroon amjad 6e30df2a29 WeCare service added 2 years ago
haroon amjad 4c0d758dd1 Zoom updates 2 years ago
Sultan khan d1b13d5ce9 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
haroon amjad a4a638aa37 updates 2 years ago
Sultan khan c9be715436 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/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
2 years ago
haroon amjad 69e64fd5fb Blood Donation CR merged into dev_3.3 2 years ago
haroon amjad f8e7ccf73f updates 2 years ago
Aamir Muhammad 52a5e978a7 changes local 2 years ago
Sultan khan 5e9d08b9aa Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
2 years ago
Sultan khan 08b4c8f86e Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/config/config.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/main.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/widgets/LiveCareHistoryCard.dart
#	lib/pages/medical/eye/ContactLensPage.dart
#	lib/pages/medical/medical_profile_page_new.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/gif_loader_dialog_utils.dart
#	lib/widgets/Loader/gif_loader_container.dart
#	lib/widgets/data_display/medical/time_line_new_widget.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
haroon amjad 968e59707e updates 2 years ago
haroon amjad d6dacfb743 Load more added in appointments timeline. 2 years ago
haroon amjad 5256d8873f ToDo & Appo Timeline changes 2 years ago
Sultan khan eee2ccf148 updates 2 years ago