Commit Graph

106 Commits (b3fa4c9bdf7ce0a5121bbe374869d09c63db434d)

Author SHA1 Message Date
Sultan khan 0d4563542a WD:map issues resolved:
1. map type added to the screen along with the translation
2. null shown for the arabic name of the fixed to show the actual name.
3. if the user opens the locationBottomsheet and close it without input of the area the screen freezes with no action on the location.
4. Gms And Hms Maps handled.
5. theme handled inside the maps screen.
1 day ago
haroon amjad 3d39190c62 updates & fixes 3 days ago
haroon amjad 3703afe8bd updates 4 days ago
haroon amjad f9f2e22376 updates 5 days ago
haroon amjad 78a6d55b35 Merge branch 'master' into watch_integration
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
1 week ago
haroon amjad 4a3d66f01a Updates 1 week ago
haroon amjad 0ed6103b15 updates 1 week ago
haroon amjad d053f58b7d Updates 2 weeks ago
haroon amjad d703c382e5 Updates 2 weeks ago
Haroon Amjad 55b8bc162c Updates 3 weeks ago
tahaalam f84d5c6769 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	lib/splashPage.dart
3 weeks ago
Sultan khan 4f303d8496 other country login done. 4 weeks ago
tahaalam 151fcf23d1 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	android/app/build.gradle.kts
#	android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xxxhdpi/ic_launcher.png
#	android/build/reports/problems/problems-report.html
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	pubspec.yaml
4 weeks ago
haroon amjad f46b3f745f Dark mode enabled 1 month ago
tahaalam 3f9046f1e4 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/core/api_consts.dart
#	lib/generated/locale_keys.g.dart
2 months ago
tahaalam bfeb3dce4e data integration along with the data representation 2 months ago
haroon amjad dc0e4e5eb6 Updates & fixes, Filter issues fixed for lab & rad 2 months ago
haroon amjad 4b710523e8 Feedback status implemented 2 months ago
haroon amjad 01c21377aa Updates & fixes 2 months ago
haroon amjad 68f5e64557 updates 2 months ago
Haroon Amjad 23abbebf9e arabic fixes 2 months ago
Haroon Amjad a4573c8710 arabic fixes 2 months ago
Haroon Amjad 4ce1e912ce Vital sign data connected to Symptom checker 2 months ago
haroon amjad 70a6d90ce3 updates & fixes 2 months ago
Sikander Saleem 77a04e637e UI/UX improvements. 3 months ago
haroon amjad ede8844f19 Monthly Reports implemented 3 months ago
faizatflutter d4dd475e0b Added Graph 3 months ago
faizatflutter 333046951c Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/routes/app_routes.dart
3 months ago
aamir-csol 135b05e561 Health calculators & converters 3 months ago
faizatflutter fd2abbbc7b Water Intake Design completed 4 months ago
faizatflutter 34f4cd4f91 Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
4 months ago
aamir-csol f91f8e63d7 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/medical_file/widgets/lab_rad_card.dart
4 months ago
aamir-csol d256eec392 medical file changes 4 months ago
faizatflutter e35fe9ac05 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
4 months ago
haroon amjad 36bf63dcde Incoming call updates 4 months ago
faizatflutter 757ace2ba1 Added Organ Selector 4 months ago
haroon amjad 07a3052b8e appointment prescription implemented 5 months ago
faizatflutter 91e3e9387e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/emergency_services/emergency_services_view_model.dart
5 months ago
faizatflutter fe00447483 HHC in Progress 5 months ago
tahaalam f3676f5596 ui issues resolve for ambulance and rrt request 5 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 5 months ago
Haroon6138 622851a1a0 Merge pull request 'Design Fixes for Responsiveness (faiz_dev)' (#88) from faiz_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/88
6 months ago
faizatflutter 8c956fc052 Design changes 6 months ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
6 months ago
tahaalam 90128a812b call ambulance module design added. 6 months ago
faizatflutter eabfaf8182 Design Updates 6 months ago
haroon amjad fe5b6c35ac insurance approval implementation done 6 months ago
aamir-csol 9e8011c34c family screen & widgets 7 months ago
Haroon6138 938d95cb06 Merge pull request 'feature/search_by_region' (#55) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/55
7 months ago
taha.alam 27a0632d6d directional padding and alignment 7 months ago