Commit Graph

138 Commits (85c8f5466f9ffdfa4b3f2a32a8bc1107cb205685)

Author SHA1 Message Date
haroon amjad f265c605ca Merge branch 'merge-update-with-lab-changes' into update-to-3.32-sdk
# Conflicts:
#	android/app/local.properties
#	android/app/src/main/AndroidManifest.xml
#	android/gradle.properties
#	android/gradle/wrapper/gradle-wrapper.properties
#	ios/Podfile
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
#	ios/Runner/Info.plist
#	ios/Runner/Runner.entitlements
#	lib/config/localized_values.dart
#	lib/core/model/labs/LabOrderResult.dart
#	lib/core/model/labs/lab_result.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/new_ui/exception_widget/ExceptionBottomSheet.dart
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/forgot-password.dart
#	lib/pages/login/register_new.dart
#	lib/pages/login/saved_login.dart
#	lib/pages/login/welcome.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/uitl/app_toast.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/Loader/gif_loader_container.dart
#	lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
#	lib/widgets/data_display/medical/LabResult/Lab_Result_details_wideget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/pickupLocation/PickupLocationFromMap.dart
#	pubspec.yaml
10 months ago
Aamir Muhammad a7f53d3b3c updated app to latest flutter sdk. 10 months ago
Aamir Muhammad 5fb40a7c5f updated app to latest flutter sdk. 11 months ago
Syed Taha Alam 57415bd670 Merge remote-tracking branch 'origin/dev_v3.13.6_deep_link' into dev_v3.13.6_deep_link 1 year ago
Syed Taha Alam 390455e5a2 deeplink done 1 year ago
taha.alam 68eab7639c Merge dev_3.13.6 to deep_link 1 year ago
taha.alam e876eaaa33 Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_deep_link
# Conflicts:
#	pubspec.yaml
1 year ago
haroon amjad 0706d9f5f9 App update sent to Stores VersionID 17.7 1 year ago
taha.alam 6cf86e2e84 WIP: deeplink added to android and ios 1 year ago
haroon amjad 880611f7bb Insurance card details button removed, Autofill for WhatsApp for android implemented, Updated to stores VersionID 17.3 1 year ago
haroon amjad e9accb00ef updates 1 year ago
haroon amjad b677be9e3c Updates & fixes 1 year ago
haroon amjad d9b4b1575d Merge branch 'dev_3.13.6_merge_ER_Online_CheckIn' into dev_v3.13.6 2 years ago
haroon amjad 6386da8936 Mapbox key updated to custom maps 2 years ago
haroon amjad 18b4fc5317 Patient app update 2 years ago
haroon amjad fd70387b2d Merge branch 'dev_v3.13.6' into dev_v3.13.6_PenguinIn
# Conflicts:
#	pubspec.yaml
2 years ago
haroon amjad 03e5604f68 updates 2 years ago
Aamir.Muhammad 5883b06fcb Updated to 3.24 Flutter & Penguin Fixed. 2 years 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
2 years ago
Haroon Amjad 1c66351011 Updates & fixes 2 years ago
Haroon Amjad 60a35032e5 Merge branch 'dev_v3.13.6_PenguinIn' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6_PenguinIn 2 years ago
Aamir.Muhammad 7065b00c5c Penguin Map Integration & Permissions Fixes. 2 years ago
Haroon Amjad 72d459ce10 PenguinIn updates 2 years ago
Aamir.Muhammad 29830f4f55 Merge remote-tracking branch 'origin/dev_v3.13.6_PenguinIn' into dev_v3.13.6_PenguinIn
# Conflicts:
#	ios/Runner/Helper/HMGPenguinInPlatformBridge.swift
#	ios/Runner/Penguin/PenguinView.swift
2 years ago
Aamir.Muhammad cba8369a51 Penguin Map Integration & Permissions Fixes. 2 years ago
Haroon Amjad 029f174a6c Penguin scenarios implemented 2 years ago
haroon amjad d3d8d1f121 Update to stores 16.0 2 years ago
haroon amjad b1432280a1 updates 2 years ago
haroon amjad 53015422e5 PenguinIn integration with HMG App 2 years ago
haroon amjad 8edf65daf1 Updates & Fixes 2 years ago
haroon amjad 6c9ab32d98 Native changes 2 years ago
Sultan khan 90dc8e5e05 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/models/LiveCare/ApplePayInsertRequest.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/gif_loader_dialog_utils.dart
#	lib/uitl/location_util.dart
#	pubspec.yaml
2 years ago
haroon amjad bea15150aa Merge branch 'development_v3.3' into dev_3.3_faiz_payfort 2 years ago
haroon amjad 27b6e04d33 updates 2 years ago
haroon amjad 3401496739 Updates & fixes 2 years ago
haroon amjad 52b3c196d6 updates 3 years ago
haroon amjad 2008ccf92c updates 3 years ago
devamirsaleemahmad 1ddac14efb Calender Permission Fix Ios 17+ 3 years ago
Sultan khan 8c46d2577d updated with assets 3 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
3 years ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 3 years ago
devamirsaleemahmad 720c0ac6e9 changes & Deletion 3 years ago
haroon amjad f0a4bd6925 Commented the CRs code 3 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
3 years ago
haroon amjad b2f390c19d CR 6204 implemented 3 years ago
haroon amjad 555898c822 updates 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 62b9b3e35c calendar permission handled in iOS 3 years ago
haroon amjad bc8a979438 Upload to stores 3 years ago