Commit Graph

638 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
5 months ago
taha.alam b6d310c65f WD: bottom date titles are added with custom height and maxX 5 months ago
haroon amjad afd7c5db81 updates 5 months ago
taha.alam ab210552f0 lab items are added as cureved and side ranges changed 5 months ago
taha.alam a68da808da updating the percentage if the screen dimens are changed. 5 months ago
taha.alam e441d0d6ce WD: Lab result values adjusted for tablet and normal devices. 5 months ago
taha.alam 8e98976a65 lab result value updated 5 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
5 months ago
haroon amjad 34d298a81a lab results updates & fixes 5 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
5 months ago
haroon amjad e84454664b updates & fixes 5 months ago
Aamir Muhammad f04928c3e8 fixes for login & register (Points) 5 months ago
Aamir Muhammad 1282b5a415 consumer on welcome & language & font 5 months ago
Syed Taha Alam 656d8dd6b4 Wd: Full portrait graph added. 5 months ago
haroon amjad e748712954 Initial Commit 5 months ago
Syed Taha Alam c09170b506 Wd: Lab result graph completed. 5 months ago
Syed Taha Alam 5461d78a1b Wd: graph added with the threshold 5 months ago
Aamir Muhammad c49dbbb436 Merge branch 'master' into update-to-3.32-sdk
# Conflicts:
#	lib/pages/livecare/incoming_call.dart
#	pubspec.yaml
6 months ago
haroon amjad 18b56d6496 updates & fixes 6 months ago
Aamir Muhammad bdaef7f89c fixes for login & register (Points) 6 months ago
Aamir Muhammad c0fad68e74 consumer on welcome & language & font 6 months ago
Aamir Muhammad 8f8769d99a updated app to latest flutter sdk with android native changes. 7 months ago
Aamir Muhammad 5fb40a7c5f updated app to latest flutter sdk. 7 months ago
haroon amjad 9eb0947d12 Initial Commit 7 months ago
haroon amjad dbfe9663a5 Merge branch 'dev_v3.13.6' into dev_v3.13.6_CR_7211_Lab_report_changes
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	pubspec.yaml
8 months ago
haroon amjad 1ee86d0813 PDF report implemented for Lab, Rad, Prescription, SickLeave & Medical Report. 8 months ago
taha.alam fa1bb291b9 WD: issues fixed of description not showing 11 months ago
taha.alam eba3ab2cf8 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:
#	lib/config/config.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	lib/widgets/new_design/doctor_header.dart
11 months ago
taha.alam eafb7f5f7b WD: lab report changes along with the cross added to the FlowChartPage.dart 11 months ago
taha.alam 636a67b720 WD: lab result changes of IRR. 11 months ago
haroon amjad 1080a59106 Lab report download enabled 11 months ago
Haroon Amjad 2c5be020e9 LanguageID added in Lab Report Email API 11 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
11 months ago
taha.alam 3d27fbdea8 WD: lab report changes 12 months ago
haroon amjad c58cbae99c InPatient prescription send email issue fixed 1 year ago
haroon amjad 71542e9db6 Inpatient module code merged & code fixes 1 year ago
haroon amjad 18b4fc5317 Patient app update 1 year ago
haroon amjad 3d44aa2e64 Sickleave updates 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 cee903dd6b changes for the hospital gesture clicked area and nearest check not showing the hospital dropdown area 1 year ago
haroon amjad 7ddd932c51 no message 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
haroon amjad 8cc1e08421 icons for indoor navigation updated 1 year ago
haroon amjad 8862cc6c06 Release issues resolved 1 year ago
haroon amjad 1e98539537 Code merged for PenguinIn Indoor navigation into main branch 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 34778d91d7 language fixes 1 year ago
haroon amjad ca8533190a Walkin appointment booking implementation contd 1 year ago
haroon amjad b3f2904e9a Waiting appointment implementation contd. 1 year 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