Commit Graph

1253 Commits (85c8f5466f9ffdfa4b3f2a32a8bc1107cb205685)

Author SHA1 Message Date
taha.alam 6596e38b09 Merge remote-tracking branch 'origin/update-to-3.32-sdk' into lab_result
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/widgets/data_display/medical/LabResult/full_screen_lab_result_graph.dart
10 months ago
taha.alam b6d310c65f WD: bottom date titles are added with custom height and maxX 10 months ago
haroon amjad a13c2e6c31 rebase update branch into lab_result 10 months ago
haroon amjad a6164c6c6b updates 10 months ago
haroon amjad afd7c5db81 updates 10 months ago
taha.alam 880db9315e Merge remote-tracking branch 'origin/update-to-3.32-sdk' into lab_result
# Conflicts:
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
10 months ago
taha.alam ab210552f0 lab items are added as cureved and side ranges changed 10 months ago
haroon amjad 6b70461e27 biometric icon & text update 10 months ago
taha.alam 9a23b7dd7c init state issue resolve 10 months ago
taha.alam a68da808da updating the percentage if the screen dimens are changed. 10 months ago
taha.alam e441d0d6ce WD: Lab result values adjusted for tablet and normal devices. 10 months ago
taha.alam 8e98976a65 lab result value updated 10 months ago
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
haroon amjad 34d298a81a lab results updates & fixes 10 months ago
haroon amjad 97c7b1c225 updates & fixes 10 months ago
haroon amjad 7b6395cc49 Merge branch 'dev_v3.13.6_CR_7211_Lab_report_changes' into merge-update-with-lab-changes
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
10 months ago
Aamir Muhammad 24a4020f5c fixes 10 months ago
Aamir Muhammad e64d1088a6 changes 10 months ago
haroon amjad a565a1da1b updates & fixes 10 months ago
Sultan khan aac6eaa58a design 10 months ago
Sultan khan b606708c30 design 10 months ago
Aamir Muhammad 3c7c738b12 changes 10 months ago
Aamir Muhammad a7e310226e Exception Widget & Fixes 10 months ago
haroon amjad 68410d908b updates & fixes for Huawei 10 months ago
Aamir Muhammad ee4ae657b0 fixes 10 months ago
Aamir Muhammad b60bfde04f saved login fixes & design changes. 10 months ago
Aamir Muhammad e306bfd69b saved login fixes & design changes. 10 months ago
Aamir Muhammad 23fc89b40a font changes 10 months ago
Aamir Muhammad 6b96b6fc9e ui fixes 10 months ago
Aamir Muhammad f2059aa00e otp Design. 10 months ago
Aamir Muhammad 2dd823667c register Design. 10 months ago
Sultan khan 007f17369b savedlogin 10 months ago
Sultan khan 5b45855cf6 saved login created 10 months ago
Sultan khan 1d98dbc67b quick login enable 10 months ago
Aamir Muhammad 16b37b847d translation & register Design changes. 10 months ago
Aamir Muhammad 801a2578ab lottie & bottom sheet 10 months ago
Aamir Muhammad 5fd4aee7ea consumer on welcome & language & font 10 months ago
Aamir Muhammad dbfa3c7cee consumer on welcome & language & font 10 months ago
Aamir Muhammad 1282b5a415 consumer on welcome & language & font 10 months ago
Aamir Muhammad 6578baaf34 login using sms done 10 months ago
Aamir Muhammad 7ff7f88e24 updated app to latest flutter sdk with android native changes. 10 months ago
Aamir Muhammad 9b441a14eb updated app to latest flutter sdk with android native changes. 10 months ago
Aamir Muhammad a7f53d3b3c updated app to latest flutter sdk. 10 months ago
Syed Taha Alam 656d8dd6b4 Wd: Full portrait graph added. 10 months ago
haroon amjad e748712954 Initial Commit 10 months ago
Syed Taha Alam c09170b506 Wd: Lab result graph completed. 10 months ago
Aamir Muhammad 2346195844 fixes 10 months ago
Aamir Muhammad c666ba219c changes 10 months ago
haroon amjad 4b5a3af4cd updates & fixes 10 months ago
Sultan khan aa8852f7a0 design 10 months ago