diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 79bc3dc4..1a3d4cfe 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
+
diff --git a/assets/images/new-design/video.png b/assets/images/new-design/video.png
new file mode 100644
index 00000000..2962aade
Binary files /dev/null and b/assets/images/new-design/video.png differ
diff --git a/assets/images/new-design/view_more.png b/assets/images/new-design/view_more.png
new file mode 100644
index 00000000..8b52a7e7
Binary files /dev/null and b/assets/images/new-design/view_more.png differ
diff --git a/assets/images/new-design/walkin.png b/assets/images/new-design/walkin.png
new file mode 100644
index 00000000..248c8788
Binary files /dev/null and b/assets/images/new-design/walkin.png differ
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index e16b62e0..1df50aa4 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,455 +1,25 @@
PODS:
- - android_intent (0.0.1):
- - Flutter
- - barcode_scan_fix (0.0.1):
- - Flutter
- - MTBBarcodeScanner
- - connectivity (0.0.1):
- - Flutter
- - Reachability
- - connectivity_for_web (0.1.0):
- - Flutter
- - connectivity_macos (0.0.1):
- - Flutter
- - device_calendar (0.0.1):
- - Flutter
- - device_info (0.0.1):
- - Flutter
- - Firebase/CoreOnly (6.33.0):
- - FirebaseCore (= 6.10.3)
- - Firebase/Messaging (6.33.0):
- - Firebase/CoreOnly
- - FirebaseMessaging (~> 4.7.0)
- - firebase_core (0.5.2):
- - Firebase/CoreOnly (~> 6.33.0)
- - Flutter
- - firebase_core_web (0.1.0):
- - Flutter
- - firebase_messaging (7.0.3):
- - Firebase/CoreOnly (~> 6.33.0)
- - Firebase/Messaging (~> 6.33.0)
- - firebase_core
- - Flutter
- - FirebaseCore (6.10.3):
- - FirebaseCoreDiagnostics (~> 1.6)
- - GoogleUtilities/Environment (~> 6.7)
- - GoogleUtilities/Logger (~> 6.7)
- - FirebaseCoreDiagnostics (1.7.0):
- - GoogleDataTransport (~> 7.4)
- - GoogleUtilities/Environment (~> 6.7)
- - GoogleUtilities/Logger (~> 6.7)
- - nanopb (~> 1.30906.0)
- - FirebaseInstallations (1.7.0):
- - FirebaseCore (~> 6.10)
- - GoogleUtilities/Environment (~> 6.7)
- - GoogleUtilities/UserDefaults (~> 6.7)
- - PromisesObjC (~> 1.2)
- - FirebaseInstanceID (4.8.0):
- - FirebaseCore (~> 6.10)
- - FirebaseInstallations (~> 1.6)
- - GoogleUtilities/Environment (~> 6.7)
- - GoogleUtilities/UserDefaults (~> 6.7)
- - FirebaseMessaging (4.7.1):
- - FirebaseCore (~> 6.10)
- - FirebaseInstanceID (~> 4.7)
- - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
- - GoogleUtilities/Environment (~> 6.7)
- - GoogleUtilities/Reachability (~> 6.7)
- - GoogleUtilities/UserDefaults (~> 6.7)
- - Protobuf (>= 3.9.2, ~> 3.9)
- Flutter (1.0.0)
- - flutter_email_sender (0.0.1):
- - Flutter
- - flutter_flexible_toast (0.0.1):
- - Flutter
- - flutter_inappwebview (0.0.1):
- - Flutter
- - flutter_local_notifications (0.0.1):
- - Flutter
- - flutter_plugin_android_lifecycle (0.0.1):
- - Flutter
- - flutter_tts (0.0.1):
- - Flutter
- - "geolocator (6.0.0+4)":
- - Flutter
- - google_maps_flutter (0.0.1):
- - Flutter
- - GoogleMaps (< 3.10)
- - GoogleDataTransport (7.5.1):
- - nanopb (~> 1.30906.0)
- - GoogleMaps (3.9.0):
- - GoogleMaps/Maps (= 3.9.0)
- - GoogleMaps/Base (3.9.0)
- - GoogleMaps/Maps (3.9.0):
- - GoogleMaps/Base
- - GoogleUtilities/AppDelegateSwizzler (6.7.2):
- - GoogleUtilities/Environment
- - GoogleUtilities/Logger
- - GoogleUtilities/Network
- - GoogleUtilities/Environment (6.7.2):
- - PromisesObjC (~> 1.2)
- - GoogleUtilities/Logger (6.7.2):
- - GoogleUtilities/Environment
- - GoogleUtilities/Network (6.7.2):
- - GoogleUtilities/Logger
- - "GoogleUtilities/NSData+zlib"
- - GoogleUtilities/Reachability
- - "GoogleUtilities/NSData+zlib (6.7.2)"
- - GoogleUtilities/Reachability (6.7.2):
- - GoogleUtilities/Logger
- - GoogleUtilities/UserDefaults (6.7.2):
- - GoogleUtilities/Logger
- - hexcolor (0.0.1):
- - Flutter
- - image_cropper (0.0.3):
- - Flutter
- - TOCropViewController (~> 2.5.4)
- - image_picker (0.0.1):
- - Flutter
- - just_audio (0.0.1):
- - Flutter
- - local_auth (0.0.1):
- - Flutter
- - manage_calendar_events (0.0.1):
- - Flutter
- - map_launcher (0.0.1):
- - Flutter
- - maps_launcher (0.0.1):
- - Flutter
- - MTBBarcodeScanner (5.0.11)
- - nanopb (1.30906.0):
- - nanopb/decode (= 1.30906.0)
- - nanopb/encode (= 1.30906.0)
- - nanopb/decode (1.30906.0)
- - nanopb/encode (1.30906.0)
- - native_device_orientation (0.0.1):
- - Flutter
- - native_progress_hud (0.0.1):
- - Flutter
- NVActivityIndicatorView (5.1.1):
- NVActivityIndicatorView/Base (= 5.1.1)
- NVActivityIndicatorView/Base (5.1.1)
- - path_provider (0.0.1):
- - Flutter
- - path_provider_linux (0.0.1):
- - Flutter
- - path_provider_macos (0.0.1):
- - Flutter
- - path_provider_windows (0.0.1):
- - Flutter
- - "permission_handler (5.0.1+1)":
- - Flutter
- - PromisesObjC (1.2.11)
- - Protobuf (3.13.0)
- - Reachability (3.2)
- - screen (0.0.1):
- - Flutter
- - shared_preferences (0.0.1):
- - Flutter
- - shared_preferences_linux (0.0.1):
- - Flutter
- - shared_preferences_macos (0.0.1):
- - Flutter
- - shared_preferences_web (0.0.1):
- - Flutter
- - shared_preferences_windows (0.0.1):
- - Flutter
- - speech_to_text (0.0.1):
- - Flutter
- - Try
- - TOCropViewController (2.5.5)
- - Try (2.1.1)
- - "twilio_programmable_video (0.5.0+4)":
- - Flutter
- - TwilioVideo (~> 3.4)
- - TwilioVideo (3.8.0)
- - url_launcher (0.0.1):
- - Flutter
- - url_launcher_linux (0.0.1):
- - Flutter
- - url_launcher_macos (0.0.1):
- - Flutter
- - url_launcher_web (0.0.1):
- - Flutter
- - url_launcher_windows (0.0.1):
- - Flutter
- - vibration (1.7.3):
- - Flutter
- - vibration_web (1.6.2):
- - Flutter
- - video_player (0.0.1):
- - Flutter
- - video_player_web (0.0.1):
- - Flutter
- - wakelock (0.0.1):
- - Flutter
- - webview_flutter (0.0.1):
- - Flutter
- - wifi (0.0.1):
- - Flutter
DEPENDENCIES:
- - android_intent (from `.symlinks/plugins/android_intent/ios`)
- - barcode_scan_fix (from `.symlinks/plugins/barcode_scan_fix/ios`)
- - connectivity (from `.symlinks/plugins/connectivity/ios`)
- - connectivity_for_web (from `.symlinks/plugins/connectivity_for_web/ios`)
- - connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`)
- - device_calendar (from `.symlinks/plugins/device_calendar/ios`)
- - device_info (from `.symlinks/plugins/device_info/ios`)
- - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
- - firebase_core_web (from `.symlinks/plugins/firebase_core_web/ios`)
- - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
- Flutter (from `Flutter`)
- - flutter_email_sender (from `.symlinks/plugins/flutter_email_sender/ios`)
- - flutter_flexible_toast (from `.symlinks/plugins/flutter_flexible_toast/ios`)
- - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
- - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
- - flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`)
- - flutter_tts (from `.symlinks/plugins/flutter_tts/ios`)
- - geolocator (from `.symlinks/plugins/geolocator/ios`)
- - google_maps_flutter (from `.symlinks/plugins/google_maps_flutter/ios`)
- - hexcolor (from `.symlinks/plugins/hexcolor/ios`)
- - image_cropper (from `.symlinks/plugins/image_cropper/ios`)
- - image_picker (from `.symlinks/plugins/image_picker/ios`)
- - just_audio (from `.symlinks/plugins/just_audio/ios`)
- - local_auth (from `.symlinks/plugins/local_auth/ios`)
- - manage_calendar_events (from `.symlinks/plugins/manage_calendar_events/ios`)
- - map_launcher (from `.symlinks/plugins/map_launcher/ios`)
- - maps_launcher (from `.symlinks/plugins/maps_launcher/ios`)
- - native_device_orientation (from `.symlinks/plugins/native_device_orientation/ios`)
- - native_progress_hud (from `.symlinks/plugins/native_progress_hud/ios`)
- NVActivityIndicatorView
- - path_provider (from `.symlinks/plugins/path_provider/ios`)
- - path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`)
- - path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`)
- - path_provider_windows (from `.symlinks/plugins/path_provider_windows/ios`)
- - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
- - screen (from `.symlinks/plugins/screen/ios`)
- - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
- - shared_preferences_linux (from `.symlinks/plugins/shared_preferences_linux/ios`)
- - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)
- - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
- - shared_preferences_windows (from `.symlinks/plugins/shared_preferences_windows/ios`)
- - speech_to_text (from `.symlinks/plugins/speech_to_text/ios`)
- - twilio_programmable_video (from `.symlinks/plugins/twilio_programmable_video/ios`)
- - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
- - url_launcher_linux (from `.symlinks/plugins/url_launcher_linux/ios`)
- - url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`)
- - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`)
- - url_launcher_windows (from `.symlinks/plugins/url_launcher_windows/ios`)
- - vibration (from `.symlinks/plugins/vibration/ios`)
- - vibration_web (from `.symlinks/plugins/vibration_web/ios`)
- - video_player (from `.symlinks/plugins/video_player/ios`)
- - video_player_web (from `.symlinks/plugins/video_player_web/ios`)
- - wakelock (from `.symlinks/plugins/wakelock/ios`)
- - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
- - wifi (from `.symlinks/plugins/wifi/ios`)
SPEC REPOS:
trunk:
- - Firebase
- - FirebaseCore
- - FirebaseCoreDiagnostics
- - FirebaseInstallations
- - FirebaseInstanceID
- - FirebaseMessaging
- - GoogleDataTransport
- - GoogleMaps
- - GoogleUtilities
- - MTBBarcodeScanner
- - nanopb
- NVActivityIndicatorView
- - PromisesObjC
- - Protobuf
- - Reachability
- - TOCropViewController
- - Try
- - TwilioVideo
EXTERNAL SOURCES:
- android_intent:
- :path: ".symlinks/plugins/android_intent/ios"
- barcode_scan_fix:
- :path: ".symlinks/plugins/barcode_scan_fix/ios"
- connectivity:
- :path: ".symlinks/plugins/connectivity/ios"
- connectivity_for_web:
- :path: ".symlinks/plugins/connectivity_for_web/ios"
- connectivity_macos:
- :path: ".symlinks/plugins/connectivity_macos/ios"
- device_calendar:
- :path: ".symlinks/plugins/device_calendar/ios"
- device_info:
- :path: ".symlinks/plugins/device_info/ios"
- firebase_core:
- :path: ".symlinks/plugins/firebase_core/ios"
- firebase_core_web:
- :path: ".symlinks/plugins/firebase_core_web/ios"
- firebase_messaging:
- :path: ".symlinks/plugins/firebase_messaging/ios"
Flutter:
:path: Flutter
- flutter_email_sender:
- :path: ".symlinks/plugins/flutter_email_sender/ios"
- flutter_flexible_toast:
- :path: ".symlinks/plugins/flutter_flexible_toast/ios"
- flutter_inappwebview:
- :path: ".symlinks/plugins/flutter_inappwebview/ios"
- flutter_local_notifications:
- :path: ".symlinks/plugins/flutter_local_notifications/ios"
- flutter_plugin_android_lifecycle:
- :path: ".symlinks/plugins/flutter_plugin_android_lifecycle/ios"
- flutter_tts:
- :path: ".symlinks/plugins/flutter_tts/ios"
- geolocator:
- :path: ".symlinks/plugins/geolocator/ios"
- google_maps_flutter:
- :path: ".symlinks/plugins/google_maps_flutter/ios"
- hexcolor:
- :path: ".symlinks/plugins/hexcolor/ios"
- image_cropper:
- :path: ".symlinks/plugins/image_cropper/ios"
- image_picker:
- :path: ".symlinks/plugins/image_picker/ios"
- just_audio:
- :path: ".symlinks/plugins/just_audio/ios"
- local_auth:
- :path: ".symlinks/plugins/local_auth/ios"
- manage_calendar_events:
- :path: ".symlinks/plugins/manage_calendar_events/ios"
- map_launcher:
- :path: ".symlinks/plugins/map_launcher/ios"
- maps_launcher:
- :path: ".symlinks/plugins/maps_launcher/ios"
- native_device_orientation:
- :path: ".symlinks/plugins/native_device_orientation/ios"
- native_progress_hud:
- :path: ".symlinks/plugins/native_progress_hud/ios"
- path_provider:
- :path: ".symlinks/plugins/path_provider/ios"
- path_provider_linux:
- :path: ".symlinks/plugins/path_provider_linux/ios"
- path_provider_macos:
- :path: ".symlinks/plugins/path_provider_macos/ios"
- path_provider_windows:
- :path: ".symlinks/plugins/path_provider_windows/ios"
- permission_handler:
- :path: ".symlinks/plugins/permission_handler/ios"
- screen:
- :path: ".symlinks/plugins/screen/ios"
- shared_preferences:
- :path: ".symlinks/plugins/shared_preferences/ios"
- shared_preferences_linux:
- :path: ".symlinks/plugins/shared_preferences_linux/ios"
- shared_preferences_macos:
- :path: ".symlinks/plugins/shared_preferences_macos/ios"
- shared_preferences_web:
- :path: ".symlinks/plugins/shared_preferences_web/ios"
- shared_preferences_windows:
- :path: ".symlinks/plugins/shared_preferences_windows/ios"
- speech_to_text:
- :path: ".symlinks/plugins/speech_to_text/ios"
- twilio_programmable_video:
- :path: ".symlinks/plugins/twilio_programmable_video/ios"
- url_launcher:
- :path: ".symlinks/plugins/url_launcher/ios"
- url_launcher_linux:
- :path: ".symlinks/plugins/url_launcher_linux/ios"
- url_launcher_macos:
- :path: ".symlinks/plugins/url_launcher_macos/ios"
- url_launcher_web:
- :path: ".symlinks/plugins/url_launcher_web/ios"
- url_launcher_windows:
- :path: ".symlinks/plugins/url_launcher_windows/ios"
- vibration:
- :path: ".symlinks/plugins/vibration/ios"
- vibration_web:
- :path: ".symlinks/plugins/vibration_web/ios"
- video_player:
- :path: ".symlinks/plugins/video_player/ios"
- video_player_web:
- :path: ".symlinks/plugins/video_player_web/ios"
- wakelock:
- :path: ".symlinks/plugins/wakelock/ios"
- webview_flutter:
- :path: ".symlinks/plugins/webview_flutter/ios"
- wifi:
- :path: ".symlinks/plugins/wifi/ios"
SPEC CHECKSUMS:
- android_intent: 367df2f1277a74e4a90e14a8ab3df3112d087052
- barcode_scan_fix: 80dd65de55f27eec6591dd077c8b85f2b79e31f1
- connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
- connectivity_for_web: 2b8584556930d4bd490d82b836bcf45067ce345b
- connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191
- device_calendar: 23b28a5f1ab3bf77e34542fb1167e1b8b29a98f5
- device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
- Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
- firebase_core: 350ba329d1641211bc6183a3236893cafdacfea7
- firebase_core_web: d501d8b946b60c8af265428ce483b0fff5ad52d1
- firebase_messaging: 0aea2cd5885b65e19ede58ee3507f485c992cc75
- FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
- FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
- FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
- FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1
- FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
- flutter_email_sender: f787522d0e82f50e5766c1213dbffff22fdcf009
- flutter_flexible_toast: 0547e740cae0c33bb7c51bcd931233f4584e1143
- flutter_inappwebview: 69dfbac46157b336ffbec19ca6dfd4638c7bf189
- flutter_local_notifications: 9e4738ce2471c5af910d961a6b7eadcf57c50186
- flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35
- flutter_tts: 0f492aab6accf87059b72354fcb4ba934304771d
- geolocator: 1ae40084cc6c1586ce5ad12cfc3fd38c64d05f2f
- google_maps_flutter: c7f9c73576de1fbe152a227bfd6e6c4ae8088619
- GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
- GoogleMaps: 4b5346bddfe6911bb89155d43c903020170523ac
- GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
- hexcolor: fdfb9c4258ad96e949c2dbcdf790a62194b8aa89
- image_cropper: c8f9b4157933c7bb965a66d1c5e6c8fd408c6eb4
- image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09
- just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
- local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd
- manage_calendar_events: 0338d505ea26cdfd20cd883279bc28afa11eca34
- map_launcher: e325db1261d029ff33e08e03baccffe09593ffea
- maps_launcher: eae38ee13a9c3f210fa04e04bb4c073fa4c6ed92
- MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
- nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
- native_device_orientation: e24d00be281de72996640885d80e706142707660
- native_progress_hud: f95f5529742b36a3c7fdecfa88dc018319e39bf9
NVActivityIndicatorView: 1f6c5687f1171810aa27a3296814dc2d7dec3667
- path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
- path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4
- path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
- path_provider_windows: a2b81600c677ac1959367280991971cb9a1edb3b
- permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6
- PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f
- Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748
- Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
- screen: abd91ca7bf3426e1cc3646d27e9b2358d6bf07b0
- shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
- shared_preferences_linux: afefbfe8d921e207f01ede8b60373d9e3b566b78
- shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
- shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
- shared_preferences_windows: 36b76d6f54e76ead957e60b49e2f124b4cd3e6ae
- speech_to_text: b43a7d99aef037bd758ed8e45d79bbac035d2dfe
- TOCropViewController: da59f531f8ac8a94ef6d6c0fc34009350f9e8bfe
- Try: 5ef669ae832617b3cee58cb2c6f99fb767a4ff96
- twilio_programmable_video: 6a41593640f3d86af60b22541fd457b22deaae7f
- TwilioVideo: c13a51ceca375e91620eb7578d2573c90cf53b46
- url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
- url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0
- url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
- url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c
- url_launcher_windows: 683d7c283894db8d1914d3ab2223b20cc1ad95d5
- vibration: b5a33e764c3f609a975b9dca73dce20fdde627dc
- vibration_web: 0ba303d92469ba34d71c612a228b315908d7fcd9
- video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
- video_player_web: da8cadb8274ed4f8dbee8d7171b420dedd437ce7
- wakelock: 0d4a70faf8950410735e3f61fb15d517c8a6efc4
- webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
- wifi: d7d77c94109e36c4175d845f0a5964eadba71060
-PODFILE CHECKSUM: 5a17be3f8af73a757fa4439c77cf6ab2db29a6e7
+PODFILE CHECKSUM: d94bd40f28772938199c67fcced06ffe96096c14
-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index ade2e0aa..366647c0 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -219,8 +219,7 @@
97C146EC1CF9000F007C117D /* Resources */,
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
- 125A739F71A29FBAE7B4D5AC /* [CP] Embed Pods Frameworks */,
- CBB18A5CEEEB971DCFC36E00 /* [CP] Copy Pods Resources */,
+ EFDAD5E1235DCA1DB6187148 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
@@ -284,23 +283,6 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
- 125A739F71A29FBAE7B4D5AC /* [CP] Embed Pods Frameworks */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
- );
- name = "[CP] Embed Pods Frameworks";
- outputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
- showEnvVarsInLog = 0;
- };
299B8FE131E5BAE7FA7E2FC9 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -351,21 +333,21 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
};
- CBB18A5CEEEB971DCFC36E00 /* [CP] Copy Pods Resources */ = {
+ EFDAD5E1235DCA1DB6187148 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
- name = "[CP] Copy Pods Resources";
+ name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -496,7 +478,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
+ PRODUCT_BUNDLE_IDENTIFIER = com.hmg.smartphone;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
@@ -635,7 +617,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
+ PRODUCT_BUNDLE_IDENTIFIER = com.hmg.smartphone;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -668,7 +650,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
+ PRODUCT_BUNDLE_IDENTIFIER = com.hmg.smartphone;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
diff --git a/lib/config/config.dart b/lib/config/config.dart
index c351e988..a4f701de 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -36,40 +36,29 @@ const GET_PRIVILEGE = 'Services/Patients.svc/REST/Service_Privilege';
const WIFI_CREDENTIALS = "Services/Patients.svc/Hmg_SMS_Get_By_ProjectID_And_PatientID";
///Doctor
-const GET_MY_DOCTOR =
- 'Services/Doctors.svc/REST/GetPatientDoctorAppointmentResult';
+const GET_MY_DOCTOR = 'Services/Doctors.svc/REST/GetPatientDoctorAppointmentResult';
const GET_DOCTOR_PROFILE = 'Services/Doctors.svc/REST/GetDocProfiles';
-const GET_DOCTOR_RATING_NOTES =
- 'Services/Doctors.svc/REST/dr_GetNotesDoctorRating';
-const GET_DOCTOR_RATING_DETAILS =
- 'Services/Doctors.svc/REST/dr_GetDoctorRatingDetails';
+const GET_DOCTOR_RATING_NOTES = 'Services/Doctors.svc/REST/dr_GetNotesDoctorRating';
+const GET_DOCTOR_RATING_DETAILS = 'Services/Doctors.svc/REST/dr_GetDoctorRatingDetails';
const GET_DOCTOR_RATING = 'Services/Doctors.svc/REST/dr_GetAvgDoctorRating';
///Prescriptions
const PRESCRIPTIONS = 'Services/Patients.svc/REST/GetPrescriptionApptList';
-const GET_PRESCRIPTIONS_ALL_ORDERS =
- 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
-const GET_PRESCRIPTION_REPORT =
- 'Services/Patients.svc/REST/INP_GetPrescriptionReport';
-const SEND_PRESCRIPTION_EMAIL =
- 'Services/Notifications.svc/REST/SendPrescriptionEmail';
-const GET_PRESCRIPTION_REPORT_ENH =
- 'Services/Patients.svc/REST/GetPrescriptionReport_enh';
+const GET_PRESCRIPTIONS_ALL_ORDERS = 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
+const GET_PRESCRIPTION_REPORT = 'Services/Patients.svc/REST/INP_GetPrescriptionReport';
+const SEND_PRESCRIPTION_EMAIL = 'Services/Notifications.svc/REST/SendPrescriptionEmail';
+const GET_PRESCRIPTION_REPORT_ENH = 'Services/Patients.svc/REST/GetPrescriptionReport_enh';
///Lab Order
const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders';
const GET_Patient_LAB_SPECIAL_RESULT = 'Services/Patients.svc/REST/GetPatientLabSpecialResults';
-const SEND_LAB_RESULT_EMAIL =
- 'Services/Notifications.svc/REST/SendLabReportEmail';
-const GET_Patient_LAB_RESULT =
- 'Services/Patients.svc/REST/GetPatientLabResults';
-const GET_Patient_LAB_ORDERS_RESULT =
- 'Services/Patients.svc/REST/GetPatientLabOrdersResults';
+const SEND_LAB_RESULT_EMAIL = 'Services/Notifications.svc/REST/SendLabReportEmail';
+const GET_Patient_LAB_RESULT = 'Services/Patients.svc/REST/GetPatientLabResults';
+const GET_Patient_LAB_ORDERS_RESULT = 'Services/Patients.svc/REST/GetPatientLabOrdersResults';
///
const GET_PATIENT_ORDERS = 'Services/Patients.svc/REST/GetPatientRadOrders';
-const GET_PATIENT_LAB_ORDERS_BY_APPOINTMENT =
- 'Services/Patients.svc/REST/GetPatientLabResultsByAppointmentNo';
+const GET_PATIENT_LAB_ORDERS_BY_APPOINTMENT = 'Services/Patients.svc/REST/GetPatientLabResultsByAppointmentNo';
const GET_PATIENT_ORDERS_DETAILS = 'Services/Patients.svc/REST/Rad_UpdatePatientRadOrdersToRead';
const GET_RAD_IMAGE_URL = 'Services/Patients.svc/Rest/GetRadImageURL';
@@ -134,8 +123,7 @@ const GET_BLOOD_REQUEST = 'services/PatientVarification.svc/REST/BloodDonation_G
///Reports
const REPORTS = 'Services/Doctors.svc/REST/GetPatientMedicalReportStatusInfo';
const INSERT_REQUEST_FOR_MEDICAL_REPORT = 'Services/Doctors.svc/REST/InsertRequestForMedicalReport';
-const SEND_MEDICAL_REPORT_EMAIL =
- 'Services/Notifications.svc/REST/SendMedicalReportEmail';
+const SEND_MEDICAL_REPORT_EMAIL = 'Services/Notifications.svc/REST/SendMedicalReportEmail';
///Rate
const IS_LAST_APPOITMENT_RATED = 'Services/Doctors.svc/REST/IsLastAppoitmentRated';
@@ -231,6 +219,8 @@ const SEND_LIVECARE_INVOICE_EMAIL = 'Services/Notifications.svc/REST/SendInvoice
const GET_USER_TERMS = 'Services/Patients.svc/REST/GetUserTermsAndConditions';
const UPDATE_HEALTH_TERMS = 'services/Patients.svc/REST/UpdatePateintHealthSummaryReport';
+const GET_PATIENT_HEALTH_STATS = 'Services/Patients.svc/REST/Med_GetTransactionsSts';
+
//URL to get medicine and pharmacies list
const CHANNEL = 3;
const GENERAL_ID = 'Cs2020@2016\$2958';
@@ -252,10 +242,8 @@ const GET_PAtIENTS_INSURANCE = "Services/Patients.svc/REST/Get_PatientInsuranceD
const GET_PAtIENTS_INSURANCE_UPDATED = "Services/Patients.svc/REST/PatientER_GetPatientInsuranceCardUpdateHistory";
const INSURANCE_DETAILS = "Services/Patients.svc/REST/Get_InsuranceCheckList";
-const GET_PATIENT_INSURANCE_DETAILS =
- "Services/Patients.svc/REST/PatientER_GetPatientInsuranceDetails";
-const UPLOAD_INSURANCE_CARD =
- 'Services/Patients.svc/REST/PatientER_PatientInfoForInsuranceCardUpdate';
+const GET_PATIENT_INSURANCE_DETAILS = "Services/Patients.svc/REST/PatientER_GetPatientInsuranceDetails";
+const UPLOAD_INSURANCE_CARD = 'Services/Patients.svc/REST/PatientER_PatientInfoForInsuranceCardUpdate';
const GET_VACCINES = "Services/Patients.svc/REST/GetDoneVaccinesByPatientID";
const GET_VACCINES_EMAIL = "Services/Notifications.svc/REST/SendVaccinesEmail";
@@ -288,15 +276,25 @@ const GET_PATIENT_LAST_RECORD = 'Services/Patients.svc/REST/Med_GetPatientLastRe
const GET_DIABETIC_RESULT_AVERAGE = 'Services/Patients.svc/REST/Patient_GetDiabeticResultAverage';
const GET_DIABTEC_RESULT = 'Services/Patients.svc/REST/Patient_GetDiabtecResults';
const ADD_DIABTEC_RESULT = 'Services/Patients.svc/REST/Patient_AddDiabtecResult';
+const SEND_AVERAGE_BLOOD_SUGAR_REPORT = 'Services/Notifications.svc/REST/SendAverageBloodSugarReport';
+const DEACTIVATE_DIABETIC_STATUS = 'services/Patients.svc/REST/Patient_DeactivateDiabeticStatus';
+const DEACTIVATE_BLOOD_PRESSURES_STATUS = 'services/Patients.svc/REST/Patient_DeactivateBloodPressureStatus';
const GET_BLOOD_PRESSURE_RESULT_AVERAGE = 'Services/Patients.svc/REST/Patient_GetBloodPressureResultAverage';
const GET_BLOOD_PRESSURE_RESULT = 'Services/Patients.svc/REST/Patient_GetBloodPressureResult';
const ADD_BLOOD_PRESSURE_RESULT = 'Services/Patients.svc/REST/Patient_AddBloodPressureResult';
+const UPDATE_BLOOD_PRESSURE_RESULT = 'Services/Patients.svc/REST/Patient_UpdateBloodPressureResult';
+const SEND_AVERAGE_BLOOD_WEIGHT_REPORT = 'Services/Notifications.svc/REST/SendAverageBodyWeightReport';
+const SEND_AVERAGE_BLOOD_PRESSURE_REPORT = 'Services/Notifications.svc/REST/SendAverageBloodPressureReport';
+const UPDATE_DIABETIC_RESULT = 'Services/Patients.svc/REST/Patient_UpdateDiabeticResult';
const GET_WEIGHT_PRESSURE_RESULT_AVERAGE = 'Services/Patients.svc/REST/Patient_GetWeightMeasurementResultAverage';
const GET_WEIGHT_PRESSURE_RESULT = 'Services/Patients.svc/REST/Patient_GetWeightMeasurementResult';
const ADD_WEIGHT_PRESSURE_RESULT = 'Services/Patients.svc/REST/Patient_AddWeightMeasurementResult';
+const UPDATE_WEIGHT_PRESSURE_RESULT = 'Services/Patients.svc/REST/Patient_UpdateWeightMeasurementResult';
+const DEACTIVATE_WEIGHT_PRESSURE_RESULT = 'services/Patients.svc/REST/Patient_DeactivateWeightMeasurementStatus';
+
const ADD_ACTIVE_PRESCRIPTIONS_REPORT_BY_PATIENT_ID = 'Services/Patients.svc/Rest/GetActivePrescriptionReportByPatientID';
const GET_CALL_INFO_HOURS_RESULT = 'Services/Doctors.svc/REST/GetCallInfoHoursResult';
@@ -308,8 +306,11 @@ const INSERT_CALL_INFO = 'Services/Doctors.svc/REST/InsertCallInfo';
const GET_PATIENT_ALLERGIES = 'Services/Patients.svc/REST/GetPatientAllergies';
// H2O
+const H2O_GET_USER_DETAIL = "Services/H2ORemainder.svc/REST/H2O_GetUserDetails_New";
+const H2O_UPDATE_USER_DETAIL = "Services/H2ORemainder.svc/REST/H2O_UpdateUserDetails_New";
const H2O_GET_USER_PROGRESS = "Services/H2ORemainder.svc/REST/H2O_GetUserProgress";
const H2O_INSERT_USER_ACTIVITY = "Services/H2ORemainder.svc/REST/H2O_InsertUserActivity";
+const H2O_UNDO_USER_ACTIVITY = "Services/H2ORemainder.svc/REST/H2o_UndoUserActivity";
//E_Referral Services
const GET_ALL_RELATIONSHIP_TYPES = "Services/Patients.svc/REST/GetAllRelationshipTypes";
@@ -323,14 +324,17 @@ const GET_E_REFERRALS = "Services/Patients.svc/REST/GetEReferrals";
// const GET_WISHLIST = "http://swd-pharapp-01:7200/api/shopping_cart_items/";
// pharmacy
-const PHARMACY_VERIFY_CUSTOMER = "epharmacy/api/VerifyCustomer";
-const PHARMACY_GET_COUNTRY = "epharmacy/api/countries";
+const PHARMACY_AUTORZIE_CUSTOMER = "epharmacy/api/AutorizeCustomer";
+const PHARMACY_VERIFY_CUSTOMER = "VerifyCustomer";
+const PHARMACY_GET_COUNTRY = "countries";
const PHARMACY_CREATE_CUSTOMER = "epharmacy/api/CreateCustomer";
-const GET_PHARMACY_BANNER = "epharmacy/api/promotionbanners";
-const GET_PHARMACY_TOP_MANUFACTURER = "epharmacy/api/topmanufacturer";
-const GET_PHARMACY_BEST_SELLER_PRODUCT = "epharmacy/api/bestsellerproducts";
-const GET_PHARMACY_PRODUCTs_BY_IDS = "epharmacy/api/productsbyids/";
-const GET_CUSTOMERS_ADDRESSES = "epharmacy/api/Customers/";
+const GET_PHARMACY_BANNER = "promotionbanners";
+const GET_PHARMACY_TOP_MANUFACTURER = "topmanufacturer";
+const GET_PHARMACY_BEST_SELLER_PRODUCT = "bestsellerproducts";
+const GET_PHARMACY_PRODUCTs_BY_IDS = "productsbyids/";
+const GET_PHARMACY_PRODUCTs_BY_SKU = "productbysku/";
+const GET_CUSTOMERS_ADDRESSES = "Customers/";
+const SUBSCRIBE_PRODUCT = "subscribe?";
const GET_ORDER = "orders?";
const GET_ORDER_DETAILS = "orders/";
const ADD_CUSTOMER_ADDRESS = "epharmacy/api/addcustomeraddress";
@@ -339,26 +343,18 @@ const DELETE_CUSTOMER_ADDRESS = "epharmacy/api/deletecustomeraddress";
const GET_ADDRESS = "Customers/";
const GET_Cancel_ORDER = "cancelorder/";
const WRITE_REVIEW = "Content-Type" + "text/plain; charset=utf-8";
-const GET_SHOPPING_CART = "epharmacy/api/shopping_cart_items/";
-const GET_SHIPPING_OPTIONS = "epharmacy/api/get_shipping_option/";
+const GET_SHOPPING_CART = "shopping_cart_items/";
+const GET_SHIPPING_OPTIONS = "get_shipping_option/";
const DELETE_SHOPPING_CART = "epharmacy/api/delete_shopping_cart_items/";
-const DELETE_SHOPPING_CART_ALL =
- "epharmacy/api/delete_shopping_cart_item_by_customer/";
+const DELETE_SHOPPING_CART_ALL = "delete_shopping_cart_item_by_customer/";
const ORDER_SHOPPING_CART = "epharmacy/api/orders";
-const GET_LACUM_ACCOUNT_INFORMATION =
- "Services/Patients.svc/REST/GetLakumAccountInformation";
-const GET_LACUM_GROUP_INFORMATION =
- "Services/Patients.svc/REST/GetlakumInQueryInfoGrouping";
-const LACUM_ACCOUNT_ACTIVATE =
- "Services/Patients.svc/REST/LakumAccountActivation";
-const LACUM_ACCOUNT_DEACTIVATE =
- "Services/Patients.svc/REST/LakumAccountDeactivation";
-const CREATE_LAKUM_ACCOUNT =
- "Services/Patients.svc/REST/PHR_CreateLakumAccount";
-const TRANSFER_YAHALA_LOYALITY_POINTS =
- "Services/Patients.svc/REST/TransferYaHalaLoyaltyPoints";
-const LAKUM_GET_USER_TERMS_AND_CONDITIONS =
- "Services/ERP.svc/REST/GetUserTermsAndConditionsForEPharmcy";
+const GET_LACUM_ACCOUNT_INFORMATION = "Services/Patients.svc/REST/GetLakumAccountInformation";
+const GET_LACUM_GROUP_INFORMATION = "Services/Patients.svc/REST/GetlakumInQueryInfoGrouping";
+const LACUM_ACCOUNT_ACTIVATE = "Services/Patients.svc/REST/LakumAccountActivation";
+const LACUM_ACCOUNT_DEACTIVATE = "Services/Patients.svc/REST/LakumAccountDeactivation";
+const CREATE_LAKUM_ACCOUNT = "Services/Patients.svc/REST/PHR_CreateLakumAccount";
+const TRANSFER_YAHALA_LOYALITY_POINTS = "Services/Patients.svc/REST/TransferYaHalaLoyaltyPoints";
+const LAKUM_GET_USER_TERMS_AND_CONDITIONS = "Services/ERP.svc/REST/GetUserTermsAndConditionsForEPharmcy";
const PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList';
const GET_RECOMMENDED_PRODUCT = 'alsoProduct/';
@@ -369,15 +365,13 @@ const PATIENT_ER_UPDATE_PRES_ORDER = "Services/Patients.svc/REST/PatientER_Updat
const GET_ORDER_DETAIL_BY_ID = "Services/Patients.svc/REST/PatientER_HHC_GetTransactionsForOrder";
const GET_CMC_ORDER_DETAIL_BY_ID = "Services/Patients.svc/REST/PatientER_CMC_GetTransactionsForOrder";
const GET_CHECK_UP_ITEMS = "Services/Patients.svc/REST/GetCheckUpItems";
-const PUSH_NOTIFICATION_GET_ALL_NOTIFICATIONS =
- 'Services/MobileNotifications.svc/REST/PushNotification_GetAllNotifications';
-const PUSH_NOTIFICATION_SET_MESSAGES_FROM_POOL_AS_READ =
- 'Services/MobileNotifications.svc/REST/PushNotification_SetMessagesFromPoolAsRead';
-const GET_PATIENT_ALL_PRES_ORD =
- 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
-const PATIENT_ER_INSERT_PRES_ORDER =
- 'Services/Patients.svc/REST/PatientER_InsertPresOrder';
+const PUSH_NOTIFICATION_GET_ALL_NOTIFICATIONS = 'Services/MobileNotifications.svc/REST/PushNotification_GetAllNotifications';
+const PUSH_NOTIFICATION_SET_MESSAGES_FROM_POOL_AS_READ = 'Services/MobileNotifications.svc/REST/PushNotification_SetMessagesFromPoolAsRead';
+const GET_PATIENT_ALL_PRES_ORD = 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
+const PATIENT_ER_INSERT_PRES_ORDER = 'Services/Patients.svc/REST/PatientER_InsertPresOrder';
const PHARMACY_MAKE_REVIEW = 'epharmacy/api/insertreviews';
+const BLOOD_DONATION_REGISTER_BLOOD_TYPE = 'Services/PatientVarification.svc/REST/BloodDonation_RegisterBloodType';
+const ADD_USER_AGREEMENT_FOR_BLOOD_DONATION = 'Services/PatientVarification.svc/REST/AddUserAgreementForBloodDonation';
//Pharmacy wishlist
const GET_WISHLIST = "shopping_cart_items/";
@@ -391,39 +385,32 @@ const GET_SPECIFICATION = "productspecification/";
const GET_BRAND_ITEMS = "products?ManufacturerId=";
// External API
-const ADD_ADDRESS_INFO =
- "https://mdlaboratories.com/exacartapi/api/addcustomeraddress";
-const GET_CUSTOMER_ADDRESSES =
- "https://mdlaboratories.com/exacartapi/api/Customers/";
-const GET_CUSTOMER_INFO =
- "https://mdlaboratories.com/exacartapi/api/VerifyCustomer";
+const ADD_ADDRESS_INFO = "https://mdlaboratories.com/exacartapi/api/addcustomeraddress";
+const GET_CUSTOMER_ADDRESSES = "https://mdlaboratories.com/exacartapi/api/Customers/";
+const GET_CUSTOMER_INFO = "https://mdlaboratories.com/exacartapi/api/VerifyCustomer";
//Pharmacy
-const GET_PHARMACY_CATEGORISE =
- 'epharmacy/api/categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=0';
-const GET_OFFERS_CATEGORISE = 'epharmacy/api/discountcategories';
-const GET_OFFERS_PRODUCTS = 'epharmacy/api/offerproducts/';
-const GET_CATEGORISE_PARENT =
- 'epharmacy/api/categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=';
-const GET_PARENT_PRODUCTS = 'epharmacy/api/products?categoryid=';
-const GET_SUB_CATEGORISE =
- 'epharmacy/api/categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=';
-const GET_SUB_PRODUCTS = 'epharmacy/api/products?categoryid=';
+const GET_PHARMACY_CATEGORISE = 'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=0';
+const GET_OFFERS_CATEGORISE = 'discountcategories';
+const GET_OFFERS_PRODUCTS = 'offerproducts/';
+const GET_CATEGORISE_PARENT = 'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=';
+const GET_PARENT_PRODUCTS = 'products?categoryid=';
+const GET_SUB_CATEGORISE = 'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=';
+const GET_SUB_PRODUCTS = 'products?categoryid=';
const GET_FINAL_PRODUCTS =
- 'epharmacy/api/products?fields=id,reviews,discount_ids,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage&CategoryId=';
-
+ 'products?fields=id,reviews,discount_ids,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage&CategoryId=';
const TIMER_MIN = 10;
const GOOGLE_API_KEY = "AIzaSyCmevVlr2Bh-c8W1VUzo8gt8JRY7n5PANw";
-const GET_BRANDS_LIST = 'epharmacy/api/categoryManufacturer?categoryids=';
+const GET_BRANDS_LIST = 'categoryManufacturer?categoryids=';
const GET_SEARCH_PRODUCTS =
- 'epharmacy/api/searchproducts?fields=id,discount_ids,reviews,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage&search_key=';
+ 'searchproducts?fields=id,discount_ids,reviews,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage&search_key=';
-const SCAN_QR_CODE = 'epharmacy/api/productbysku/';
+const SCAN_QR_CODE = 'productbysku/';
class AppGlobal {
static var context;
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 613dc81c..9ba405e7 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -3,15 +3,24 @@
// --------- - -- - - - - - - - - ----------------
const Map platformLocalizedValues = {
"errorConnectingHmgNetwork": {"en": "Sorry you are not connecting to HMG network", "ar": "نعتذر لست متصل في شكبة مستشفى د.سليمان الحبيب"},
- "successConnectingHmgNetwork": {"en": "You connected to HMG network successfully, you can access the app", "ar": "تم التصال بشبكة د.سليمان الحبيب بنجاح, تستطيع الان استخدام تطبيق الحبيب"},
+ "successConnectingHmgNetwork": {
+ "en": "You connected to HMG network successfully, you can access the app",
+ "ar": "تم التصال بشبكة د.سليمان الحبيب بنجاح, تستطيع الان استخدام تطبيق الحبيب"
+ },
"failedConnectingHmgNetwork": {
"en": "Sorry the connection to HMG network had been failed, make sure you are in range of HMG network",
"ar": "نعتذر لقد فشل الاتصال بشبكة د.سليمان الحبيب, تاكد من وجودك داخل نطاق الشبكة"
},
- "alreadyConnectedHmgNetwork": {"en": " You already connected to HMG network to access Alhabib app", "ar": "انت متصل مسبقاً بالشبكة تستطيع استخدام تطبيق الحبيب"},
+ "alreadyConnectedHmgNetwork": {
+ "en": " You already connected to HMG network to access Alhabib app",
+ "ar": "انت متصل مسبقاً بالشبكة تستطيع استخدام تطبيق الحبيب"
+ },
"somethingWentWrong": {"en": "Sorry something went wrong please try again later", "ar": "نعتذر لخدمتكم يرجى المحاولة لاحقا"},
"enablingWifi": {"en": "Enabling wifi...", "ar": "Enabling wifi..."},
- "connectedHmgNetworkWithInternet": {"en": "Successfully connected to the HMG network to access internet", "ar": "Successfully connected to the HMG network to access internet"},
+ "connectedHmgNetworkWithInternet": {
+ "en": "Successfully connected to the HMG network to access internet",
+ "ar": "Successfully connected to the HMG network to access internet"
+ },
"connectedToHmgNetworkWithNoInternet": {
"en": "Successfully connected to the HMG network but it have no internet access",
"ar": "Successfully connected to the HMG network but it have no internet access"
@@ -76,22 +85,24 @@ const Map localizedValues = {
'instruction': {'en': 'Instructions', 'ar': 'تعليمات'},
'livecare': {'en': 'LiveCare', 'ar': 'لايف كير'},
'livecareAppo': {'en': 'LiveCare Appointment', 'ar': 'الموعد لايف كير'},
- 'cancelAppoMsg': {
- 'en': 'Are you sure you want to cancel this appointment?',
- 'ar': 'هل أنت متأكد أنك تريد إلغاء هذا الموعد؟'
- },
+ 'cancelAppoMsg': {'en': 'Are you sure you want to cancel this appointment?', 'ar': 'هل أنت متأكد أنك تريد إلغاء هذا الموعد؟'},
'upcoming-noAction': {'en': 'No Action Required', 'ar': 'لا يوجد إجراء مطلوب'},
'upcoming-confirm': {'en': 'Please confirm the appointment to avoid cancellation', 'ar': 'يرجى تأكيد الموعد لتفادي الإلغاء'},
"book-success-confirm-more-24-1-2": {
- "en":
- "The online payment process will be available 24 hours before the appointment.",
+ "en": "The online payment process will be available 24 hours before the appointment.",
"ar": "- عملية الدفع الالكتروني ستكون متاحة قبل الموعد ب 24 ساعة."
},
- 'upcoming-payment-pending': {'en': 'Online Payment will be Activated before 24 Hours of Appointment Time', 'ar': 'سيتم تفعيل خدمة الدفع الالكتروني قبل 24 ساعة من موعد الحجز'},
+ 'upcoming-payment-pending': {
+ 'en': 'Online Payment will be Activated before 24 Hours of Appointment Time',
+ 'ar': 'سيتم تفعيل خدمة الدفع الالكتروني قبل 24 ساعة من موعد الحجز'
+ },
'upcoming-payment-now': {'en': 'Pay Online now to avoid long waiting queue', 'ar': 'ادفع الآن لتفادي الانتظار'},
'upcoming-QR': {'en': 'Use the QR Code to Check-In in hospital', 'ar': 'استخدم الرمز لتسجيل الحضور في المستشفى'},
- 'upcoming-virtual': {'en': 'This is a virtual appointment, Please adhere to the instructions for a seamless experience.', 'ar': 'هذا موعد اتصال مرئي عن بعد ، يرجى اتباع تعليمات الخدمة.'},
+ 'upcoming-virtual': {
+ 'en': 'This is a virtual appointment, Please adhere to the instructions for a seamless experience.',
+ 'ar': 'هذا موعد اتصال مرئي عن بعد ، يرجى اتباع تعليمات الخدمة.'
+ },
'upcoming-livecare': {'en': 'This is a LiveCare appointment', 'ar': 'هذا موعد لايف كير'},
'upcoming-details': {'en': 'More Details', 'ar': 'المزيد'},
'reschedule': {'en': 'Reschedule', 'ar': 'إعادة جدولة'},
@@ -109,42 +120,21 @@ const Map localizedValues = {
'loginregister': {'en': 'Login / Register', 'ar': 'تسجيل الدخول'},
'poweredBy': {'en': 'Powered By', 'ar': 'مشغل بواسطة'},
"welcome": {"en": "Welcome", "ar": "مرحبا"},
- "welcome_text": {
- "en": "Dr. Sulaiman Al Habib Mobile Application",
- "ar": "الدكتور سليمان الحبيب لتطبيقات الهاتف المتحرك"
- },
- 'welcome_text2': {
- 'en': 'Have you visited AlHabib Medical Group before? ',
- 'ar': 'هل قمت بزيارة مجموعة الحبيب الطبية من قبل؟'
- },
+ "welcome_text": {"en": "Dr. Sulaiman Al Habib Mobile Application", "ar": "الدكتور سليمان الحبيب لتطبيقات الهاتف المتحرك"},
+ 'welcome_text2': {'en': 'Have you visited AlHabib Medical Group before? ', 'ar': 'هل قمت بزيارة مجموعة الحبيب الطبية من قبل؟'},
'yes': {'en': 'Yes', 'ar': 'نعم'},
'no': {'en': 'No', 'ar': 'لا'},
- "logintyperadio": {
- "en": "Choose from below options to login to your medical file.",
- "ar": "اختر من الخيارات أدناه لتسجيل الدخول إلى ملفك الطبي."
- },
+ "logintyperadio": {"en": "Choose from below options to login to your medical file.", "ar": "اختر من الخيارات أدناه لتسجيل الدخول إلى ملفك الطبي."},
"registernow": {"en": "Register Now", "ar": "تسجيل الان"},
- "nationalID": {
- "en": "Enter the Identification Number",
- "ar": "أدخل رقم الهوية الوطنية او الاقامة"
- },
+ "nationalID": {"en": "Enter the Identification Number", "ar": "أدخل رقم الهوية الوطنية او الاقامة"},
"national-id": {"en": "National ID", "ar": "رقم الهوية"},
"fileNo": {"en": "File Number", "ar": "رقم الملف"},
"fileno": {"en": "File No", "ar": "رقم الملف"},
"forgotFileNo": {"en": "Forgot file Number?", "ar": "نسيت رقم الملف الطبي؟"},
- "forgotFileNoTitle": {
- "en": "Forgot medical file Number",
- "ar": "نسيت رقم الملف"
- },
+ "forgotFileNoTitle": {"en": "Forgot medical file Number", "ar": "نسيت رقم الملف"},
- "enter-national-id": {
- "en": "Please enter mobile number and identification number",
- "ar": "الرجاء إدخال رقم الجوال ورقم الهوية"
- },
- "profile-info": {
- "en": "Please enter profile information",
- "ar": "الرجاء إدخال معلومات الملف الشخصي"
- },
+ "enter-national-id": {"en": "Please enter mobile number and identification number", "ar": "الرجاء إدخال رقم الجوال ورقم الهوية"},
+ "profile-info": {"en": "Please enter profile information", "ar": "الرجاء إدخال معلومات الملف الشخصي"},
"submit": {"en": "Submit", "ar": "ارسال"},
"forgot-desc": {
"en": "Enter the mobile number to receive the Medical file Number via SMS",
@@ -153,10 +143,7 @@ const Map localizedValues = {
"dob": {"en": "Birth Date:", "ar": "تاريخ الميلاد"},
"hijri-date": {"en": "Hijri Date", "ar": "التاريخ الهجري"},
"gregorian-date": {"en": "Gregorian Date", "ar": "التاريخ الميلادي"},
- "verify-login-with": {
- "en": "Please choose one of the following options to verify",
- "ar": "الرجاء اختيار احدى الخيارات التالية للتحقق من البيانات"
- },
+ "verify-login-with": {"en": "Please choose one of the following options to verify", "ar": "الرجاء اختيار احدى الخيارات التالية للتحقق من البيانات"},
"register-user": {"en": "Register", "ar": "تسجيل"},
"verify-with-fingerprint": {"en": "Fingerprint", "ar": "بصمة"},
"verify-with-faceid": {"en": "Face ID", "ar": "معرف الوجه"},
@@ -165,33 +152,19 @@ const Map localizedValues = {
"last-login": {"en": "LAST LOGIN AT:", "ar": "آخر تسجيل دخول"},
"last-login-with": {"en": "VERIFICATION TYPE:", "ar": "نوع التحقق:"},
"verify-fingerprint": {
- "en":
- "To activate the fingerprint login service, please verify data by using one of the following options.",
- "ar":
- "لتفعيل خدمة الدخول بالبصمة، يرجى اختيار احدى القنوات التالية للتحقق من البيانات"
+ "en": "To activate the fingerprint login service, please verify data by using one of the following options.",
+ "ar": "لتفعيل خدمة الدخول بالبصمة، يرجى اختيار احدى القنوات التالية للتحقق من البيانات"
},
'searchMedicine': {'en': 'Search Medicine', 'ar': 'البحث عن الدواء'},
'pharmaciesList': {'en': 'Pharmacies List', 'ar': 'قائمة الصيدلايات'},
- 'searchMedicineHere': {
- 'en': 'Search Medicine Here',
- 'ar': 'ابحث عن الدواء هنا'
- },
+ 'searchMedicineHere': {'en': 'Search Medicine Here', 'ar': 'ابحث عن الدواء هنا'},
'description': {'en': 'Description', 'ar': 'الوصف'},
'howToUse': {'en': 'How to Use', 'ar': 'طريقة الأستخدام'},
'price': {'en': 'Price', 'ar': 'السعر'},
'youCanFindItIn': {'en': 'You can find it in', 'ar': 'يمكنكة ان تجده في'},
- 'pleaseEnterMedicineName': {
- 'en': 'Please Enter Medicine Name',
- 'ar': 'الرجائ ادخال اسم الدواء'
- },
- "verification_message": {
- "en": "Please enter the Verification Code sent to",
- "ar": "الرجاء ادخال رمز التحقق الذي تم إرساله إلى"
- },
- "validation_message": {
- "en": "The verification code expires in",
- "ar": "تنتهي صلاحية رمز التحقق خلال"
- },
+ 'pleaseEnterMedicineName': {'en': 'Please Enter Medicine Name', 'ar': 'الرجائ ادخال اسم الدواء'},
+ "verification_message": {"en": "Please enter the Verification Code sent to", "ar": "الرجاء ادخال رمز التحقق الذي تم إرساله إلى"},
+ "validation_message": {"en": "The verification code expires in", "ar": "تنتهي صلاحية رمز التحقق خلال"},
"arabic-change": {"en": "عربي", "ar": "English"},
"notification": {"en": "Notifications", "ar": "إشعارات"},
"app-settings": {"en": "App Settings", "ar": "إعدادات التطبيق"},
@@ -199,62 +172,32 @@ const Map localizedValues = {
"before": {"en": "Before", "ar": "قبل"},
"minute": {"en": "Minutes", "ar": "دقيقة"},
"hour": {"en": "Hour", "ar": "ساعة"},
- "reminderSuccess": {
- "en": "The reminder has been added successfully",
- "ar": "يضاف التذكير بنجاح"
- },
- "patientShareToDo": {
- "en": "Amount before tax: ",
- "ar": "المبلغ قبل الضريبة:"
- },
+ "reminderSuccess": {"en": "The reminder has been added successfully", "ar": "يضاف التذكير بنجاح"},
+ "patientShareToDo": {"en": "Amount before tax: ", "ar": "المبلغ قبل الضريبة:"},
"patientTaxToDo": {"en": "Tax amount: ", "ar": "قيمة الضريبة:"},
- "patientShareTotalToDo": {
- "en": "Total amount Due: ",
- "ar": "المبلغ الإجمالي المستحق:"
- },
+ "patientShareTotalToDo": {"en": "Total amount Due: ", "ar": "المبلغ الإجمالي المستحق:"},
'paymentMethod': {'en': 'Payment Method', 'ar': 'طريقة الدفع او السداد'},
- 'noNeedToWaitInLine': {
- 'en': 'No need to stand in line.',
- 'ar': 'لا داعي للوقوف في الطابور.'
- },
- 'useQRAppoAttend': {
- 'en': 'Use the QR code to register the appointment attendance.',
- 'ar': 'استخدم الكود لتسجيل الحضور في المستشفى.'
- },
+ 'noNeedToWaitInLine': {'en': 'No need to stand in line.', 'ar': 'لا داعي للوقوف في الطابور.'},
+ 'useQRAppoAttend': {'en': 'Use the QR code to register the appointment attendance.', 'ar': 'استخدم الكود لتسجيل الحضور في المستشفى.'},
'passQRAppoAttend': {
- 'en':
- 'Pass the QR code through the attendance devices available in the Hospital.',
+ 'en': 'Pass the QR code through the attendance devices available in the Hospital.',
'ar': 'تمرير الكود من خلال اجهزة تسجيل الحضور المتوفرة في الفرع.'
},
- 'sitWaitingQR': {
- 'en': 'Sit in the waiting rooms until called by the nurse.',
- 'ar': 'الجلوس في غرف الانتظار لحين منادتك من قبل الممرضة.'
- },
- 'attendRegisterCode': {
- 'en': 'Attendance registration code',
- 'ar': 'رمز تسجيل الحضور'
- },
+ 'sitWaitingQR': {'en': 'Sit in the waiting rooms until called by the nurse.', 'ar': 'الجلوس في غرف الانتظار لحين منادتك من قبل الممرضة.'},
+ 'attendRegisterCode': {'en': 'Attendance registration code', 'ar': 'رمز تسجيل الحضور'},
'scanQRHospital': {
'en': 'Scan above QR Code to Check-In on the Machine in Hospital',
'ar': 'مسح فوق رمز الاستجابة السريعة للتحقق في الجهاز في المستشفى'
},
"sendEmail": {"en": "Send Email", "ar": "ارسال نسخة"},
- "EmailSentSuccessfully": {
- "en": "Email Sent Successfully",
- "ar": "تم إرسال البريد الإلكتروني بنجاح"
- },
- "EmailSentError": {
- "en": "Error Sending Email",
- "ar": "خطأ في إرسال البريد الإلكتروني"
- },
+ "success": {"en": "Done successfully", "ar": "تم تنفذ الطلب بنجاح"},
+ "EmailSentSuccessfully": {"en": "Email Sent Successfully", "ar": "تم إرسال البريد الإلكتروني بنجاح"},
+ "EmailSentError": {"en": "Error Sending Email", "ar": "خطأ في إرسال البريد الإلكتروني"},
"close": {"en": "Close", "ar": "مغلق"},
"booked": {"en": "Booked", "ar": "محجوز"},
"confirmed": {"en": "Confirmed", "ar": "مؤكد"},
"arrived": {"en": "Arrived", "ar": "تم الحضور"},
- "payNowBookSuccess": {
- "en": "Pay now via Al Habib App",
- "ar": "ادفع الآن عبر تطبيق الحبيب"
- },
+ "payNowBookSuccess": {"en": "Pay now via Al Habib App", "ar": "ادفع الآن عبر تطبيق الحبيب"},
"payNowBookSuccesstext1": {
"en": "Pay Now using online payment service From secure payment gateways",
"ar": "ادفع الآن باستخدام خدمة الدفع عبر الإنترنت من بوابات الدفع الآمنة"
@@ -268,15 +211,9 @@ const Map localizedValues = {
'en': 'This service will be available for last 15 days doctor Visit only',
'ar': 'هذه الخدمة متاحة للزيارات خلال اخر 15 يوم فقط'
},
- "more-verify": {
- "en": "More Verification Options",
- "ar": "المزيد من خيارات التحقق"
- },
+ "more-verify": {"en": "More Verification Options", "ar": "المزيد من خيارات التحقق"},
"welcome-back": {"en": "Welcome back!", "ar": "مرحبا بعودتك!"},
- "account-info": {
- "en": "Would you like to login with current username?",
- "ar": "هل ترغب في تسجيل الدخول باسم المستخدم الحالي؟"
- },
+ "account-info": {"en": "Would you like to login with current username?", "ar": "هل ترغب في تسجيل الدخول باسم المستخدم الحالي؟"},
"another-acc": {"en": "Use Another Account", "ar": "استخدم حسابا آخر"},
"next": {"en": "Next", "ar": 'التالى'},
"first-name": {"en": "First Name", "ar": "الاسم الأول"},
@@ -287,10 +224,7 @@ const Map localizedValues = {
"preferred-language": {"en": "Preferred Language", "ar": "اللغة المفضلة"},
"english": {"en": "English", "ar": "الإنجليزية"},
"arabic": {"en": "Arabic", "ar": "العربية"},
- "locations-register": {
- "en": "Where do you want to create this file?",
- "ar": "أين تريد فتح هذا الملف؟"
- },
+ "locations-register": {"en": "Where do you want to create this file?", "ar": "أين تريد فتح هذا الملف؟"},
"ksa": {"en": "KSA", "ar": "السعودية"},
"dubai": {"en": "Dubai", "ar": "دبي"},
"enter-email": {"en": "Please Enter Email", "ar": "ادخل البريد الالكتروني"},
@@ -311,7 +245,8 @@ const Map localizedValues = {
'weight': {'en': 'Weight', 'ar': 'الوزن'},
'height': {'en': 'Height', 'ar': 'الطول'},
'heart': {'en': 'Heart', 'ar': 'قلب'},
-
+ "heightUnit": {"en": "height unit", "ar": "وحدة الطول"},
+ "weightUnit": {"en": "Weight Unit", "ar": "وحدة الوزن"},
"request": {"en": "Request", "ar": "طلبات الاضافة"},
"member-name": {"en": "Member Name", "ar": "اسم العضو"},
"switch-login": {"en": "Switch User", "ar": "تغير المستخدم"},
@@ -329,10 +264,7 @@ const Map localizedValues = {
"procedureStatus": {"en": "Procedure Status: ", "ar": "حالة الاجراء"},
"usageStatus": {"en": "Usage Status", "ar": "جالة الاستخدام"},
"unusedCount": {"en": "Unused Count: ", "ar": "غير مستخدم: "},
- "totalApproval": {
- "en": "Total approval unused",
- "ar": "اجمالي الموافقات الغير مستخدمة"
- },
+ "totalApproval": {"en": "Total approval unused", "ar": "اجمالي الموافقات الغير مستخدمة"},
"category": {"en": "Category: ", "ar": "الفئة"},
"expirationDate": {"en": "Expiration Date: ", "ar": "تاريخ الانتهاء"},
"patientCard": {"en": "Patient Card ID: ", "ar": "رقم الاشتراك"},
@@ -391,18 +323,9 @@ const Map localizedValues = {
"ambulancerequest": {"en": "Ambulance :", "ar": "طلب نقل "},
"requestA": {"en": "Request:", "ar": "اسعاف"},
"MyAppointments": {"en": "Appointments", "ar": "مواعيدي"},
- "NoBookedAppointments": {
- "en": "No Booked Appointments",
- "ar": "لا توجد مواعيد محجوزة"
- },
- "NoConfirmedAppointments": {
- "en": "No Confirmed Appointments",
- "ar": "لا توجد مواعيد مؤكدة"
- },
- "noArrivedAppointments": {
- "en": "No Arrived Appointments",
- "ar": "لم تصل المواعيد"
- },
+ "NoBookedAppointments": {"en": "No Booked Appointments", "ar": "لا توجد مواعيد محجوزة"},
+ "NoConfirmedAppointments": {"en": "No Confirmed Appointments", "ar": "لا توجد مواعيد مؤكدة"},
+ "noArrivedAppointments": {"en": "No Arrived Appointments", "ar": "لم تصل المواعيد"},
"MyAppointmentsList": {"en": "List", "ar": "قائمة بمواعدي"},
"Radiology": {"en": "Radiology", "ar": "الأشعة"},
"RadiologySubtitle": {"en": "Result", "ar": "صور وتقارير"},
@@ -458,19 +381,10 @@ const Map localizedValues = {
"VitalSign": {"en": "Vital Sign", "ar": "العلامة حيوية"},
"MonthlyReports": {"en": "Monthly Reports", "ar": "تقارير شهرية"},
"km": {"en": "KMs:", "ar": "كم"},
- "PatientHealthSummaryReport": {
- "en": "Patient Health Summary Report",
- "ar": " ملخص التقارير الشهرية"
- },
- "ToViewTheTermsAndConditions": {
- "en": "To View The Terms And Conditions Report",
- "ar": " عرض الشروط والأحكام "
- },
+ "PatientHealthSummaryReport": {"en": "Patient Health Summary Report", "ar": " ملخص التقارير الشهرية"},
+ "ToViewTheTermsAndConditions": {"en": "To View The Terms And Conditions Report", "ar": " عرض الشروط والأحكام "},
"ClickHere": {"en": "Click here", "ar": "أنقر هنا"},
- "IAgreeToTheTermsAndConditions": {
- "en": "I agree to the terms and conditions ",
- "ar": "أوافق على الشروط والاحكام "
- },
+ "IAgreeToTheTermsAndConditions": {"en": "I agree to the terms and conditions ", "ar": "أوافق على الشروط والاحكام "},
"IAgreeToTheTermsAndConditionsSubtitle": {
"en": "I agree to the terms and conditions ",
"ar":
@@ -479,14 +393,8 @@ const Map localizedValues = {
"Save": {"en": "Save", "ar": "حفظ "},
"UserAgreement": {"en": "User Agreement", "ar": "اتفاقية الخصوصية "},
"UpdateSuccessfully": {"en": "Update Successfully", "ar": "تم التحديث بنجاح"},
- "CHECK_VACCINE_AVAILABILITY": {
- "en": "CHECK VACCINE AVAILABILITY",
- "ar": "تحقق من توافر اللقاح"
- },
- "MyVaccinesAvailability": {
- "en": "MyVaccinesAvailability",
- "ar": "توفر لقاحي"
- },
+ "CHECK_VACCINE_AVAILABILITY": {"en": "CHECK VACCINE AVAILABILITY", "ar": "تحقق من توافر اللقاح"},
+ "MyVaccinesAvailability": {"en": "MyVaccinesAvailability", "ar": "توفر لقاحي"},
"PaymentService": {"en": "Payment Service", "ar": "خدمة المدفوعات"},
"PaymentOnline": {"en": "Service", "ar": "الالكتروني"},
"OnlineCheckIn": {"en": "Online Check-In", "ar": "مدفوعات معلقة"},
@@ -495,7 +403,10 @@ const Map localizedValues = {
"TotalBalance": {"en": "Total Balance", "ar": "الرصيد الكلي"},
"CreateAdvancedPayment": {"en": "Create Advanced Payment", "ar": "إنشاء دفعة مقدمة"},
"AdvancePayment": {"en": "Advance Payment", "ar": "الدفع مقدما"},
- "AdvancePaymentLabel": {"en": "You can create and add an Advanced Payment for you account or other accounts.", "ar": "يمكنك تحويل مبلغ لحسابك لدى المجموعة أو لحساب احد المراجعين"},
+ "AdvancePaymentLabel": {
+ "en": "You can create and add an Advanced Payment for you account or other accounts.",
+ "ar": "يمكنك تحويل مبلغ لحسابك لدى المجموعة أو لحساب احد المراجعين"
+ },
"FileNumber": {"en": "File Number", "ar": "رقم الملف"},
"Amount": {"en": "Amount *", "ar": "المبلغ *"},
"DepositorEmail": {"en": "Depositor Email *", "ar": "البريد الإلكتروني للمودع *"},
@@ -503,6 +414,7 @@ const Map localizedValues = {
"SelectPatientName": {"en": "Select Patient Name", "ar": "اختر اسم المريض"},
"SelectFamilyPatientName": {"en": "Family Members", "ar": "أفراد الأسرة"},
"SelectHospital": {"en": "Select Hospital", "ar": "اختر المستشفى"},
+ "selectCity": {"en": "Select City", "ar": "اختر المدينة"},
"MyAccount": {"en": "My Account", "ar": "حسابي"},
"OtherAccount": {"en": "Other Account", "ar": "حساب آخر"},
"SelectBeneficiary": {"en": "Select Beneficiary", "ar": "حدد المستفيد"},
@@ -510,14 +422,10 @@ const Map localizedValues = {
"DepositorName": {"en": "Depositor Name", "ar": "اسم المودع *"},
"MobileNumber": {"en": "Mobile Number", "ar": "رقم الجوال"},
"Ok": {"en": "Ok", "ar": "حسنا"},
- "TheVerificationCodeExpiresIn": {
- "en": "The Verification Code Expires In",
- "ar": "تنتهي صلاحية رمز التحقق في"
- },
- "PleaseEnterTheVerificationCode": {
- "en": "Please enter the verification code send to",
- "ar": "الرجاء إدخال رمز التحقق المرسل إلى"
- },
+ "WaterConsumedInWeek": {"en": "Water consumed in a week", "ar": "معدل شرب الماء خلال الاسبوع"},
+ "WaterConsumedInMonth": {"en": "Water consumed in a month", "ar": "معدل شرب الماء خلال الشهر"},
+ "TheVerificationCodeExpiresIn": {"en": "The Verification Code Expires In", "ar": "تنتهي صلاحية رمز التحقق في"},
+ "PleaseEnterTheVerificationCode": {"en": "Please enter the verification code send to", "ar": "الرجاء إدخال رمز التحقق المرسل إلى"},
"EyeMeasurements": {"en": "Eye Measurements", "ar": "قياسات النظر"},
"Measurements": {"en": "Measurements", "ar": "قياسات"},
"Classes": {"en": "Classes", "ar": "نظارات"},
@@ -540,10 +448,8 @@ const Map localizedValues = {
"DailyQuantity": {"en": "Daily Quantity :", "ar": "جرعات يومية"},
"AddReminder": {"en": "Add Reminder", "ar": "إضافة تذكير"},
"reminderDes": {
- "en":
- "Please select treatment start day and time to be notified when it\'s time to take the medicine",
- "ar":
- " يرجى تحديد يوم بدء العلاج والوقت ليتم ارسال تنبيه عندما يحين الوقت لتناول الدواء"
+ "en": "Please select treatment start day and time to be notified when it\'s time to take the medicine",
+ "ar": " يرجى تحديد يوم بدء العلاج والوقت ليتم ارسال تنبيه عندما يحين الوقت لتناول الدواء"
},
"StartDay": {"en": "Start Day", "ar": "يوم البداية"},
"EndDay": {"en": "End Day", "ar": "يوم الانتهاء"},
@@ -553,24 +459,12 @@ const Map localizedValues = {
"DoctorResponses": {"en": "Doctor Responses", "ar": "ردود الأطباء"},
"New": {"en": "New", "ar": "جديد"},
"All": {"en": "All", "ar": "الكل"},
- "QuestionHere": {
- "en": "Enter the question here...",
- "ar": "اضف الاستفسار هنا"
- },
- "ViewDoctorResponses": {
- "en": "View Doctor Responses",
- "ar": "الاطلاع على ردود الأطباء"
- },
+ "QuestionHere": {"en": "Enter the question here...", "ar": "اضف الاستفسار هنا"},
+ "ViewDoctorResponses": {"en": "View Doctor Responses", "ar": "الاطلاع على ردود الأطباء"},
"ServiceInformationButton": {"en": "LOGIN / REGISTER", "ar": "دخول / تسجيل"},
- "ServiceInformationTitle": {
- "en": "Service Information",
- "ar": "معلومات الخدمة"
- },
+ "ServiceInformationTitle": {"en": "Service Information", "ar": "معلومات الخدمة"},
"ServiceInformation": {"en": "Service Information", "ar": "معلومات الخدمة"},
- "HomeHealthCare": {
- "en": "Home Health Care",
- "ar": " الرعاية الصحية المنزلية "
- },
+ "HomeHealthCare": {"en": "Home Health Care", "ar": " الرعاية الصحية المنزلية "},
"HomeHealthCareText": {
"en":
"This service provides a set of home health care services, continuous and comprehensive follow-up in their places of residence for those who cannot access health facilities, such as (laboratory analyzes - radiology - vaccinations - physical therapy), etc.",
@@ -582,14 +476,11 @@ const Map localizedValues = {
"info-lab": {
"en":
"This service allows you to view the results of all laboratory tests performed in Al Habib Medical Group as well as sending the report via e-mail.",
- "ar":
- "خدمة نتائج المختبر: هذه الخدمة تمكنك من الاطلاع على نتائج جميع الفحوصات المخبرية التي تمت في مجموعة الحبيب الطبية."
+ "ar": "خدمة نتائج المختبر: هذه الخدمة تمكنك من الاطلاع على نتائج جميع الفحوصات المخبرية التي تمت في مجموعة الحبيب الطبية."
},
"info-radiology": {
- "en":
- "This service allows you to view the reports and photos of radiology in Al Habib Medical Group as well as send the report by e-mail.",
- "ar":
- "خدمة الاشعة: هذه الخدمة تمكنك من الاطلاع على تقارير وصور الاشعة التي تمت في مجموعة الحبيب الطبية وكذلك ارسال التقرير عن طريق الايميل."
+ "en": "This service allows you to view the reports and photos of radiology in Al Habib Medical Group as well as send the report by e-mail.",
+ "ar": "خدمة الاشعة: هذه الخدمة تمكنك من الاطلاع على تقارير وصور الاشعة التي تمت في مجموعة الحبيب الطبية وكذلك ارسال التقرير عن طريق الايميل."
},
"orders": {"en": "Orders", "ar": "الطلبات"},
"lakum": {"en": "Lakum", "ar": "لكم"},
@@ -608,6 +499,7 @@ const Map localizedValues = {
"order": {"en": "My Order", "ar": " طلباتي"},
"delivered": {"en": "Delivered", "ar": " تم التوصيل"},
"pending": {"en": "Pending", "ar": " معلقة "},
+ "enterNameHere": {"en": "Enter the name here", "ar": " أدخل الاسم هنا "},
"processing": {"en": "Processing", "ar": " تحت المعالجة"},
"cancelled": {"en": "Cancelled", "ar": " ملغي"},
"writeReview": {"en": "Write Review", "ar": " اكتب تقييمك"},
@@ -622,19 +514,10 @@ const Map localizedValues = {
"recommended": {"en": " Recommended For You", "ar": "موصى لك"},
"myPrescription": {"en": " My Prescriptions", "ar": "وصفاتي"},
"quantity": {"en": " QTY ", "ar": "الكمية"},
- "backMyAccount": {
- "en": "BACK TO MY ACCOUNT ",
- "ar": " الرجوع لحسابي الشخصي"
- },
+ "backMyAccount": {"en": "BACK TO MY ACCOUNT ", "ar": " الرجوع لحسابي الشخصي"},
"reviewSuccessful": {"en": "Review Successful", "ar": " تقييم ناجح"},
- "reviewShared": {
- "en": "Your review has been shared on product review section",
- "ar": " تمت مشاركة تقييمك في قسم تقييم المنتج"
- },
- "reviewComment": {
- "en": "Your reviews help other to choose better product",
- "ar": " تقييمك سوف يساعد الأخرين في اختيار المنتج الأفضل"
- },
+ "reviewShared": {"en": "Your review has been shared on product review section", "ar": " تمت مشاركة تقييمك في قسم تقييم المنتج"},
+ "reviewComment": {"en": "Your reviews help other to choose better product", "ar": " تقييمك سوف يساعد الأخرين في اختيار المنتج الأفضل"},
"shippedMethod": {"en": "SHIP BY:", "ar": " الشحن بواسطة:"},
"orderDetail": {"en": "Order Details", "ar": " تفاصيل الطلب"},
"orderSummary": {"en": "Order Summary", "ar": " تفاصيل المنتج"},
@@ -655,61 +538,32 @@ const Map localizedValues = {
"confirmLocation": {"en": "CONFIRM LOCATION ", "ar": " تأكيد الموقع "},
"conditionsHMG": {"en": "Terms & Conditions ", "ar": "الشروط و الأحكام "},
"conditions": {"en": "Terms & Conditions of Lakum", "ar": "شروط و احكام لكم"},
- "confirmDeleteMsg": {
- "en": "Are you sure! want to delete ",
- "ar": "هل انت متأكد تريد الحذف "
- },
+ "confirmDeleteMsg": {"en": "Are you sure! want to delete ", "ar": "هل انت متأكد تريد الحذف "},
"confirmDelete": {"en": "DELETE", "ar": "حذف"},
- "confirmCancellation": {
- "en": "Are you sure! want to cancel this order ",
- "ar": "هل انت متأكد تريد حذف هذا المنتج "
- },
+ "confirmCancellation": {"en": "Are you sure! want to cancel this order ", "ar": "هل انت متأكد تريد حذف هذا المنتج "},
"orderNumber": {"en": "Order#: ", "ar": "الطلب: "},
"orderDate": {"en": "Date", "ar": "التاريخ:"},
"itemsNo": {"en": "items(s)", "ar": "عناصر"},
"noOrder": {"en": "You Don't have any orders.", "ar": "ليس لديك طلبات"},
"TermsService": {"en": "Terms of Service", "ar": "شروط الخدمه"},
- "Beforeusing": {
- "en": "Before using the checkup, please read Terms of Service.",
- "ar": "قبل استخدام الفحص ، يرجى قراءة شروط الخدمة"
- },
- "accept": {
- "en": "I read and accept Terms of Service and Privacy Policy",
- "ar": "قرأت ووافقت على شروط الخدمة وسياسة الخصوصية"
- },
+ "Beforeusing": {"en": "Before using the checkup, please read Terms of Service.", "ar": "قبل استخدام الفحص ، يرجى قراءة شروط الخدمة"},
+ "accept": {"en": "I read and accept Terms of Service and Privacy Policy", "ar": "قرأت ووافقت على شروط الخدمة وسياسة الخصوصية"},
"data-safe-info": {
- "en":
- "Information that you provide is anonymous and not shared with anyone.",
+ "en": "Information that you provide is anonymous and not shared with anyone.",
"ar": "المعلومات التي تقدمها لا تتم مشاركتها مع أي شخص"
},
"data-safe": {"en": " Your data is safe.", "ar": "بياناتك آمنة"},
"informational": {
- "en":
- "Checkup is for informational purposes and is not a qualified medical opinion",
+ "en": "Checkup is for informational purposes and is not a qualified medical opinion",
"ar": "الفحص هو لأغراض معلوماتية وليس رأي طبي مؤهل"
},
- "not-use-in-emerbency": {
- "en": "Do not use in emergencies.",
- "ar": "لا تستخدم في حالات الطوارئ"
- },
- "not-use-in-emerbency-details": {
- "en": "In case of health emergency, ",
- "ar": "في حالة الطوارئ اتصل بأقرب رقم للطوارئ على الفور"
- },
- "not-use-in-emerbency-details-call": {
- "en": "call the nearest emergency number immediately",
- "ar": " اتصل بأقرب رقم للطوارئ على الفور"
- },
- "check-diagnosis": {
- "en": "Checkup is not a diagnosis.",
- "ar": "الفحص ليس تشخيص."
- },
+ "not-use-in-emerbency": {"en": "Do not use in emergencies.", "ar": "لا تستخدم في حالات الطوارئ"},
+ "not-use-in-emerbency-details": {"en": "In case of health emergency, ", "ar": "في حالة الطوارئ اتصل بأقرب رقم للطوارئ على الفور"},
+ "not-use-in-emerbency-details-call": {"en": "call the nearest emergency number immediately", "ar": " اتصل بأقرب رقم للطوارئ على الفور"},
+ "check-diagnosis": {"en": "Checkup is not a diagnosis.", "ar": "الفحص ليس تشخيص."},
"remeberthat": {"en": "Remember that", "ar": "تذكر ذلك:"},
- "loginToUseService": {
- "en": "You need to login to use this service",
- "ar": "هذة الخدمة تتطلب تسجيل الدخول"
- },
+ "loginToUseService": {"en": "You need to login to use this service", "ar": "هذة الخدمة تتطلب تسجيل الدخول"},
// pharmacy module
"medicationRefill": {"en": "MEDICATION REFILL", "ar": "إعادة تعبئة الدواء"},
@@ -724,10 +578,7 @@ const Map localizedValues = {
"selectAddress": {"en": "Select Address", "ar": "حدد العنوان"},
"shippingAddress": {"en": "SHIPPING ADDRESS", "ar": "عنوان الشحن"},
"changeAddress": {"en": "Change Address", "ar": "تغيير العنوان"},
- "selectPaymentOption": {
- "en": "Select Payment Option",
- "ar": "حدد خيار الدفع"
- },
+ "selectPaymentOption": {"en": "Select Payment Option", "ar": "حدد خيار الدفع"},
"changeMethod": {"en": "Change Method", "ar": "تغيير خيار الدفع"},
"reviewOrder": {"en": "Review Order", "ar": "مراجعة الطلب"},
"active": {"en": "ACTIVE", "ar": "فعال"},
@@ -745,24 +596,17 @@ const Map localizedValues = {
"select-age": {"en": "Select Your Age", "ar": "حدد العمر"},
"i-am": {"en": "I am", "ar": "أنا"},
"years-old": {"en": "years old", "ar": "سنة"},
- "drag-point": {
- "en": "Drag point to change your age",
- "ar": "اسحب لتغيير عمرك"
- },
+ "drag-point": {"en": "Drag point to change your age", "ar": "اسحب لتغيير عمرك"},
"categorise": {"en": "Categories", "ar": "التطبيقات"},
"wishList": {"en": "WishList", "ar": "الرغبات"},
"myAccount": {"en": "My Account", "ar": "حسابي"},
"cart": {"en": "Cart", "ar": "التسوق"},
- "searchProductHere": {
- "en": "Search Product here",
- "ar": "ابحث في الطلب الخاص بك"
- },
+ "searchProductHere": {"en": "Search Product here", "ar": "ابحث في الطلب الخاص بك"},
"HHCNotAuthMsg": {
"en":
"This service provides a set of home health care services, continuous and comprehensive follow-up in their places of residence for those who cannot access health facilities, such as (laboratory analyzes - radiology - vaccinations - physical therapy), etc.",
- "ar":
- "من خلال هذه الخدمة يمكنك طلب مجموعة من الفحوصات التي تساعدك وتساعد طبيبك في فهم حالتك الصحية الحالية ومن ثم تحديد المخاطر المحتملة"
+ "ar": "من خلال هذه الخدمة يمكنك طلب مجموعة من الفحوصات التي تساعدك وتساعد طبيبك في فهم حالتك الصحية الحالية ومن ثم تحديد المخاطر المحتملة"
},
"email": {"en": "Email", "ar": "البريد الالكتروني"},
"Book": {"en": "Book", "ar": "احجز"},
@@ -782,7 +626,12 @@ const Map localizedValues = {
"View details of your appointments with the selected doctor.",
"Book appointment with the doctor. ",
],
- "ar": ["الاطلاع على معلومات الطبيب ومؤهلاته.", "الاطلاع على جدول الطبيب.", "الاطلاع على تفاصيل المواعيد التي تمت مع الطبيب.", "حجز موعد مع الطبيب."]
+ "ar": [
+ "الاطلاع على معلومات الطبيب ومؤهلاته.",
+ "الاطلاع على جدول الطبيب.",
+ "الاطلاع على تفاصيل المواعيد التي تمت مع الطبيب.",
+ "حجز موعد مع الطبيب."
+ ]
},
"info-my-doctor": {
"en": "This service allows you to see all the doctors you have visited in Al Habib Medical Group, and through this service:",
@@ -790,7 +639,8 @@ const Map localizedValues = {
},
"info-prescriptions": {
"en": "This service allows you to view all the medical prescriptions issued by Al Habib Medical Group, and through this service, you can:",
- "ar": "خدمة الوصفات الطبية: هذه الخدمة تمكنك من الاطلاع على جميع الوصفات الطبية التي تم اصدارها في مجموعة الحبيب الطبية، كما تستطيع من خلال هذه الخدمة:"
+ "ar":
+ "خدمة الوصفات الطبية: هذه الخدمة تمكنك من الاطلاع على جميع الوصفات الطبية التي تم اصدارها في مجموعة الحبيب الطبية، كما تستطيع من خلال هذه الخدمة:"
},
"info-my-prescription-points": {
"en": [
@@ -815,7 +665,8 @@ const Map localizedValues = {
"info-insurance-cards": {
"en": "This service allows you to view all the insurance cards that recorded during your visits to Al Habib Medical Group in addition to:",
- "ar": "خدمة بطاقات التامين: هذه الخدمة تمكنك من الاطلاع على جميع بطاقات التامين والتي تم تسجيلها اثناء زياراتك لمجموعة الحبيب الطبية بالاضافة الى:"
+ "ar":
+ "خدمة بطاقات التامين: هذه الخدمة تمكنك من الاطلاع على جميع بطاقات التامين والتي تم تسجيلها اثناء زياراتك لمجموعة الحبيب الطبية بالاضافة الى:"
},
"info-insurance-cards-points": {
@@ -838,19 +689,15 @@ const Map localizedValues = {
},
"info-allergies": {
- "en":
- "This service allows you to view all types of allergies recorded during your visits to Al Habib Medical Group.",
- "ar":
- "خدمة الحساسية: هذه الخدمة تمكنك من الاطلاع على جميع انواع الحساسية التي تم تسجيلها خلال زياراتك في مجموعة الحبيب الطبية."
+ "en": "This service allows you to view all types of allergies recorded during your visits to Al Habib Medical Group.",
+ "ar": "خدمة الحساسية: هذه الخدمة تمكنك من الاطلاع على جميع انواع الحساسية التي تم تسجيلها خلال زياراتك في مجموعة الحبيب الطبية."
},
"sick-leaves": {"en": "Sick Leaves", "ar": "الاجازات المرضية"},
"info-sick-leaves": {
- "en":
- "This service allows you to view all sick leaves that were taken in Al Habib Medical Group in addition to:",
- "ar":
- "الاجازات المرضية: هذه الخدمة تمكنك من الاطلاع على جميع الاجازات المرضية والتي تم اصدارها في مجموعة الحبيب الطبية بالاضافة الى:"
+ "en": "This service allows you to view all sick leaves that were taken in Al Habib Medical Group in addition to:",
+ "ar": "الاجازات المرضية: هذه الخدمة تمكنك من الاطلاع على جميع الاجازات المرضية والتي تم اصدارها في مجموعة الحبيب الطبية بالاضافة الى:"
},
"info-sick-leave-points": {
"en": [
@@ -870,10 +717,8 @@ const Map localizedValues = {
},
"info-approvals": {
- "en":
- "This service allows you to view all approvals requests that have been sent to the insurance companies in addition to:",
- "ar":
- "خدمة الموافقات: هذه الخدمة تمكنك من الاطلاع على جميع طلبات الموافقات والتي تم ارسالها الى شركات التامين بالاضافة الى:"
+ "en": "This service allows you to view all approvals requests that have been sent to the insurance companies in addition to:",
+ "ar": "خدمة الموافقات: هذه الخدمة تمكنك من الاطلاع على جميع طلبات الموافقات والتي تم ارسالها الى شركات التامين بالاضافة الى:"
},
"info-approval-points": {
@@ -894,34 +739,16 @@ const Map localizedValues = {
"ar":
"خدمة التقارير الشهرية: عند تفعيل هذه الخدمة سيقوم النظام بارسال تقرير شهري بشكل آلي على الايميل المسجل والذي يسرد المؤشرات الحيوية ونتائج التحاليل لآخر زيارات تمت بمجموعة الحبيب الطبية."
},
- "language-setting": {
- "en": "SMS and Confirmation Calls Language",
- "ar": "لغة الرسائل القصيرة و الاتصال الآلي"
- },
+ "language-setting": {"en": "SMS and Confirmation Calls Language", "ar": "لغة الرسائل القصيرة و الاتصال الآلي"},
"alert": {"en": "Alerts", "ar": "التنبيهات"},
- "email-alert": {
- "en": "Alert By Email",
- "ar": "استلام التنبيهات بالبريد الالكتروني"
- },
- "sms-alert": {
- "en": "Alert By SMS",
- "ar": "استلام التنبيهات بالرسائل القصيرة"
- },
+ "email-alert": {"en": "Alert By Email", "ar": "استلام التنبيهات بالبريد الالكتروني"},
+ "sms-alert": {"en": "Alert By SMS", "ar": "استلام التنبيهات بالرسائل القصيرة"},
"contact-info": {"en": "Contact Information", "ar": "معلومات التواصل"},
- "emrg-name": {
- "en": "Emergency Contact Name",
- "ar": "اسم للتواصل في حالة الطوارئ"
- },
- "emrg-no": {
- "en": "Emergency Contact Number",
- "ar": "رقم للتواصل في حالة الطوارئ"
- },
+ "emrg-name": {"en": "Emergency Contact Name", "ar": "اسم للتواصل في حالة الطوارئ"},
+ "emrg-no": {"en": "Emergency Contact Number", "ar": "رقم للتواصل في حالة الطوارئ"},
"modes": {"en": "Modes", "ar": "الاوضاع"},
"vibration": {"en": "Vibration Touch Feedback", "ar": "الاهتزاز عند اللمس"},
- "blind-modes": {
- "en": "Modes for Partially Blind",
- "ar": "تأثيرات لدعم ضعاف البصر"
- },
+ "blind-modes": {"en": "Modes for Partially Blind", "ar": "تأثيرات لدعم ضعاف البصر"},
"invert-theme": {"en": "Invert", "ar": "ألوان سلبية"},
"off-theme": {"en": "Off", "ar": "إيقاف"},
"dim-theme": {"en": "Dim", "ar": "ضوء خافت"},
@@ -938,14 +765,8 @@ const Map localizedValues = {
"LiveChat": {"en": "Live Chat", "ar": "محادثة مباشرة"},
"Service": {"en": "Service", "ar": "خدمة"},
"HMGServiceLabel": {"en": "HMG Service", 'ar': 'خدمات الحبيب'},
- "HealthWeatherIndicators": {
- "en": "Health Weather Indicators",
- 'ar': ' مؤشرات الطقس الصحية '
- },
- "HealthTipsBasedOnCurrentWeather": {
- "en": "Health Tips Based On Current Weather",
- 'ar': ' نصائح صحية على أساس الطقس الحالي '
- },
+ "HealthWeatherIndicators": {"en": "Health Weather Indicators", 'ar': ' مؤشرات الطقس الصحية '},
+ "HealthTipsBasedOnCurrentWeather": {"en": "Health Tips Based On Current Weather", 'ar': ' نصائح صحية على أساس الطقس الحالي '},
"MoreDetails": {"en": "More details", "ar": " المزيد من التفاصيل "},
"SendCopy": {"en": "Send Copy", "ar": "ارسال نسخة"},
"ResendOrder": {"en": "Resend order & deliver", "ar": "إعادة طلب و توصيل"},
@@ -955,7 +776,10 @@ const Map localizedValues = {
"DailyDoses": {"en": "Daily Doses", "ar": "جرعات يومية"},
"Period": {"en": "Period", "ar": "الفترة"},
"cm": {"en": "CM", "ar": "سم"},
+ "ft": {"en": "ft", "ar": "قدم"},
"kg": {"en": "kg", "ar": "كجم"},
+ "lb": {"en": "lb", "ar": "رطل"},
+ "birth_date": {"en": "Birth Date", "ar": "تاريخ الميلاد"},
"mass": {"en": "Mass", "ar": "كتلة"},
"temp-c": {"en": "°C", "ar": "°س"},
"bpm": {"en": "bpm", "ar": "نبضة"},
@@ -966,47 +790,38 @@ const Map localizedValues = {
"send": {"en": "Send", "ar": "أرسل"},
"status": {"en": "Status", "ar": "الحالة"},
"like-to-hear": {
- "en":
- "We would love to hear the feedback, concerns on healthcare services and eServices experience. Please use the below form",
- "ar":
- "يسعدنا سماع ملاحظاتك حول خدمات الرعاية الصحية والخدمات الإلكترونية. يرجى تعبئة الحقول المطلوبة"
+ "en": "We would love to hear the feedback, concerns on healthcare services and eServices experience. Please use the below form",
+ "ar": "يسعدنا سماع ملاحظاتك حول خدمات الرعاية الصحية والخدمات الإلكترونية. يرجى تعبئة الحقول المطلوبة"
},
"subject": {"en": "Subject", "ar": "الموضوع"},
"message": {"en": "Message", "ar": "رسالة"},
- "empty-subject": {
- "en": "Please enter the subject",
- "ar": "يرجى ادخال الموضوع"
- },
+ "empty-subject": {"en": "Please enter the subject", "ar": "يرجى ادخال الموضوع"},
"empty-message": {"en": "Please enter message", "ar": "يرجى ادخال الرسالة"},
"select-attachment": {"en": "Select Attachment", "ar": "إختر المرفق"},
"complain-appo": {"en": "Complaint for appointment", "ar": "شكوى على موعد"},
- "complain-without-appo": {
- "en": "Complaint without appointment",
- "ar": "شكوى بدون موعد"
- },
+ "complain-without-appo": {"en": "Complaint without appointment", "ar": "شكوى بدون موعد"},
"question": {"en": "Question", "ar": "سؤال"},
"message-type": {"en": "Message Type", "ar": "نوع الرسالة"},
"compliment": {"en": "compliment", "ar": "ثناء"},
"suggestion": {"en": "Suggestion", "ar": "إقتراح"},
"your-feedback": {"en": "Your feedback was sent", "ar": "لقد تم ارسال اقراحك شكرا لك"},
- "select-part": {
- "en": "Please select the part that complain about",
- "ar": "يرجى تحديد الجزء الذي تشكو منه"
- },
+ "select-part": {"en": "Please select the part that complain about", "ar": "يرجى تحديد الجزء الذي تشكو منه"},
"number": {"en": "Number", "ar": "الرقم"},
"not-classified": {"en": "Not classified", "ar": "غير محدد"},
"selectClinic": {"en": "Select Clinic", "ar": " بحث بالعيادة"},
- "searchItemError": {
- "en": "Item name should be more than 3 character ",
- "ar": "يجب أن يكون اسم العنصر أكثر من 3 أحرف"
- },
+ "searchItemError": {"en": "Item name should be more than 3 character ", "ar": "يجب أن يكون اسم العنصر أكثر من 3 أحرف"},
"YouCanFind": {"en": "You Can Find ", "ar": "باستطاعتك العثور على "},
"ItemInSearch": {"en": " Item In Search", "ar": " عنصر في البحث "},
"wantConnectHmgNetwork": {
- "en": "Dear customer there is no internet access, Do you want to connect with HMG network to use our app, make sure you are in range of HMG network",
- "ar": "عزيز العميل لا يوجد اتصال بالإنترنت, هل تريد الاتصال بشبكة مستشفى د. سليمان الحبيب لاستخدام التطبيق. يجب عليك ان تكون في نطاق شبكة المستشفى"
+ "en":
+ "Dear customer there is no internet access, Do you want to connect with HMG network to use our app, make sure you are in range of HMG network",
+ "ar":
+ "عزيز العميل لا يوجد اتصال بالإنترنت, هل تريد الاتصال بشبكة مستشفى د. سليمان الحبيب لاستخدام التطبيق. يجب عليك ان تكون في نطاق شبكة المستشفى"
+ },
+ "failedToAccessHmgServices": {
+ "en": "Connected with HMG Network,\n\nBut failed to access HMG services",
+ "ar": "Connected with HMG Network,\n\nBut failed to access HMG services"
},
- "failedToAccessHmgServices": {"en": "Connected with HMG Network,\n\nBut failed to access HMG services", "ar": "Connected with HMG Network,\n\nBut failed to access HMG services"},
"offerAndPackages": {"en": "Offers And Packages", "ar": "العروض والباقات"},
"InvoiceNo": {"en": " Invoice No", "ar": "رقم الفاتورة"},
"SpecialResult": {"en": " Special Result", "ar": "نتيجة خاصة"},
@@ -1038,31 +853,20 @@ const Map localizedValues = {
"info-advance-payment": {
"en":
"This service designed so that you can deposit an amount in advance either in your account or in someone else's account with Al Habib Medical Group.",
- "ar":
- "تم تصميم هذه الخدمة حتى تتمكن من دفع مبلغ مقدما او تحت الحساب سواء في حسابك او في حساب شخص اخر لدى مجموعة الحبيب الطبية."
- },
- "info-my-balance": {
- "en": "This service allows you to check your balance in all branchs",
- "ar": "هذه الخدمه تتيح لك الاطلاع رصيدك في كل الفروع"
+ "ar": "تم تصميم هذه الخدمة حتى تتمكن من دفع مبلغ مقدما او تحت الحساب سواء في حسابك او في حساب شخص اخر لدى مجموعة الحبيب الطبية."
},
+ "info-my-balance": {"en": "This service allows you to check your balance in all branchs", "ar": "هذه الخدمه تتيح لك الاطلاع رصيدك في كل الفروع"},
"er-contant": {
- "en":
- "This service displays nearest branch among all the branches of Al Habib Medical Group based on your current location.",
- "ar":
- "تعرض هذه الخدمة أقرب فرع من بين جميع فروع مجموعة الحبيب الطبية بناءً على موقعك الحالي."
+ "en": "This service displays nearest branch among all the branches of Al Habib Medical Group based on your current location.",
+ "ar": "تعرض هذه الخدمة أقرب فرع من بين جميع فروع مجموعة الحبيب الطبية بناءً على موقعك الحالي."
},
"er": {"en": "ER", "ar": "الطوارىء"},
"transportation-Service": {"en": "Ambulance Request", "ar": "طلب نقل اسعاف"},
"info-ambulance": {
- "en":
- "Through this service, you can request evacuation by ambulance, whether from home or to home, in addition to a set of other services",
- "ar":
- "عن طريق هذه الخدمة يمكنك طلب اخلاء بواسطة سيارة اسعاف سواء من المزل او الى المنزل بالاضافة الى مجموعة من الخدمات الاخرى"
- },
- "RRT-transport-heading": {
- "en": "Select Transportation Method",
- "ar": "حدد طريقة النقل"
+ "en": "Through this service, you can request evacuation by ambulance, whether from home or to home, in addition to a set of other services",
+ "ar": "عن طريق هذه الخدمة يمكنك طلب اخلاء بواسطة سيارة اسعاف سواء من المزل او الى المنزل بالاضافة الى مجموعة من الخدمات الاخرى"
},
+ "RRT-transport-heading": {"en": "Select Transportation Method", "ar": "حدد طريقة النقل"},
"RRT-direction-heading": {"en": "Select Direction", "ar": "حدد الاتجاه"},
"to-hospital": {"en": "To Hospital", "ar": "الى المستشفى"},
"from-hospital": {"en": "From Hospital", "ar": "من المستشفى"},
@@ -1073,21 +877,12 @@ const Map localizedValues = {
"inside-home": {"en": "Inside Home", "ar": "داخل المنزل"},
"have-appo": {"en": "Do you have an appointment ?", "ar": "هل لديك موعد ؟"},
"dropoff-location": {"en": "Dropoff Location", "ar": "نقطة الوصول"},
- "select-all": {
- "en": "Please select all fields",
- "ar": "يرجى تحديد جميع الحقول"
- },
+ "select-all": {"en": "Please select all fields", "ar": "يرجى تحديد جميع الحقول"},
"select-map": {"en": "Select From Map", "ar": "حدد من الخريطة"},
- "no-appointment": {
- "en": "You don't have any appointments yet",
- "ar": "ليس لديك أي مواعيد حتى الآن"
- },
+ "no-appointment": {"en": "You don't have any appointments yet", "ar": "ليس لديك أي مواعيد حتى الآن"},
"patient-share": {"en": "Amount before tax: ", "ar": "المبلغ قبل الضريبة:"},
"patient-share-tax": {"en": "Tax amount: ", "ar": "قيمة الضريبة:"},
- "patient-share-total": {
- "en": "Total amount payable: ",
- "ar": "المبلغ الإجمالي المستحق:"
- },
+ "patient-share-total": {"en": "Total amount payable: ", "ar": "المبلغ الإجمالي المستحق:"},
"select-ambulate": {"en": "Select Ambulate", "ar": "بحاجة للتنقل بواسطة"},
"wheelchair": {"en": "Wheelchair", "ar": "كرسي متحرك"},
"walker": {"en": "Walker", "ar": "مشاية"},
@@ -1098,63 +893,35 @@ const Map localizedValues = {
"transport-method": {"en": "Transportation Method", "ar": "طريقة النقل"},
"directions": {"en": "Directions", "ar": "الاتجاهات"},
"info-my-appointments": {
- "en":
- "This service allows you to see all the appointment you have visited in Al Habib Medical Group, and through this service:",
- "ar":
- "خدمة مواعيدي: هذه الخدمة تمكنك من الاطلاع على جميع المواعيد التي قمت بزيارتهم في مجموعة الحبيب الطبية, كما تستطيع من خلال هذه الخدمة:"
+ "en": "This service allows you to see all the appointment you have visited in Al Habib Medical Group, and through this service:",
+ "ar": "خدمة مواعيدي: هذه الخدمة تمكنك من الاطلاع على جميع المواعيد التي قمت بزيارتهم في مجموعة الحبيب الطبية, كما تستطيع من خلال هذه الخدمة:"
},
"info-todo": {
- "en":
- "This service is designed to enable you to have a quick link to the list of tasks that need to be done",
- "ar":
- "هذه الخدمة تم تصميمها لتمكنك من الوصول الى رابط سريع لقائمة المهام التي يجب القيام بها"
+ "en": "This service is designed to enable you to have a quick link to the list of tasks that need to be done",
+ "ar": "هذه الخدمة تم تصميمها لتمكنك من الوصول الى رابط سريع لقائمة المهام التي يجب القيام بها"
},
"family-info": {
"en":
"Through this service, you will be able to link your family medical files to your medical file so that you can manage their records by login to your medical file.",
- "ar":
- "هذه الخدمة تم تصميمها لتتمكن من ربط الملفات الطبية للعائلة بملفك الطبي حتى تتمكن من إدارة سجلاتهم عن طريق تسجيل الدخول إلى ملفك الطبي."
- },
- "update-succ": {
- "en": "Successfully updated profile",
- "ar": "تم تحديث البيانات بنجاح"
+ "ar": "هذه الخدمة تم تصميمها لتتمكن من ربط الملفات الطبية للعائلة بملفك الطبي حتى تتمكن من إدارة سجلاتهم عن طريق تسجيل الدخول إلى ملفك الطبي."
},
+ "update-succ": {"en": "Successfully updated profile", "ar": "تم تحديث البيانات بنجاح"},
"dental-complains": {"en": "Symptoms", "ar": "الأعراض"},
- "empty-result": {
- "en": "There is no search results found",
- "ar": "لايوجد نتائج"
- },
+ "empty-result": {"en": "There is no search results found", "ar": "لايوجد نتائج"},
- "no-booked-appointment": {
- "en": "No booked appointments",
- "ar": "لا يوجد مواعيد محجوزة"
- },
- "no-confirmed-appointment": {
- "en": "No confirmed appointments",
- "ar": "لا توجد مواعيد مؤكدة"
- },
- "no-arrived-appointment": {
- "en": "No arrived appointments",
- "ar": "لا يوجد مواعيد"
- },
- "upcoming-empty": {
- "en": "You do not have any Todo actions yet.",
- "ar": "ليس لديك أي إجراءات الآن."
- },
- "upcoming-timeLeft": {
- "en": "time left for appointment",
- "ar": "الوقت المتبقي للموعد"
- },
- "covid-test-all-services": {
- "en": "Covid-19 Drive-Thru Test",
- "ar": "فحص كورونا من داخل السيارة"
- },
+ "no-booked-appointment": {"en": "No booked appointments", "ar": "لا يوجد مواعيد محجوزة"},
+ "no-confirmed-appointment": {"en": "No confirmed appointments", "ar": "لا توجد مواعيد مؤكدة"},
+ "no-arrived-appointment": {"en": "No arrived appointments", "ar": "لا يوجد مواعيد"},
+ "upcoming-empty": {"en": "You do not have any Todo actions yet.", "ar": "ليس لديك أي إجراءات الآن."},
+ "upcoming-timeLeft": {"en": "time left for appointment", "ar": "الوقت المتبقي للموعد"},
+ "covid-test-all-services": {"en": "Covid-19 Drive-Thru Test", "ar": "فحص كورونا من داخل السيارة"},
"pharmacy": {"en": "Pharmacy", "ar": "الصيدلية"},
"ereferral": {"en": "E-Referral", "ar": "طلب التحويل"},
"child-vaccine": {"en": "Child Vaccines", "ar": "تطعيمات الأطفال"},
"calculators": {"en": "Health Calculators", "ar": "الحاسبات الصحية"},
"converters": {"en": "Health Converter", "ar": "تحويل القياسات"},
- "h2o": {"en": "Water Tracker", "ar": "حساب كمية الماء"},
+ "waterTracker": {"en": "Water Tracker", "ar": "حساب كمية الماء"},
+ "h2o": {"en": "H2O", "ar": "استهلاك"},
"v-tour": {"en": "Virtual Tour", "ar": "جولة إفتراضية"},
"hmg-news": {"en": "HMG News", "ar": "أخبار المجموعة"},
"blood-d": {"en": "Blood Donation", "ar": "تبرع بالدم"},
@@ -1170,10 +937,7 @@ const Map localizedValues = {
"ready": {"en": "Ready", "ar": "جاهز"},
"completed": {"en": "Completed", "ar": "مكتمل"},
- "request-medical-report": {
- "en": "Request medical report",
- "ar": "طلب تقرير طبي"
- },
+ "request-medical-report": {"en": "Request medical report", "ar": "طلب تقرير طبي"},
"insur-cards": {"en": "Insurance Cards", "ar": "بطاقات التأمين"},
'labResult': {"en": "Lab results", "ar": "نتائج التحاليل المخبرية"},
'details': {'en': 'Details', 'ar': 'التفاصيل'},
@@ -1183,221 +947,86 @@ const Map localizedValues = {
"card-detail": {"en": "Insurance Details", "ar": "منافعك التامينية"},
"Dr": {"en": "Dr. ", "ar": "الدكتور."},
"empty": {"en": "You do not have any records.", "ar": "ليس لديك أي سجلات"},
- "last-visit": {
- "en": "How was your last visit with doctor?",
- "ar": "كيف تقيم زيارتك الأخيرة للطبيب؟"
- },
+ "last-visit": {"en": "How was your last visit with doctor?", "ar": "كيف تقيم زيارتك الأخيرة للطبيب؟"},
"tap-title": {"en": "Please rate the doctor", "ar": "يرجى تقييم الطبيب"},
"later": {"en": "Later", "ar": "لاحقاً"},
- "sendSuc": {
- "en": "A copy has been sent to the email",
- "ar": "تم إرسال نسخة إلى البريد الإلكتروني"
- },
+ "sendSuc": {"en": "A copy has been sent to the email", "ar": "تم إرسال نسخة إلى البريد الإلكتروني"},
"instructions": {
- "en":
- "You can now talk directly to the appointments department by chat or request a call back",
- "ar":
- "يمكنك الان التحدث مباشرة مع قسم المواعيد عن طريق خدمة المحادثة النصية أو طلب معاودة الاتصال"
+ "en": "You can now talk directly to the appointments department by chat or request a call back",
+ "ar": "يمكنك الان التحدث مباشرة مع قسم المواعيد عن طريق خدمة المحادثة النصية أو طلب معاودة الاتصال"
},
"instructions-pharmacies": {
- "en":
- "You can now talk directly to the pharmacist by chat or request a call back",
- "ar":
- "يمكنك الآن التحدث مباشرة إلى الصيدلي عن طريق الدردشة أو طلب معاودة الاتصال"
+ "en": "You can now talk directly to the pharmacist by chat or request a call back",
+ "ar": "يمكنك الآن التحدث مباشرة إلى الصيدلي عن طريق الدردشة أو طلب معاودة الاتصال"
},
"select-hospital": {"en": "Choose Hospital", "ar": "اختر المستشفى"},
"start": {"en": "Start", "ar": "ابدأ"},
"info-chat": {
- "en":
- "This service allows you to chat with customer service directly without the need to call.",
- "ar":
- "المحادثة المباشرة: هذه الخدمة تمكنك التحدث كتابياً مع خدمة العملاء مباشرة دون الحاجة الى الاتصال هاتفياً."
- },
- "last-appointment": {
- "en": "How was your appointment?",
- "ar": "كيف كان موعدك الطبي ؟"
+ "en": "This service allows you to chat with customer service directly without the need to call.",
+ "ar": "المحادثة المباشرة: هذه الخدمة تمكنك التحدث كتابياً مع خدمة العملاء مباشرة دون الحاجة الى الاتصال هاتفياً."
},
+ "last-appointment": {"en": "How was your appointment?", "ar": "كيف كان موعدك الطبي ؟"},
"rate-clinic": {"en": "Please rate the clinic", "ar": "يرجى تقييم العيادة"},
"fetch-data": {"en": "Fetch Data", "ar": "تحديث الان"},
"rate": {"en": "Rate", "ar": "تقييم"},
- "send-email": {
- "en": "Send a copy of this report to the email",
- "ar": "أرسل نسخة من هذا التقرير إلى البريد الإلكتروني"
- },
- "update-email-msg": {
- "en": "Email updated",
- "ar": "تم تحديث البريد الالكتروني"
- },
+ "send-email": {"en": "Send a copy of this report to the email", "ar": "أرسل نسخة من هذا التقرير إلى البريد الإلكتروني"},
+ "update-email-msg": {"en": "Email updated", "ar": "تم تحديث البريد الالكتروني"},
"update-email": {"en": "Update Email", "ar": "تحديث البريد الالكتروني"},
- "booked-success": {
- "en": "The appointment has been successfully booked.",
- "ar": "لقد تم حجز الموعد بنجاح"
- },
- "appo-reminder-select-option-30": {
- "en": "Before 30 Mins",
- "ar": "قبل 30 دقيقة"
- },
- "appo-reminder-select-option-60": {
- "en": "Before 1 Hour",
- "ar": "قبل ساعة واحدة"
- },
- "appo-reminder-select-option-90": {
- "en": "Before 1 Hour and 30 mins",
- "ar": "قبل ساعة و 30 دقيقة"
- },
- "appo-reminder-select-option-120": {
- "en": "Before 2 Hours",
- "ar": "قبل ساعتين"
- },
- "noDataAvailable": {
- "en": "No data available",
- "ar": " لا يوجد بيانات متاحة "
- },
+ "booked-success": {"en": "The appointment has been successfully booked.", "ar": "لقد تم حجز الموعد بنجاح"},
+ "appo-reminder-select-option-30": {"en": "Before 30 Mins", "ar": "قبل 30 دقيقة"},
+ "appo-reminder-select-option-60": {"en": "Before 1 Hour", "ar": "قبل ساعة واحدة"},
+ "appo-reminder-select-option-90": {"en": "Before 1 Hour and 30 mins", "ar": "قبل ساعة و 30 دقيقة"},
+ "appo-reminder-select-option-120": {"en": "Before 2 Hours", "ar": "قبل ساعتين"},
+ "noDataAvailable": {"en": "No data available", "ar": " لا يوجد بيانات متاحة "},
"thename": {"en": "The Name", "ar": "الاسم"},
"noSearchResult": {"en": "No Search Result", "ar": "لا توجد نتيجة بحث"},
"selectFileSouse": {"en": "Select file souse", "ar": "حدد الملف"},
"gallery": {"en": "Gallery", "ar": "معرض الصور"},
"camera": {"en": "Camera", "ar": "كاميرا"},
- "med-report": {
- "en": "Medical Reports",
- "ar": "التقارير الطبية"
- },
- "new-med-report": {
- "en": "Requests",
- "ar": "الطلبات"
- },
- "requestReport":{
- "en":"Request a report",
- "ar":" طلب تقرير"
- },
- "confirm-msg-report": {
- "en": "Request for medical report?",
- "ar": "طلب تقرير طبي؟"
- },
- "successSendReport": {
- "en": "The request has been submitted successfully",
- "ar": "تم تنفيذ طلبك بنجاح"
- },
- "pulseTitle": {
- "en": "Heart rate",
- "ar": "معدل النبض بالدقيقة"
- },
- "systolic-lng": {
- "en": "Systolic",
- "ar": "الإنقباض"
- },
- "diastolic-lng": {
- "en": "Diastolic",
- "ar": "الإنبساط"
- },
- "policy-holder": {
- "en": "Policy Holder",
- "ar": "حامل بطاقة التأمين"
- },
- "policy-no": {
- "en": "Policy Number",
- "ar": "رقم سياسات"
- },
- "agree": {
- "en": "I agree, this is the correct information",
- "ar": "موافق، هذه المعلومات صحيحة"
- },
- "disagree": {
- "en": "No, this is not the correct information",
- "ar": "غير موافق، هذه المعلومات غير الصحيحة"
- },
- "expiry-date": {
- "en": "Expiry Date",
- "ar": "تاريخ انتهاء الصلاحية"
- },
- "class": {
- "en": "Class",
- "ar": "فئة"
- },
- "approval": {
- "en": "Approval",
- "ar": "موافقة"
- },
- "no-data": {
- "en": "No data found",
- "ar": "لاتوجد بيانات"
- },
- "insurance-details": {
- "en": "Insurance Details",
- "ar": "تفاصيل التأمين"
- },
- "nearest-hospital": {
- "en": "Nearest Hospital",
- "ar": "أقرب مستشفى"
- },
- "request-sent": {
- "en": "Request sent successfully",
- "ar": "تم إرسال الطلب بنجاح"
- },
- "message-sent": {
- "en": "Message sent successfully",
- "ar": "تم إرسال الرسالة بنجاح"
- },
- "sent-on": {
- "en": "Sent on",
- "ar": "أرسلت في"
- },
- "attach-insurace-image": {
- "en": "Attach insurance card image",
- "ar": "إرفاق صورة بطاقة التأمين"
- },
+ "med-report": {"en": "Medical Reports", "ar": "التقارير الطبية"},
+ "new-med-report": {"en": "Requests", "ar": "الطلبات"},
+ "requestReport": {"en": "Request a report", "ar": " طلب تقرير"},
+ "confirm-msg-report": {"en": "Request for medical report?", "ar": "طلب تقرير طبي؟"},
+ "successSendReport": {"en": "The request has been submitted successfully", "ar": "تم تنفيذ طلبك بنجاح"},
+ "pulseTitle": {"en": "Heart rate", "ar": "معدل النبض بالدقيقة"},
+ "systolic-lng": {"en": "Systolic", "ar": "الإنقباض"},
+ "diastolic-lng": {"en": "Diastolic", "ar": "الإنبساط"},
+ "policy-holder": {"en": "Policy Holder", "ar": "حامل بطاقة التأمين"},
+ "policy-no": {"en": "Policy Number", "ar": "رقم سياسات"},
+ "agree": {"en": "I agree, this is the correct information", "ar": "موافق، هذه المعلومات صحيحة"},
+ "disagree": {"en": "No, this is not the correct information", "ar": "غير موافق، هذه المعلومات غير الصحيحة"},
+ "expiry-date": {"en": "Expiry Date", "ar": "تاريخ انتهاء الصلاحية"},
+ "class": {"en": "Class", "ar": "فئة"},
+ "approval": {"en": "Approval", "ar": "موافقة"},
+ "no-data": {"en": "No data found", "ar": "لاتوجد بيانات"},
+ "insurance-details": {"en": "Insurance Details", "ar": "تفاصيل التأمين"},
+ "nearest-hospital": {"en": "Nearest Hospital", "ar": "أقرب مستشفى"},
+ "request-sent": {"en": "Request sent successfully", "ar": "تم إرسال الطلب بنجاح"},
+ "message-sent": {"en": "Message sent successfully", "ar": "تم إرسال الرسالة بنجاح"},
+ "sent-on": {"en": "Sent on", "ar": "أرسلت في"},
+ "attach-insurace-image": {"en": "Attach insurance card image", "ar": "إرفاق صورة بطاقة التأمين"},
"upload-without-image": {
"en": "You can still submit, if you don't have Insurance Image",
"ar": "لا يزال بإمكانك الإرسال ، إذا لم يكن لديك صورة تأمين"
},
"info-insur-cards": {
"en": "This service allows you to view all the insurance cards that recorded during your visits to Al Habib Medical Group in addition to:",
- "ar": "خدمة بطاقات التامين: هذه الخدمة تمكنك من الاطلاع على جميع بطاقات التامين والتي تم تسجيلها اثناء زياراتك لمجموعة الحبيب الطبية بالاضافة الى:"
- },
- "scan-now": {
- "en": "If you have a card / Document Scan now",
- "ar": "إذا كانت لديك بطاقة / مستند ارفقها الان"
- },
- "liveCare": {
- "en": "Live Care",
- "ar": "لايف كير"
- },
- "topBrands":{
- "en":"Top Brands",
- "ar":"اعلى العلامات التجارية"
- },
-
- "notifyMe":{
- "en":"notify me",
- "ar":"اعلمني"
- },
- "specification":{
- "en":"Specification",
- "ar":"تخصيص"
+ "ar":
+ "خدمة بطاقات التامين: هذه الخدمة تمكنك من الاطلاع على جميع بطاقات التامين والتي تم تسجيلها اثناء زياراتك لمجموعة الحبيب الطبية بالاضافة الى:"
},
+ "scan-now": {"en": "If you have a card / Document Scan now", "ar": "إذا كانت لديك بطاقة / مستند ارفقها الان"},
+ "liveCare": {"en": "Live Care", "ar": "لايف كير"},
+ "topBrands": {"en": "Top Brands", "ar": "اعلى العلامات التجارية"},
- "availability":{
- "en":"Availability",
- "ar":"التوفر"
- },
+ "notifyMe": {"en": "notify me", "ar": "اعلمني"},
+ "specification": {"en": "Specification", "ar": "تخصيص"},
- "quantitySize":{
- "en":"Quantity",
- "ar":"كميه"
- },
- "addToCart":{
- "en":"add to cart",
- "ar":"إضفة للسلة"
- },
- "buyNow":{
- "en":"buy now",
- "ar":"إشتري الان"
- },
- "quantityShortcut":{
- "en":"QTY",
- "ar":"كمية"
- },
+ "availability": {"en": "Availability", "ar": "التوفر"},
+ "quantitySize": {"en": "Quantity", "ar": "كميه"},
+ "addToCart": {"en": "add to cart", "ar": "إضفة للسلة"},
+ "buyNow": {"en": "buy now", "ar": "إشتري الان"},
+ "quantityShortcut": {"en": "QTY", "ar": "كمية"},
"pharmacyServiceTermsCondition": {
"en": "I agree with the terms of service and I adhere to them unconditionally",
@@ -1421,100 +1050,146 @@ const Map localizedValues = {
"orderLocation": {"en": "Location", "ar": "الموقع"},
"selectService": {"en": "Select Service", "ar": "حدد الخدمة"},
"coveredService": {"en": "Covered Service : ", "ar": " الخدمات المغطاة : "},
- "selectedService": {
- "en": "Selected Service : ",
- "ar": " الخدمات المختارة : "
- },
- "cancelOrderMsg": {
- "en": "Are you sure!! want to cancel this order",
- "ar": "هل أنت واثق!! تريد إلغاء هذا الطلب"
- },
- "processDoneSuccessfully": {
- "en": "Process Done Successfully",
- "ar": "تمت العملية بنجاح"
- },
- "selectHomeHealthCareServices": {
- "en": "Select Home Health Care Services",
- "ar": " حدد خدمات الرعاية الصحية المنزلية"
- },
+ "selectedService": {"en": "Selected Service : ", "ar": " الخدمات المختارة : "},
+ "cancelOrderMsg": {"en": "Are you sure!! want to cancel this order", "ar": "هل أنت واثق!! تريد إلغاء هذا الطلب"},
+ "processDoneSuccessfully": {"en": "Process Done Successfully", "ar": "تمت العملية بنجاح"},
+ "selectHomeHealthCareServices": {"en": "Select Home Health Care Services", "ar": " حدد خدمات الرعاية الصحية المنزلية"},
"description-vaccination": {"en": "Description", "ar": "وصف"},
"due-date": {"en": "Due date", "ar": "تاريخ الاستحقاق"},
- "valid-email": {
- "en": "Please enter valid email",
- "ar": "الرجاء إدخال عنوان بريد صحيح"
- },
- "confirm-send": {
- "en": "Send the child's schedule to the email?",
- "ar": "ارسال جدول التطعيمات الى بريدك الالكتروني؟"
- },
+ "valid-email": {"en": "Please enter valid email", "ar": "الرجاء إدخال عنوان بريد صحيح"},
+ "confirm-send": {"en": "Send the child's schedule to the email?", "ar": "ارسال جدول التطعيمات الى بريدك الالكتروني؟"},
"vaccination": {"en": "Vaccination", "ar": "جدول التطعيمات"},
"welcomeBack": {"en": "Welcome back", "ar": "مرحبا مرة أخرى"},
- "updated-email": {
- "en": "Updated email successfully",
- "ar": "تم تحديث البريد الالكتروني"
- },
+ "updated-email": {"en": "Updated email successfully", "ar": "تم تحديث البريد الالكتروني"},
- "view-list-children": {
- "en": "View List of Children",
- "ar": "عرض قائمة الأطفال"
- },
- "trackDeliveryDriver": {
- "en": "Track Delivery Driver",
- "ar": "trackDeliveryDriver"
- },
- "covidTest": {
- "en": "COVID-19 TEST",
- "ar": "فحص كورونا"
- },
- "driveThru": {
- "en": "Drive-Thru",
- "ar": "من السيارة"
- },
+ "view-list-children": {"en": "View List of Children", "ar": "عرض قائمة الأطفال"},
+ "trackDeliveryDriver": {"en": "Track Delivery Driver", "ar": "trackDeliveryDriver"},
+ "covidTest": {"en": "COVID-19 TEST", "ar": "فحص كورونا"},
+ "driveThru": {"en": "Drive-Thru", "ar": "من السيارة"},
"NearestErDesc": {
"en": "\nThis service Displays nearest branch\n among all the branches of All Habib \n medical Group based on your current Location",
"ar": "\nتعرض هذه الخدمة أقرب فرع\n من بين جميع فروع مجموعة \nالحبيب الطبية بناءً على موقعك الحالي."
},
- "NearestEr": {
- "en": "Nearest ER",
- "ar": "أقرب ER"
- },
+ "NearestEr": {"en": "Nearest ER", "ar": "أقرب ER"},
"infoCMC": {
- "en": "Through this service, you can request a set of tests that help you and your doctor to understand the current health condition and then identify potential risks.",
+ "en":
+ "Through this service, you can request a set of tests that help you and your doctor to understand the current health condition and then identify potential risks.",
"ar": "من خلال هذه الخدمة يمكنك طلب مجموعة من الفحوصات التي تساعدك وتساعد طبيبك في فهم حالتك الصحية الحالية ومن ثم تحديد المخاطر المحتملة"
},
"instructionAgree": {
- "en": "This monthly Health Summary Report reflects the health indicators and analysis results of the latest visits. Please note that this will be sent automatically from the system and it's not considered as an official report so no medical decisions should be taken based on it.",
- "ar": "هذا ملخص التقرير الصحي الشهري و الذي يسرد المؤشرات الصحية و نتائج التحاليل لأخر الزيارات. يرجى ملاحظة أن هذا التقرير هو تقرير يتم ارساله بشكل آلي من النظام و لا يعتبر رسمي و لا تؤخذ عليه أي قرارات طبية"
- },
- "reqId": {
- "en": "Request ID:",
- "ar": " رقم الطلب"
+ "en":
+ "This monthly Health Summary Report reflects the health indicators and analysis results of the latest visits. Please note that this will be sent automatically from the system and it's not considered as an official report so no medical decisions should be taken based on it.",
+ "ar":
+ "هذا ملخص التقرير الصحي الشهري و الذي يسرد المؤشرات الصحية و نتائج التحاليل لأخر الزيارات. يرجى ملاحظة أن هذا التقرير هو تقرير يتم ارساله بشكل آلي من النظام و لا يعتبر رسمي و لا تؤخذ عليه أي قرارات طبية"
},
+ "reqId": {"en": "Request ID:", "ar": " رقم الطلب"},
+ "RRT-orders-log": {"en": "Orders Log", "ar": "سجل الطلبات"},
+ "blood-sugar": {"en": "Blood Sugar", "ar": "سكر الدم"},
- "covid19_driveThrueTest": {
- "en": "'Covid-19- Drive-Thru Test'",
- "ar": "Covid-19- الفحص من خلال القيادة"
- },
- "E-Referral": {
- "en": "'E-Referral'",
- "ar": "الإحالة الإلكترونية"
- },
- "childName": {
- "en": "'CHILD NAME'",
- "ar": "إسم الطفل"
- },
- "recordDeleted": {
- "en": "'Record Deleted'",
- "ar": "تم حذف السجل"
- },
+ "covid19_driveThrueTest": {"en": "'Covid-19- Drive-Thru Test'", "ar": "Covid-19- الفحص من خلال القيادة"},
+ "E-Referral": {"en": "'E-Referral'", "ar": "الإحالة الإلكترونية"},
+ "childName": {"en": "'CHILD NAME'", "ar": "إسم الطفل"},
+ "recordDeleted": {"en": "'Record Deleted'", "ar": "تم حذف السجل"},
"msg_email_address_up_to_date": {
"en": "Please ensure that the email address is up-to-date and process to view the schedule",
"ar": "يرجى التأكد من أن عنوان البريد الإلكتروني محدث وأن العملية لعرض الجدول الزمني"
},
- "add-new-child": {"en" : "ADD NEW CHILD", "ar": "إضافة طفل جديد"},
- "visit": {"en" : "Visit", "ar": "الزيارة"},
- "send-child-email-msg": {"en" : "Send the child's schedule to the email", "ar": "أرسل جدول الطفل إلى البريد الإلكتروني"},
- "vaccination-add-child-msg": {"en" : "Add the child's information below to receive the schedule of vaccinations.", "ar": "أضف معلومات الطفل أدناه للحصول على جدول التطعيمات."},
- "child_added_successfully": {"en" : "Child added successfully", "ar": "تمت إضافة الطفل بنجاح"},
+ "add-new-child": {"en": "ADD NEW CHILD", "ar": "إضافة طفل جديد"},
+ "visit": {"en": "Visit", "ar": "الزيارة"},
+ "send-child-email-msg": {"en": "Send the child's schedule to the email", "ar": "أرسل جدول الطفل إلى البريد الإلكتروني"},
+ "vaccination-add-child-msg": {
+ "en": "Add the child's information below to receive the schedule of vaccinations.",
+ "ar": "أضف معلومات الطفل أدناه للحصول على جدول التطعيمات."
+ },
+ "child_added_successfully": {"en": "Child added successfully", "ar": "تمت إضافة الطفل بنجاح"},
+ "bloodSugar": {"en": "Blood", "ar": "السكر في الدم"},
+ "sugar": {"en": "Sugar", "ar": ""},
+ "bloodCholesterol": {"en": "Blood", "ar": " الكولسترول في الدم"},
+
+ "cholesterol": {"en": "Cholesterol", "ar": ""},
+ "triglycerides": {"en": "Triglycerides", "ar": "الدهون الثلاثية"},
+
+ "fatInBlood": {"en": "Fat In Blood", "ar": ""},
+ "convertFrom": {"en": "Convert From", "ar": "تحويل من"},
+ "calculate": {"en": "calculate", "ar": "حساب"},
+ "enterReadingValue": {"en": "Enter the reading value", "ar": "ادخل القيمة"},
+ "result": {"en": "Result", "ar": "النتيجة"},
+ "bloodSugarConversion": {"en": "Blood Sugar Conversion", "ar": "السكر في الدم"},
+ "convertBloodSugarStatement": {
+ "en": "Convert blood sugar/glucose from mmol/l (UK standard) to mg/dlt (US standard) and vice versa.",
+ "ar": "تحويل مستوى السكر في الدم من مليمول/ لتر (مقياس المملكة المتحدة) الى ملغ/ ديسيلتر (مقياس الولايات المتحدة) والعكس"
+ },
+ "convertCholesterolStatement": {
+ "en": "Convert blood cholesterol from\n mmol/l to mg/dlt and vice versa.",
+ "ar": "تحويل مستوى الكولسترول في الدم من مليمول/ لتر (مقياس المملكة المتحدة) الى ملغ/ ديسيلتر (مقياس الولايات المتحدة) والعكس"
+ },
+ "triglyceridesConvertStatement": {
+ "en": "Convert Triglycerides from mmol/l to mg/dlt and vice versa.",
+ "ar": "تحويل مستوى الدهون الثلاثية في الدم من مليمول/ لتر (مقياس المملكة المتحدة) الى ملغ/ ديسيلتر (مقياس الولايات المتحدة) والعكس"
+ },
+ "my-tracker": {"en": "My Tracker", "ar": "قراءاتي"},
+ "weekly": {"en": "Weekly", "ar": "أسبوعي"},
+ "monthly": {"en": "Monthly", "ar": "شهري"},
+ "yearly": {"en": "Yearly", "ar": "سنوي"},
+ "measured": {"en": "Measured", "ar": "قياس"},
+ "sugar-add": {"en": "Enter Blood Sugar Value", "ar": "أدخل قيمة قراءة السكر"},
+ "other": {"en": "Other", "ar": "آخر"},
+ "measure-unit": {"en": "Measure unit", "ar": "وحدة القياس"},
+ "measure-time": {"en": "Measure time", "ar": "وقت القياس"},
+ "update": {"en": "Update", "ar": "تعديل"},
+ "bloodD-enter-desc": {
+ "en": "Enter the required information, In order to register for Blood Donation Service",
+ "ar": "أدخل المعلومات المطلوبة ، للتسجيل في خدمة التبرع بالدم"
+ },
+ "viewTermsConditions": {"en": "To view the terms and conditions", "ar": "لعرض الشروط والأحكام"},
+ "WalkinAppo": {"en": "Hospital Visit Appointment", "ar": "موعد زيارة للمستشفى"},
+ "videoAppo": {"en": "Video Call Appointment", "ar": "موعد اتصال فيديو"},
+ // "visit": {"en" : "Visit", "ar": "الزيارة"},
+ "weight-add": {"en": "Enter Weight Value", "ar": "أدخل الوزن "},
+ "systolic-add": {"en": "Enter Systolic Value", "ar": "أدخل قيمة الإنقباض "},
+ "diastolic-add": {"en": "Enter Diastolic Value", "ar": "أدخل قيمة الإنبساط "},
+ "cmc-heading": {"en": "Comprehensive Medical Checkup", "ar": "فحص طبي شامل"},
+ "today": {"en": "Today", "ar": "اليوم"},
+ "week": {"en": "Week", "ar": "أسبوع"},
+ "month": {"en": "Month", "ar": "شهر"},
+ "h2o-amount-of-water": {"en": "Enter the amount of water:", "ar": "ادخل كمية الماء:"},
+ "update-user": {"en": "Update Information", "ar": "تحديث بيانات"},
+ "editname": {"en": "Enter the name here", "ar": "أدخل الاسم هنا"},
+ "activity-level": {"en": "Activity Level", "ar": "مستوى النشاط"},
+ "light-active": {"en": "Lightly Active", "ar": " قليل النشاط"},
+ "mod-active": {"en": "Moderately Active", "ar": "متوسط النشاط"},
+ "reminder-label": {"en": "Activate the reminder of drink water?", "ar": "تفعيل خاصية تذكير شرب الماء؟"},
+ "reminder-times-label": {"en": "How many times do you want to be reminded?", "ar": "عدد مرات التذكير"},
+ "times": {"en": "Times", "ar": "مرات"},
+ "WaterCalculate": {"en": "Save", "ar": "حفظ"},
+ "notif-title": {"en": "Water Reminder", "ar": "تذكير"},
+ "notif-text": {"en": " Don't forget to drink water.", "ar": "لا تنسى شرب الماء"},
+ "custom": {"en": "Custom", "ar": "خاص"},
+ "undo": {"en": "Undo", "ar": "تراجع"},
+ "drinking": {"en": "Drinkning", "ar": "الشرب"},
+ "remaining": {"en": "Remaining", "ar": "المتبقي"},
+ "taken": {"en": "Taken", "ar": " مأخوذ"},
+ "ml": {"en": "ml", "ar": "مل"},
+ "l": {"en": "L", "ar": "لتر"},
+ "custom-label": {"en": "Enter amount", "ar": "أدخل كمية الماء"},
+ "custom-label-in-litres": {"en": "Enter amount in liters", "ar": "أدخل الكمية باللتر"},
+ "custom-label-in-mililitres": {"en": "Enter amount in millilitres", "ar": "أدخل الكمية بالملليتر"},
+ "amount": {"en": "Amount", "ar": "الكمية"},
+ "target-reach": {"en": "You have reached the target for the day!", "ar": "لقد حققت هدفك اليومي! مبروك"},
+ "week-header": {"en": "Water consumed in a week", "ar": "معدل شرب الماء خلال الاسبوع"},
+ "month-header": {"en": "Water consumed in a month", "ar": "معدل شرب الماء خلال الشهر"},
+ "notif-permission-title": {"en": "Could not set the water reminders", "ar": "لا يمكن ضبط اشعار شرب الماء"},
+ "notif-permission-msg": {
+ "en": "To recieve water reminders, please turn on notifications in the system settings",
+ "ar": "الرجاء تفعيل الاشعارات في الاعدادات"
+ },
+ "verification_message_code": {"en": "Please enter verification code", "ar": "الرجاء إدخال رمز التحقق"},
+ "sms_code": {"en": "Enter SMS Code here", "ar": "أدخل رمز التحقق هنا"},
+ "code_failure": {"en": "Didn’t received the code", "ar": "لم أستلم رمز التحقق"},
+ "resend": {"en": "Resend", "ar": "إعادة إرسال"},
+ "submitncontinue": {"en": "Submit and continue", "ar": "إرسال ومتابعة"},
+ "areyousure": {"en": "Are you sure you want to Add", "ar": "هل أنت متأكد أنك تريد إضافة"},
+ "preferredunit": {"en": "Select the preferred unit", "ar": "اختر الوحدة المفضلة"},
+ "select-unit": {"en": "Select unit", "ar": "اختر وحدة القياس"}
};
diff --git a/lib/config/shared_pref_kay.dart b/lib/config/shared_pref_kay.dart
index 458040bb..0e56e30b 100644
--- a/lib/config/shared_pref_kay.dart
+++ b/lib/config/shared_pref_kay.dart
@@ -26,3 +26,4 @@ const WEATHER = 'weather';
const BLOOD_TYPE = 'blood-type';
const NOTIFICATION_COUNT = 'notification-count';
const PHARMACY_SELECTED_ADDRESS = 'selected-address';
+const PHARMACY_AUTORZIE_TOKEN = 'PHARMACY_AUTORZIE_TOKEN';
diff --git a/lib/core/enum/Ambulate.dart b/lib/core/enum/Ambulate.dart
index f8b2e8be..e4714cb2 100644
--- a/lib/core/enum/Ambulate.dart
+++ b/lib/core/enum/Ambulate.dart
@@ -1,3 +1,4 @@
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter/cupertino.dart';
enum Ambulate { Wheelchair, Walker, Stretcher, None }
@@ -6,19 +7,19 @@ extension SelectedAmbulate on Ambulate {
String getAmbulateTitle(BuildContext context) {
switch (this) {
case Ambulate.Wheelchair:
- return 'Wheelchair';
+ return TranslationBase.of(context).wheelchair;
break;
case Ambulate.Walker:
- return 'Walker';
+ return TranslationBase.of(context).walker;
break;
case Ambulate.Stretcher:
- return 'Stretcher';
+ return TranslationBase.of(context).stretcher;
break;
case Ambulate.None:
- return 'None';
+ return TranslationBase.of(context).none;
break;
}
- return 'None';
+ return TranslationBase.of(context).none;
}
int selectAmbulateNumber() {
diff --git a/lib/core/model/AlHabibMedicalService/H2O/user_detail_model.dart b/lib/core/model/AlHabibMedicalService/H2O/user_detail_model.dart
new file mode 100644
index 00000000..bb100219
--- /dev/null
+++ b/lib/core/model/AlHabibMedicalService/H2O/user_detail_model.dart
@@ -0,0 +1,104 @@
+class UserDetailModel {
+ int userID;
+ int patientID;
+ int patientType;
+ bool patientOutSA;
+ String firstName;
+ String middleName;
+ String lastName;
+ String firstNameN;
+ String middleNameN;
+ String lastNameN;
+ String identificationNo;
+ String mobile;
+ String emailID;
+ String zipCode;
+ String dOB;
+ String gender;
+ int activityID;
+ String createdDate;
+ double height;
+ double weight;
+ bool isHeightInCM;
+ bool isWeightInKG;
+ bool isNotificationON;
+
+ UserDetailModel(
+ {this.userID,
+ this.patientID,
+ this.patientType,
+ this.patientOutSA,
+ this.firstName,
+ this.middleName,
+ this.lastName,
+ this.firstNameN,
+ this.middleNameN,
+ this.lastNameN,
+ this.identificationNo,
+ this.mobile,
+ this.emailID,
+ this.zipCode,
+ this.dOB,
+ this.gender,
+ this.activityID,
+ this.createdDate,
+ this.height,
+ this.weight,
+ this.isHeightInCM,
+ this.isWeightInKG,
+ this.isNotificationON});
+
+ UserDetailModel.fromJson(Map json) {
+ userID = json['UserID'];
+ patientID = json['PatientID'];
+ patientType = json['PatientType'];
+ patientOutSA = json['PatientOutSA'];
+ firstName = json['FirstName'];
+ middleName = json['MiddleName'];
+ lastName = json['LastName'];
+ firstNameN = json['FirstNameN'];
+ middleNameN = json['MiddleNameN'];
+ lastNameN = json['LastNameN'];
+ identificationNo = json['IdentificationNo'];
+ mobile = json['Mobile'];
+ emailID = json['EmailID'];
+ zipCode = json['ZipCode'];
+ dOB = json['DOB'];
+ gender = json['Gender'];
+ activityID = json['ActivityID'];
+ createdDate = json['CreatedDate'];
+ height = json['Height'];
+ weight = json['Weight'];
+ isHeightInCM = json['IsHeightInCM'];
+ isWeightInKG = json['IsWeightInKG'];
+ isNotificationON = json['IsNotificationON'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['UserID'] = this.userID;
+ data['PatientID'] = this.patientID;
+ data['PatientType'] = this.patientType;
+ data['PatientOutSA'] = this.patientOutSA;
+ data['FirstName'] = this.firstName;
+ data['MiddleName'] = this.middleName;
+ data['LastName'] = this.lastName;
+ data['FirstNameN'] = this.firstNameN;
+ data['MiddleNameN'] = this.middleNameN;
+ data['LastNameN'] = this.lastNameN;
+ data['IdentificationNo'] = this.identificationNo;
+ data['Mobile'] = this.mobile;
+ data['EmailID'] = this.emailID;
+ data['ZipCode'] = this.zipCode;
+ data['DOB'] = this.dOB;
+ data['Gender'] = this.gender;
+ data['ActivityID'] = this.activityID;
+ data['CreatedDate'] = this.createdDate;
+ data['Height'] = this.height;
+ data['Weight'] = this.weight;
+ data['IsHeightInCM'] = this.isHeightInCM;
+ data['IsWeightInKG'] = this.isWeightInKG;
+ data['IsNotificationON'] = this.isNotificationON;
+ return data;
+ }
+}
diff --git a/lib/core/model/AlHabibMedicalService/H2O/user_detail_request_model.dart b/lib/core/model/AlHabibMedicalService/H2O/user_detail_request_model.dart
new file mode 100644
index 00000000..9d23d383
--- /dev/null
+++ b/lib/core/model/AlHabibMedicalService/H2O/user_detail_request_model.dart
@@ -0,0 +1,124 @@
+class UserDetailRequestModel {
+ String activityID;
+ int channel;
+ int deviceTypeID;
+ String dOB;
+ String email;
+ String firstName;
+ String gender;
+ String generalid;
+ double height;
+ String identificationNo;
+ String iPAdress;
+ bool isDentalAllowedBackend;
+ bool isHeightInCM;
+ bool isNotificationOn;
+ bool isWeightInKG;
+ int languageID;
+ String lastName;
+ String middleName;
+ String mobileNumber;
+ int patientID;
+ int patientOutSA;
+ int patientType;
+ int patientTypeID;
+ String sessionID;
+ String tokenID;
+ double versionID;
+ double weight;
+ String zipCode;
+
+ UserDetailRequestModel(
+ {this.activityID,
+ this.channel,
+ this.deviceTypeID,
+ this.dOB,
+ this.email,
+ this.firstName,
+ this.gender,
+ this.generalid,
+ this.height,
+ this.identificationNo,
+ this.iPAdress,
+ this.isDentalAllowedBackend,
+ this.isHeightInCM,
+ this.isNotificationOn,
+ this.isWeightInKG,
+ this.languageID,
+ this.lastName,
+ this.middleName,
+ this.mobileNumber,
+ this.patientID,
+ this.patientOutSA,
+ this.patientType,
+ this.patientTypeID,
+ this.sessionID,
+ this.tokenID,
+ this.versionID,
+ this.weight,
+ this.zipCode});
+
+ UserDetailRequestModel.fromJson(Map json) {
+ activityID = json['ActivityID'];
+ channel = json['Channel'];
+ deviceTypeID = json['DeviceTypeID'];
+ dOB = json['DOB'];
+ email = json['Email'];
+ firstName = json['FirstName'];
+ gender = json['Gender'];
+ generalid = json['generalid'];
+ height = json['Height'];
+ identificationNo = json['IdentificationNo'];
+ iPAdress = json['IPAdress'];
+ isDentalAllowedBackend = json['isDentalAllowedBackend'];
+ isHeightInCM = json['IsHeightInCM'];
+ isNotificationOn = json['isNotificationOn'];
+ isWeightInKG = json['IsWeightInKG'];
+ languageID = json['LanguageID'];
+ lastName = json['LastName'];
+ middleName = json['MiddleName'];
+ mobileNumber = json['MobileNumber'];
+ patientID = json['PatientID'];
+ patientOutSA = json['PatientOutSA'];
+ patientType = json['PatientType'];
+ patientTypeID = json['PatientTypeID'];
+ sessionID = json['SessionID'];
+ tokenID = json['TokenID'];
+ versionID = json['VersionID'];
+ weight = json['Weight'];
+ zipCode = json['ZipCode'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['ActivityID'] = this.activityID;
+ data['Channel'] = this.channel;
+ data['DeviceTypeID'] = this.deviceTypeID;
+ data['DOB'] = this.dOB;
+ data['Email'] = this.email;
+ data['FirstName'] = this.firstName;
+ data['Gender'] = this.gender;
+ data['generalid'] = this.generalid;
+ data['Height'] = this.height;
+ data['IdentificationNo'] = this.identificationNo;
+ data['IPAdress'] = this.iPAdress;
+ data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
+ data['IsHeightInCM'] = this.isHeightInCM;
+ data['isNotificationOn'] = this.isNotificationOn;
+ data['IsWeightInKG'] = this.isWeightInKG;
+ data['LanguageID'] = this.languageID;
+ data['LastName'] = this.lastName;
+ data['MiddleName'] = this.middleName;
+ data['MobileNumber'] = this.mobileNumber;
+ data['PatientID'] = this.patientID;
+ data['PatientOutSA'] = this.patientOutSA;
+ data['PatientType'] = this.patientType;
+ data['PatientTypeID'] = this.patientTypeID;
+ data['SessionID'] = this.sessionID;
+ data['TokenID'] = this.tokenID;
+ data['VersionID'] = this.versionID;
+ data['Weight'] = this.weight;
+ data['ZipCode'] = this.zipCode;
+ return data;
+ }
+}
\ No newline at end of file
diff --git a/lib/core/model/my_trakers/blood_sugar/DiabtecPatientResult.dart b/lib/core/model/my_trakers/blood_sugar/DiabtecPatientResult.dart
index 5b95409e..86263155 100644
--- a/lib/core/model/my_trakers/blood_sugar/DiabtecPatientResult.dart
+++ b/lib/core/model/my_trakers/blood_sugar/DiabtecPatientResult.dart
@@ -17,7 +17,7 @@ class DiabtecPatientResult {
int patientID;
var remark;
var resultDesc;
- int resultValue;
+ dynamic resultValue;
String unit;
var weekAverageResult;
String weekDesc;
diff --git a/lib/core/model/my_trakers/blood_sugar/WeekDiabtectResultAverage.dart b/lib/core/model/my_trakers/blood_sugar/WeekDiabtectResultAverage.dart
index c18e5433..3b1a8d9c 100644
--- a/lib/core/model/my_trakers/blood_sugar/WeekDiabtectResultAverage.dart
+++ b/lib/core/model/my_trakers/blood_sugar/WeekDiabtectResultAverage.dart
@@ -1,7 +1,7 @@
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
class WeekDiabtectResultAverage {
- int dailyAverageResult;
+ dynamic dailyAverageResult;
DateTime dateChart;
WeekDiabtectResultAverage({this.dailyAverageResult, this.dateChart});
diff --git a/lib/core/service/AlHabibMedicalService/H2O_service.dart b/lib/core/service/AlHabibMedicalService/H2O_service.dart
index c65221c5..9483bc31 100644
--- a/lib/core/service/AlHabibMedicalService/H2O_service.dart
+++ b/lib/core/service/AlHabibMedicalService/H2O_service.dart
@@ -1,5 +1,7 @@
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/insert_user_activity_request_model.dart';
+import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/user_detail_model.dart';
+import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/user_detail_request_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/user_progress_for_month_data_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/user_progress_for_today_data_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/user_progress_for_week_data_model.dart';
@@ -10,8 +12,66 @@ class H2OService extends BaseService {
List userProgressForTodayDataList = List();
List userProgressForWeekDataList = List();
List userProgressForMonthDataList = List();
- UserProgressRequestModel userProgressRequestModel =
- UserProgressRequestModel();
+ UserProgressRequestModel userProgressRequestModel = UserProgressRequestModel();
+
+ UserDetailModel userDetailModel = UserDetailModel();
+
+ Future getUserDetail() async {
+ userProgressRequestModel.progress = 1;
+ userProgressRequestModel.mobileNumber = user.mobileNumber.substring(1);
+ userProgressRequestModel.identificationNo = user.patientIdentificationNo;
+
+ hasError = false;
+ await baseAppClient.post(H2O_GET_USER_DETAIL, onSuccess: (dynamic response, int statusCode) {
+ userDetailModel = UserDetailModel.fromJson(response["UserDetailData_New"]);
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: userProgressRequestModel.toJson());
+ }
+
+ Future updateUserDetail(UserDetailModel userDetail) async {
+ userProgressRequestModel.progress = 1;
+ userProgressRequestModel.mobileNumber = user.mobileNumber.substring(1);
+ userProgressRequestModel.identificationNo = user.patientIdentificationNo;
+
+ UserDetailRequestModel _requestModel = UserDetailRequestModel();
+
+ _requestModel.activityID = userDetail.activityID.toString();
+ _requestModel.channel = userProgressRequestModel.channel;
+ _requestModel.dOB = userDetail.dOB;
+ _requestModel.deviceTypeID = userProgressRequestModel.deviceTypeID;
+ _requestModel.email = userDetail.emailID;
+ _requestModel.firstName = userDetail.firstName;
+ _requestModel.gender = userDetail.gender;
+ _requestModel.height = userDetail.height;
+ _requestModel.iPAdress = userProgressRequestModel.iPAdress;
+ _requestModel.identificationNo = userProgressRequestModel.identificationNo;
+ _requestModel.isHeightInCM = userDetail.isHeightInCM;
+ _requestModel.isWeightInKG = userDetail.isWeightInKG;
+ _requestModel.languageID = userProgressRequestModel.languageID;
+ _requestModel.mobileNumber = userProgressRequestModel.mobileNumber;
+ _requestModel.patientID = userProgressRequestModel.patientID;
+ _requestModel.patientOutSA = userProgressRequestModel.patientOutSA;
+ _requestModel.patientType = userProgressRequestModel.patientType;
+ _requestModel.patientTypeID = userProgressRequestModel.patientOutSA;
+ _requestModel.sessionID = userProgressRequestModel.sessionID;
+ _requestModel.tokenID = userProgressRequestModel.tokenID;
+ _requestModel.versionID = userProgressRequestModel.versionID;
+ _requestModel.zipCode = userDetail.zipCode;
+ _requestModel.weight = userDetail.weight;
+ _requestModel.generalid = userProgressRequestModel.generalid;
+ _requestModel.isDentalAllowedBackend = userProgressRequestModel.isDentalAllowedBackend;
+ _requestModel.isNotificationOn = userDetail.isNotificationON;
+
+ hasError = false;
+ await baseAppClient.post(H2O_UPDATE_USER_DETAIL, onSuccess: (dynamic response, int statusCode) {
+ userDetailModel = userDetail;
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: _requestModel.toJson());
+ }
Future getUserProgressForTodayData() async {
userProgressRequestModel.progress = 1;
@@ -19,12 +79,10 @@ class H2OService extends BaseService {
userProgressRequestModel.identificationNo = user.patientIdentificationNo;
hasError = false;
- await baseAppClient.post(H2O_GET_USER_PROGRESS,
- onSuccess: (dynamic response, int statusCode) {
+ await baseAppClient.post(H2O_GET_USER_PROGRESS, onSuccess: (dynamic response, int statusCode) {
userProgressForTodayDataList.clear();
response['UserProgressForTodayData'].forEach((progressData) {
- userProgressForTodayDataList
- .add(UserProgressForTodayDataModel.fromJson(progressData));
+ userProgressForTodayDataList.add(UserProgressForTodayDataModel.fromJson(progressData));
});
}, onFailure: (String error, int statusCode) {
hasError = true;
@@ -38,16 +96,15 @@ class H2OService extends BaseService {
userProgressRequestModel.identificationNo = super.user.patientIdentificationNo;
hasError = false;
- await baseAppClient.post(H2O_GET_USER_PROGRESS,
- onSuccess: (dynamic response, int statusCode) {
- userProgressForTodayDataList.clear();
- response['UserProgressForWeekData'].forEach((hospital) {
- userProgressForWeekDataList.add(UserProgressForWeekDataModel.fromJson(hospital));
- });
- }, onFailure: (String error, int statusCode) {
- hasError = true;
- super.error = error;
- }, body: userProgressRequestModel.toJson());
+ await baseAppClient.post(H2O_GET_USER_PROGRESS, onSuccess: (dynamic response, int statusCode) {
+ userProgressForWeekDataList.clear();
+ response['UserProgressForWeekData'].forEach((hospital) {
+ userProgressForWeekDataList.add(UserProgressForWeekDataModel.fromJson(hospital));
+ });
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: userProgressRequestModel.toJson());
}
Future getUserProgressForMonthData() async {
@@ -56,8 +113,7 @@ class H2OService extends BaseService {
userProgressRequestModel.identificationNo = super.user.patientIdentificationNo;
hasError = false;
- await baseAppClient.post(H2O_GET_USER_PROGRESS,
- onSuccess: (dynamic response, int statusCode) {
+ await baseAppClient.post(H2O_GET_USER_PROGRESS, onSuccess: (dynamic response, int statusCode) {
userProgressForMonthDataList.clear();
response['UserProgressForMonthData'].forEach((hospital) {
userProgressForMonthDataList.add(UserProgressForMonthDataModel.fromJson(hospital));
@@ -68,22 +124,33 @@ class H2OService extends BaseService {
}, body: userProgressRequestModel.toJson());
}
-
-
-
Future insertUserActivity(InsertUserActivityRequestModel insertUserActivityRequestModel) async {
+ hasError = false;
+ await baseAppClient.post(H2O_INSERT_USER_ACTIVITY, onSuccess: (dynamic response, int statusCode) {
+ userProgressForTodayDataList.clear();
+ response['UserProgressForTodayData'].forEach((progressData) {
+ userProgressForTodayDataList.add(UserProgressForTodayDataModel.fromJson(progressData));
+ });
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: insertUserActivityRequestModel.toJson());
+ }
+
+ Future undoUserActivity() async {
+ userProgressRequestModel.progress = 1;
+ userProgressRequestModel.mobileNumber = user.mobileNumber.substring(1);
+ userProgressRequestModel.identificationNo = user.patientIdentificationNo;
hasError = false;
- await baseAppClient.post(H2O_INSERT_USER_ACTIVITY,
- onSuccess: (dynamic response, int statusCode) {
- userProgressForTodayDataList.clear();
- response['UserProgressForTodayData'].forEach((progressData) {
- userProgressForTodayDataList
- .add(UserProgressForTodayDataModel.fromJson(progressData));
- });
- }, onFailure: (String error, int statusCode) {
- hasError = true;
- super.error = error;
- }, body: insertUserActivityRequestModel.toJson());
+ await baseAppClient.post(H2O_UNDO_USER_ACTIVITY, onSuccess: (dynamic response, int statusCode) {
+ userProgressForTodayDataList.clear();
+ response['UserProgressForTodayData'].forEach((progressData) {
+ userProgressForTodayDataList.add(UserProgressForTodayDataModel.fromJson(progressData));
+ });
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: userProgressRequestModel.toJson());
}
}
diff --git a/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart b/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
index da12b48b..803a80f0 100644
--- a/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
+++ b/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
@@ -43,7 +43,7 @@ class CustomerAddressesService extends BaseService {
'fields':'addresses'
};
hasError = false;
- await baseAppClient.get("$GET_CUSTOMER_ADDRESSES${customerInfo.customerId}",
+ await baseAppClient.getPharmacy("$GET_CUSTOMER_ADDRESSES${customerInfo.customerId}",
onSuccess: (dynamic response, int statusCode) {
addressesList.clear();
response["customers"][0]["addresses"].forEach((data) {
@@ -63,7 +63,7 @@ class CustomerAddressesService extends BaseService {
};
hasError = false;
- await baseAppClient.get(GET_CUSTOMER_INFO,
+ await baseAppClient.getPharmacy(GET_CUSTOMER_INFO,
onSuccess: (dynamic response, int statusCode) {
customerInfo= CustomerInfo.fromJson(response);
}, onFailure: (String error, int statusCode) {
diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart
index cbe2410d..a11f9169 100644
--- a/lib/core/service/client/base_app_client.dart
+++ b/lib/core/service/client/base_app_client.dart
@@ -195,7 +195,7 @@ class BaseAppClient {
get(String endPoint,
{Function(dynamic response, int statusCode) onSuccess,
Function(String error, int statusCode) onFailure,
- Map queryParams,
+ Map queryParams,
bool isExternal = false}) async {
String url;
if (isExternal) {
@@ -236,19 +236,41 @@ class BaseAppClient {
{Function(dynamic response, int statusCode) onSuccess,
Function(String error, int statusCode) onFailure,
bool isAllowAny = false,
- Map queryParams}) async {
- String url = PHARMACY_BASE_URL + endPoint;
+ bool isExternal = false,
+ Map queryParams}) async {
+
+ String url;
+ if (isExternal) {
+ url = endPoint;
+ } else {
+ url = PHARMACY_BASE_URL + endPoint;
+ }
if (queryParams != null) {
String queryString = Uri(queryParameters: queryParams).query;
url += '?' + queryString;
}
print("URL : $url");
+ var token = await sharedPref.getString(PHARMACY_AUTORZIE_TOKEN);
+ var user = await sharedPref.getObject(USER_PROFILE);
+
+ Map test = {
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json',
+ 'Authorization': token,
+ 'Mobilenumber': user['MobileNumber'].toString(),
+ 'Statictoken': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9',
+ 'Username': user['PatientID'].toString(),
+ };
if (await Utils.checkConnection()) {
final response = await http.get(url.trim(), headers: {
'Content-Type': 'application/json',
- 'Accept': 'application/json'
+ 'Accept': 'application/json',
+ 'Authorization': token,
+ 'Mobilenumber': user['MobileNumber'].toString(),
+ 'Statictoken': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9',
+ 'Username': user['PatientID'].toString(),
});
final int statusCode = response.statusCode;
print("statusCode :$statusCode");
diff --git a/lib/core/service/medical/BloodPressureService.dart b/lib/core/service/medical/BloodPressureService.dart
index f2681191..82130750 100644
--- a/lib/core/service/medical/BloodPressureService.dart
+++ b/lib/core/service/medical/BloodPressureService.dart
@@ -68,6 +68,19 @@ class BloodPressureService extends BaseService {
super.error = error;
}, body: Map());
}
+ Future sendReportByEmail() async {
+ hasError = false;
+ super.error = "";
+ Map body = Map();
+ body['isDentalAllowedBackend'] = false;
+ body['to'] = user.emailAddress;
+ await baseAppClient.post(SEND_AVERAGE_BLOOD_PRESSURE_REPORT,
+ onSuccess: (response, statusCode) async {},
+ onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: body);
+ }
addDiabtecResult(
{String bloodPressureDate,
@@ -93,4 +106,43 @@ class BloodPressureService extends BaseService {
super.error = error;
}, body: body);
}
+
+ updateDiabtecResult(
+ {String bloodPressureDate,
+ String diastolicPressure,
+ String systolicePressure,
+ int measuredArm}) async {
+ hasError = false;
+ super.error = "";
+
+ Map body = Map();
+ body['BloodPressureDate'] = bloodPressureDate;
+ body['DiastolicPressure'] = diastolicPressure;
+ body['SystolicePressure'] = systolicePressure;
+ body['MeasuredArm'] ='$measuredArm';
+ body['isDentalAllowedBackend'] = false;
+
+ await baseAppClient.post(UPDATE_BLOOD_PRESSURE_RESULT,
+ onSuccess: (response, statusCode) async {
+
+ },
+ onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: body);
+ }
+
+ Future deactivateDiabeticStatus({int lineItemNo }) async {
+ hasError = false;
+ super.error = "";
+ Map body = Map();
+ body['isDentalAllowedBackend'] = false;
+ body['LineItemNo'] =lineItemNo;
+ await baseAppClient.post(DEACTIVATE_BLOOD_PRESSURES_STATUS,
+ onSuccess: (response, statusCode) async {},
+ onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: body);
+ }
}
diff --git a/lib/core/service/medical/BloodSugarService.dart b/lib/core/service/medical/BloodSugarService.dart
index 09fe9fe9..e8e2fabf 100644
--- a/lib/core/service/medical/BloodSugarService.dart
+++ b/lib/core/service/medical/BloodSugarService.dart
@@ -24,6 +24,11 @@ class BloodSugarService extends BaseService {
monthDiabtectResultAverageList.clear();
weekDiabtectResultAverageList.clear();
yearDiabtecResultAverageList.clear();
+
+ monthDiabtecPatientResult.clear();
+ weekDiabtecPatientResult.clear();
+ yearDiabtecPatientResult.clear();
+
response['List_MonthDiabtectResultAverage'].forEach((item) {
monthDiabtectResultAverageList
.add(MonthDiabtectResultAverage.fromJson(item));
@@ -69,28 +74,66 @@ class BloodSugarService extends BaseService {
}, body: Map());
}
- addDiabtecResult(
- {String bloodSugerDateChart,
- String bloodSugerResult,
- String diabtecUnit,
- int measuredTime}) async {
+ addDiabtecResult({String bloodSugerDateChart, String bloodSugerResult, String diabtecUnit, int measuredTime}) async {
hasError = false;
super.error = "";
-
Map body = Map();
body['BloodSugerDateChart'] = bloodSugerDateChart;
body['BloodSugerResult'] = bloodSugerResult;
body['DiabtecUnit'] = diabtecUnit;
- body['MeasuredTime'] =2;// measuredTime;
+ body['MeasuredTime'] = measuredTime+1;
body['isDentalAllowedBackend'] = false;
+ await baseAppClient.post(ADD_DIABTEC_RESULT,
+ onSuccess: (response, statusCode) async {},
+ onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: body);
+ }
- await baseAppClient.post(ADD_BLOOD_PRESSURE_RESULT,
- onSuccess: (response, statusCode) async {
- var asd ="";
- },
+ updateDiabtecResult({DateTime month,DateTime hour,String bloodSugerResult,String diabtecUnit, int measuredTime,int lineItemNo}) async {
+ hasError = false;
+ super.error = "";
+ Map body = Map();
+ body['BloodSugerResult'] = bloodSugerResult;
+ body['DiabtecUnit'] = diabtecUnit;
+ body['BloodSugerDateChart'] = '${month.year}-${month.month}-${month.day} ${hour.hour}:${hour.minute}:00';
+ body['isDentalAllowedBackend'] = false;
+ body['MeasuredTime'] = measuredTime+1;
+ body['LineItemNo'] = lineItemNo;
+ await baseAppClient.post(UPDATE_DIABETIC_RESULT,
+ onSuccess: (response, statusCode) async {},
onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: body);
}
+
+ Future sendReportByEmail() async {
+ hasError = false;
+ super.error = "";
+ Map body = Map();
+ body['isDentalAllowedBackend'] = false;
+ body['to'] = user.emailAddress;
+ await baseAppClient.post(SEND_AVERAGE_BLOOD_SUGAR_REPORT,
+ onSuccess: (response, statusCode) async {},
+ onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: body);
+ }
+
+ Future deactivateDiabeticStatus({int lineItemNo }) async {
+ hasError = false;
+ super.error = "";
+ Map body = Map();
+ body['isDentalAllowedBackend'] = false;
+ body['LineItemNo'] =lineItemNo;
+ await baseAppClient.post(DEACTIVATE_DIABETIC_STATUS,
+ onSuccess: (response, statusCode) async {},
+ onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: body);
+ }
}
diff --git a/lib/core/service/medical/WeightPressureService.dart b/lib/core/service/medical/WeightPressureService.dart
index 27048dc8..b48c4795 100644
--- a/lib/core/service/medical/WeightPressureService.dart
+++ b/lib/core/service/medical/WeightPressureService.dart
@@ -6,11 +6,13 @@ import 'package:diplomaticquarterapp/core/model/my_trakers/weight/YearWeightMeas
import 'package:diplomaticquarterapp/core/service/base_service.dart';
class WeightService extends BaseService {
-
///Average
- List monthWeightMeasurementResultAverage = List();
- List weekWeightMeasurementResultAverage = List();
- List yearWeightMeasurementResultAverage = List();
+ List
+ monthWeightMeasurementResultAverage = List();
+ List weekWeightMeasurementResultAverage =
+ List();
+ List yearWeightMeasurementResultAverage =
+ List();
///Result
List monthWeightMeasurementResult = List();
@@ -59,7 +61,8 @@ class WeightService extends BaseService {
});
response['List_MonthWeightMeasurementResult'].forEach((item) {
- monthWeightMeasurementResult.add(WeightMeasurementResult.fromJson(item));
+ monthWeightMeasurementResult
+ .add(WeightMeasurementResult.fromJson(item));
});
response['List_YearWeightMeasurementResult'].forEach((item) {
@@ -72,9 +75,7 @@ class WeightService extends BaseService {
}
addWeightResult(
- {String weightDate,
- String weightMeasured,
- int weightUnit}) async {
+ {String weightDate, String weightMeasured, int weightUnit}) async {
hasError = false;
super.error = "";
@@ -85,9 +86,53 @@ class WeightService extends BaseService {
body['isDentalAllowedBackend'] = false;
await baseAppClient.post(ADD_WEIGHT_PRESSURE_RESULT,
- onSuccess: (response, statusCode) async {
+ onSuccess: (response, statusCode) async {},
+ onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: body);
+ }
+
+ updateWeightResult({int lineItemNo, int weightUnit,String weightMeasured,String weightDate}) async {
+ hasError = false;
+ super.error = "";
+ Map body = Map();
+ body['LineItemNo'] = lineItemNo;
+ body['weightUnit'] = '$weightUnit';
+ body['WeightMeasured'] = weightMeasured;
+ body['WeightDate'] = weightDate;
+ body['isDentalAllowedBackend'] = false;
+
+ await baseAppClient.post(UPDATE_WEIGHT_PRESSURE_RESULT,
+ onSuccess: (response, statusCode) async {},
+ onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: body);
+ }
+ Future sendReportByEmail() async {
+ hasError = false;
+ super.error = "";
+ Map body = Map();
+ body['isDentalAllowedBackend'] = false;
+ body['to'] = user.emailAddress;
+ await baseAppClient.post(SEND_AVERAGE_BLOOD_WEIGHT_REPORT,
+ onSuccess: (response, statusCode) async {},
+ onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: body);
+ }
+
+ deleteWeightResult({int lineItemNo, }) async {
+ hasError = false;
+ super.error = "";
+ Map body = Map();
+ body['LineItemNo'] = lineItemNo;
+ body['isDentalAllowedBackend'] = false;
- },
+ await baseAppClient.post(DEACTIVATE_WEIGHT_PRESSURE_RESULT,
+ onSuccess: (response, statusCode) async {},
onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
diff --git a/lib/core/service/medical/my_balance_service.dart b/lib/core/service/medical/my_balance_service.dart
index 86e925b8..e2744250 100644
--- a/lib/core/service/medical/my_balance_service.dart
+++ b/lib/core/service/medical/my_balance_service.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
+import 'package:diplomaticquarterapp/core/model/blooddonation/blood_groub_details.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/AdvanceModel.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/patient_advance_balance_amount.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/patient_info.dart';
@@ -23,11 +24,11 @@ class MyBalanceService extends BaseService {
PatientInfoAndMobileNumber patientInfoAndMobileNumber;
String logInTokenID;
String verificationCode;
-
+ String updatedRegisterBloodMessage = "";
AuthenticatedUserObject authenticatedUserObject =
locator();
- MyBalanceService(){
+ MyBalanceService() {
getFamilyFiles();
}
@@ -156,4 +157,49 @@ class MyBalanceService extends BaseService {
return await getSharedRecordByStatus();
}
}
+
+ Future updateBloodGroup(List_BloodGroupDetailsModel detailsModel) async {
+ hasError = false;
+ await getUser();
+ var languageID =
+ await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
+ Map body = Map();
+ body['City'] = detailsModel.city;
+ body['cityCode'] = detailsModel.cityCode;
+ body['Gender'] = detailsModel.gender;
+ body['BloodGroup'] = detailsModel.bloodGroup;
+ body['CellNumber'] = user.mobileNumber;
+ body['LanguageID'] = languageID;
+ body['NationalID'] = user.nationalityID;
+ body['ZipCode'] = user.zipCode ?? "+966";
+ body['isDentalAllowedBackend'] = false;
+
+ await baseAppClient.post(BLOOD_DONATION_REGISTER_BLOOD_TYPE,
+ onSuccess: (dynamic response, int statusCode) {
+ updatedRegisterBloodMessage = response['ErrorEndUserMessage'];
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ if(error == null){
+ super.error = "Something went wrong";
+ }
+ }, body: body);
+ }
+
+ Future addUserAgreementForBloodDonation() async {
+ hasError = false;
+ var languageID =
+ await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
+ Map body = Map();
+ body['IsAgreed'] = true;
+ body['LanguageID'] = languageID;
+ body['isDentalAllowedBackend'] = false;
+
+ await baseAppClient.post(ADD_USER_AGREEMENT_FOR_BLOOD_DONATION,
+ onSuccess: (dynamic response, int statusCode) {
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: body);
+ }
}
diff --git a/lib/core/service/offers_service.dart b/lib/core/service/offers_service.dart
index 2247c833..8007007b 100644
--- a/lib/core/service/offers_service.dart
+++ b/lib/core/service/offers_service.dart
@@ -21,7 +21,7 @@ class OffersCategoriseService extends BaseService {
Future getOffersCategorise() async {
hasError = false;
_offersList.clear();
- await baseAppClient.get(
+ await baseAppClient.getPharmacy(
GET_OFFERS_CATEGORISE,
onSuccess: (dynamic response, int statusCode) {
response['categories'].forEach((item) {
@@ -40,7 +40,7 @@ class OffersCategoriseService extends BaseService {
_offerProducts.clear();
String endPoint =
id != null ? GET_OFFERS_PRODUCTS + "$id" : GET_OFFERS_PRODUCTS + "1";
- await baseAppClient.get(
+ await baseAppClient.getPharmacy(
endPoint,
onSuccess: (dynamic response, int statusCode) {
response['products'].forEach((item) {
diff --git a/lib/core/service/parmacyModule/order-preview-service.dart b/lib/core/service/parmacyModule/order-preview-service.dart
index 5648ff6d..18cfa87e 100644
--- a/lib/core/service/parmacyModule/order-preview-service.dart
+++ b/lib/core/service/parmacyModule/order-preview-service.dart
@@ -21,7 +21,7 @@ class OrderPreviewService extends BaseService {
Map queryParams = {'fields': 'addresses'};
hasError = false;
try {
- await baseAppClient.get("$GET_CUSTOMERS_ADDRESSES$customerId",
+ await baseAppClient.getPharmacy("$GET_CUSTOMERS_ADDRESSES$customerId",
onSuccess: (dynamic response, int statusCode) {
addresses.clear();
response['customers'][0]['addresses'].forEach((item) {
@@ -42,7 +42,7 @@ class OrderPreviewService extends BaseService {
dynamic localRes;
hasError = false;
try {
- await baseAppClient.get("$GET_SHIPPING_OPTIONS$customerId/${selectedAddress.id}",
+ await baseAppClient.getPharmacy("$GET_SHIPPING_OPTIONS$customerId/${selectedAddress.id}",
onSuccess: (dynamic response, int statusCode) {
localRes = response['shipping_option'][0];
}, onFailure: (String error, int statusCode) {
@@ -61,7 +61,7 @@ class OrderPreviewService extends BaseService {
dynamic localRes;
hasError = false;
try {
- await baseAppClient.get("$GET_SHOPPING_CART$customerId",
+ await baseAppClient.getPharmacy("$GET_SHOPPING_CART$customerId",
onSuccess: (dynamic response, int statusCode) {
localRes = response;
}, onFailure: (String error, int statusCode) {
@@ -125,7 +125,7 @@ class OrderPreviewService extends BaseService {
super.error = "";
dynamic localRes;
- await baseAppClient.get("$DELETE_SHOPPING_CART_ALL$customerId/ShoppingCart",
+ await baseAppClient.getPharmacy("$DELETE_SHOPPING_CART_ALL$customerId/ShoppingCart",
onSuccess: (response, statusCode) async {
localRes = response;
}, onFailure: (String error, int statusCode) {
diff --git a/lib/core/service/parmacyModule/parmacy_module_service.dart b/lib/core/service/parmacyModule/parmacy_module_service.dart
index 3a2b8e63..a5c1efab 100644
--- a/lib/core/service/parmacyModule/parmacy_module_service.dart
+++ b/lib/core/service/parmacyModule/parmacy_module_service.dart
@@ -6,31 +6,29 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart'
import 'package:diplomaticquarterapp/core/service/base_service.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
-
class PharmacyModuleService extends BaseService {
final AppSharedPreferences sharedPref = AppSharedPreferences();
bool isFinished = true;
bool hasError = false;
String errorMsg = '';
- String url ="";
+ String url = "";
List bannerItems = List();
List manufacturerList = List();
List bestSellerProducts = List();
List lastVisitedProducts = List();
-
-
-
-
Future makeVerifyCustomer(dynamic data) async {
- Map queryParams = {'FileNumber': data['PatientID'].toString()};
+ Map queryParams = {
+ 'FileNumber': data['PatientID'].toString()
+ };
hasError = false;
try {
- await baseAppClient.get(PHARMACY_VERIFY_CUSTOMER,
+ await baseAppClient.getPharmacy(PHARMACY_VERIFY_CUSTOMER,
onSuccess: (dynamic response, int statusCode) {
if (response['UserName'] != null) {
- sharedPref.setString(PHARMACY_CUSTOMER_ID, response['CustomerId'].toString());
+ sharedPref.setString(
+ PHARMACY_CUSTOMER_ID, response['CustomerId'].toString());
print(response);
} else {
createUser();
@@ -61,8 +59,31 @@ class PharmacyModuleService extends BaseService {
hasError = false;
try {
await baseAppClient.get(PHARMACY_CREATE_CUSTOMER,
- onSuccess: (dynamic response, int statusCode) {
+ onSuccess: (dynamic response, int statusCode) async {
if (!response['IsRegistered']) {}
+ await generatePharmacyToken();
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, queryParams: queryParams);
+ } catch (error) {
+ throw error;
+ }
+ }
+
+ Future generatePharmacyToken() async {
+ Map queryParams = {
+ 'Filenumber': user.patientID.toString(),
+ 'MobileNumber': user.mobileNumber,
+ };
+ hasError = false;
+ try {
+ await baseAppClient.get(PHARMACY_AUTORZIE_CUSTOMER,
+ onSuccess: (dynamic response, int statusCode) async {
+ if (response['Status'] == 200) {
+ await sharedPref.setString(
+ PHARMACY_AUTORZIE_TOKEN, response['token'].toString());
+ }
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
@@ -75,7 +96,7 @@ class PharmacyModuleService extends BaseService {
Future getBannerListList() async {
hasError = false;
try {
- await baseAppClient.get(GET_PHARMACY_BANNER,
+ await baseAppClient.getPharmacy(GET_PHARMACY_BANNER,
onSuccess: (dynamic response, int statusCode) {
bannerItems.clear();
response['images'].forEach((item) {
@@ -93,12 +114,12 @@ class PharmacyModuleService extends BaseService {
Future getTopManufacturerList() async {
Map queryParams = {'page': '1', 'limit': '8'};
try {
- await baseAppClient.get(GET_PHARMACY_TOP_MANUFACTURER,
+ await baseAppClient.getPharmacy(GET_PHARMACY_TOP_MANUFACTURER,
onSuccess: (dynamic response, int statusCode) {
manufacturerList.clear();
response['manufacturer'].forEach((item) {
Manufacturer manufacturer = Manufacturer.fromJson(item);
- if(manufacturer.image != null){
+ if (manufacturer.image != null) {
manufacturerList.add(Manufacturer.fromJson(item));
}
});
@@ -117,7 +138,7 @@ class PharmacyModuleService extends BaseService {
'id,discount_ids,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage,reviews',
};
try {
- await baseAppClient.get(GET_PHARMACY_BEST_SELLER_PRODUCT,
+ await baseAppClient.getPharmacy(GET_PHARMACY_BEST_SELLER_PRODUCT,
onSuccess: (dynamic response, int statusCode) {
bestSellerProducts.clear();
response['products'].forEach((item) {
@@ -139,8 +160,9 @@ class PharmacyModuleService extends BaseService {
lastVisited =
await this.sharedPref.getString(PHARMACY_LAST_VISITED_PRODUCTS);
try {
- await baseAppClient.get("$GET_PHARMACY_PRODUCTs_BY_IDS$lastVisited",
- onSuccess: (dynamic response, int statusCode) {
+ await baseAppClient
+ .getPharmacy("$GET_PHARMACY_PRODUCTs_BY_IDS$lastVisited",
+ onSuccess: (dynamic response, int statusCode) {
lastVisitedProducts.clear();
response['products'].forEach((item) {
lastVisitedProducts.add(PharmacyProduct.fromJson(item));
@@ -154,5 +176,4 @@ class PharmacyModuleService extends BaseService {
}
}
}
-
}
diff --git a/lib/core/service/parmacyModule/prescription_service.dart b/lib/core/service/parmacyModule/prescription_service.dart
index e1e060a5..ce931812 100644
--- a/lib/core/service/parmacyModule/prescription_service.dart
+++ b/lib/core/service/parmacyModule/prescription_service.dart
@@ -38,9 +38,15 @@ class PrescriptionService extends BaseService {
url = PRESCRIPTION;
print("Print PRESCRIPTION url" + url);
hasError = false;
+<<<<<<< HEAD
Map body = Map();
body['isDentalAllowedBackend'] = false;
await baseAppClient.post(PRESCRIPTION,
+=======
+ url = PRESCRIPTION;
+ print("Print PRESCRIPTION url" + url);
+ await baseAppClient.post(url,
+>>>>>>> development
onSuccess: (dynamic response, int statusCode) {
_prescriptionsList.clear();
response['PatientPrescriptionList'].forEach((prescriptions) {
diff --git a/lib/core/service/pharmacy_categorise_service.dart b/lib/core/service/pharmacy_categorise_service.dart
index b55a755d..0082cc49 100644
--- a/lib/core/service/pharmacy_categorise_service.dart
+++ b/lib/core/service/pharmacy_categorise_service.dart
@@ -56,7 +56,7 @@ class PharmacyCategoriseService extends BaseService {
Future getCategorise() async {
hasError = false;
_categoriseList.clear();
- await baseAppClient.get(
+ await baseAppClient.getPharmacy(
GET_PHARMACY_CATEGORISE,
onSuccess: (dynamic response, int statusCode) {
response['categories'].forEach((item) {
@@ -74,7 +74,7 @@ class PharmacyCategoriseService extends BaseService {
hasError = false;
_scanList.clear();
String endPoint = id != null ? SCAN_QR_CODE + "$id" : SCAN_QR_CODE + "";
- await baseAppClient.get(
+ await baseAppClient.getPharmacy(
endPoint,
onSuccess: (dynamic response, int statusCode) {
response['products'].forEach((item) {
@@ -94,7 +94,7 @@ class PharmacyCategoriseService extends BaseService {
String endPoint = productName != null
? GET_SEARCH_PRODUCTS + "$productName" + '&language_id=1'
: GET_SEARCH_PRODUCTS + "";
- await baseAppClient.get(
+ await baseAppClient.getPharmacy(
endPoint,
onSuccess: (dynamic response, int statusCode) {
response['products'].forEach((item) {
@@ -111,7 +111,7 @@ class PharmacyCategoriseService extends BaseService {
Future getBrands() async {
hasError = false;
_brandsList.clear();
- await baseAppClient.get(
+ await baseAppClient.getPharmacy(
GET_BRANDS_LIST,
onSuccess: (dynamic response, int statusCode) {
response['manufacturer'].forEach((item) {
@@ -130,7 +130,7 @@ class PharmacyCategoriseService extends BaseService {
_parentCategoriseList.clear();
String endPoint =
id != null ? GET_CATEGORISE_PARENT + "$id" : GET_CATEGORISE_PARENT + "";
- await baseAppClient.get(
+ await baseAppClient.getPharmacy(
endPoint,
onSuccess: (dynamic response, int statusCode) {
response['categories'].forEach((item) {
@@ -150,7 +150,7 @@ class PharmacyCategoriseService extends BaseService {
String endPoint = id != null
? GET_PARENT_PRODUCTS + "$id" + '&page=1&limit=50'
: GET_PARENT_PRODUCTS + "";
- await baseAppClient.get(
+ await baseAppClient.getPharmacy(
endPoint,
onSuccess: (dynamic response, int statusCode) {
response['products'].forEach((item) {
@@ -170,7 +170,7 @@ class PharmacyCategoriseService extends BaseService {
String endPoint =
id != null ? GET_SUB_CATEGORISE + "$id" : GET_SUB_CATEGORISE + "";
- await baseAppClient.get(
+ await baseAppClient.getPharmacy(
endPoint,
onSuccess: (dynamic response, int statusCode) {
response['categories'].forEach((item) {
@@ -190,7 +190,7 @@ class PharmacyCategoriseService extends BaseService {
String endPoint = id != null
? GET_SUB_PRODUCTS + "$id" + '&page=1&limit=50'
: GET_SUB_PRODUCTS + "";
- await baseAppClient.get(
+ await baseAppClient.getPharmacy(
endPoint,
onSuccess: (dynamic response, int statusCode) {
response['products'].forEach((item) {
@@ -209,7 +209,7 @@ class PharmacyCategoriseService extends BaseService {
_finalProducts.clear();
String endPoint =
id != null ? GET_FINAL_PRODUCTS + "$id" : GET_FINAL_PRODUCTS + "";
- await baseAppClient.get(
+ await baseAppClient.getPharmacy(
endPoint,
onSuccess: (dynamic response, int statusCode) {
response['products'].forEach((item) {
diff --git a/lib/core/service/termsConditionsService.dart b/lib/core/service/termsConditionsService.dart
new file mode 100644
index 00000000..1f806e22
--- /dev/null
+++ b/lib/core/service/termsConditionsService.dart
@@ -0,0 +1,18 @@
+import 'package:diplomaticquarterapp/config/config.dart';
+import 'package:diplomaticquarterapp/core/service/base_service.dart';
+
+class TermsConditionsService extends BaseService {
+
+ String userAgreementContent = "";
+
+ Future getUserTermsAndConditions() async {
+ hasError = false;
+ await baseAppClient.post(GET_USER_TERMS,
+ onSuccess: (dynamic response, int statusCode) {
+ userAgreementContent = response['UserAgreementContent'];
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: Map());
+ }
+}
\ No newline at end of file
diff --git a/lib/core/viewModels/AlHabibMedicalService/H2O_view_model.dart b/lib/core/viewModels/AlHabibMedicalService/H2O_view_model.dart
index 15b00e37..a89ec799 100644
--- a/lib/core/viewModels/AlHabibMedicalService/H2O_view_model.dart
+++ b/lib/core/viewModels/AlHabibMedicalService/H2O_view_model.dart
@@ -1,26 +1,54 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/insert_user_activity_request_model.dart';
+import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/user_detail_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/user_progress_for_month_data_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/user_progress_for_today_data_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/user_progress_for_week_data_model.dart';
import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/H2O_service.dart';
import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart';
import 'package:charts_flutter/flutter.dart' as charts;
+import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import '../../../locator.dart';
class H2OViewModel extends BaseViewModel {
-
H2OService _h2OService = locator();
List userProgressForWeekDataSeries;
List userProgressForMonthDataSeries;
+ UserDetailModel get userDetail => _h2OService.userDetailModel;
+
UserProgressForTodayDataModel get userProgressData {
- if (_h2OService.userProgressForTodayDataList.length != 0)
- return _h2OService.userProgressForTodayDataList[0];
- return null;
+ if (_h2OService.userProgressForTodayDataList.length != 0) return _h2OService.userProgressForTodayDataList[0];
+ return null;
}
+ Future getUserDetail() async {
+ // if(_h2OService.userProgressForTodayDataList.length==0){
+ setState(ViewState.Busy);
+ await _h2OService.getUserDetail();
+ if (_h2OService.hasError) {
+ error = _h2OService.error;
+ setState(ViewState.Error);
+ } else {
+ setState(ViewState.Idle);
+ }
+ }
+
+ Future updateUserDetail(UserDetailModel userDetailModel, Function(bool) onResponse) async {
+ setState(ViewState.Busy);
+
+ await _h2OService.updateUserDetail(userDetailModel);
+ if (_h2OService.hasError) {
+ error = _h2OService.error;
+ setState(ViewState.Error);
+ onResponse(false);
+ } else {
+ _h2OService.userDetailModel = userDetailModel;
+ setState(ViewState.Idle);
+ onResponse(true);
+ }
+ }
Future getUserProgressForTodayData() async {
// if(_h2OService.userProgressForTodayDataList.length==0){
@@ -58,13 +86,9 @@ class H2OViewModel extends BaseViewModel {
}
}
-
- List> createUserProgressForWeekDataSeries() {
- List globalData = [
- ];
- _h2OService.userProgressForWeekDataList.forEach((
- UserProgressForWeekDataModel data) {
+ List> createUserProgressForWeekDataSeries() {
+ List globalData = [];
+ _h2OService.userProgressForWeekDataList.forEach((UserProgressForWeekDataModel data) {
globalData.add(new ChartSeries(data.dayName, data.percentageConsumed));
});
return [
@@ -77,12 +101,9 @@ class H2OViewModel extends BaseViewModel {
];
}
- List> createUserProgressForMonthDataSeries() {
- List globalData = [
- ];
- _h2OService.userProgressForMonthDataList.forEach((
- UserProgressForMonthDataModel data) {
+ List> createUserProgressForMonthDataSeries() {
+ List globalData = [];
+ _h2OService.userProgressForMonthDataList.forEach((UserProgressForMonthDataModel data) {
globalData.add(new ChartSeries(data.monthName, data.percentageConsumed));
});
return [
@@ -95,14 +116,10 @@ class H2OViewModel extends BaseViewModel {
];
}
-
- Future insertUserActivity(
- InsertUserActivityRequestModel insertUserActivityRequestModel) async {
+ Future insertUserActivity(InsertUserActivityRequestModel insertUserActivityRequestModel) async {
setState(ViewState.BusyLocal);
- insertUserActivityRequestModel.mobileNumber =
- user.mobileNumber.substring(1);
- insertUserActivityRequestModel.identificationNo =
- user.patientIdentificationNo;
+ insertUserActivityRequestModel.mobileNumber = user.mobileNumber.substring(1);
+ insertUserActivityRequestModel.identificationNo = user.patientIdentificationNo;
await _h2OService.insertUserActivity(insertUserActivityRequestModel);
if (_h2OService.hasError) {
@@ -113,9 +130,18 @@ class H2OViewModel extends BaseViewModel {
}
}
+ Future undoUserActivity() async {
+ setState(ViewState.BusyLocal);
+ await _h2OService.undoUserActivity();
+ if (_h2OService.hasError) {
+ error = _h2OService.error;
+ setState(ViewState.ErrorLocal);
+ } else {
+ setState(ViewState.Idle);
+ }
+ }
}
-
/// Sample ordinal data type.
class ChartSeries {
final String y;
diff --git a/lib/core/viewModels/TermsConditionsViewModel.dart b/lib/core/viewModels/TermsConditionsViewModel.dart
new file mode 100644
index 00000000..0cd667cf
--- /dev/null
+++ b/lib/core/viewModels/TermsConditionsViewModel.dart
@@ -0,0 +1,29 @@
+import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
+import 'package:diplomaticquarterapp/core/service/termsConditionsService.dart';
+import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart';
+
+import '../../locator.dart';
+
+class TermsConditionsViewModel extends BaseViewModel{
+
+ TermsConditionsService _service = locator();
+
+ String get userAgreementContent => _service.userAgreementContent;
+
+ getUserTermsAndConditions() async {
+ setState(ViewState.Busy);
+ await _service.getUserTermsAndConditions();
+ if (_service.hasError) {
+ error = _service.error;
+ setState(ViewState.Error);
+ } else {
+ setState(ViewState.Idle);
+ }
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ }
+
+}
\ No newline at end of file
diff --git a/lib/core/viewModels/medical/blood_pressure_view_model.dart b/lib/core/viewModels/medical/blood_pressure_view_model.dart
index dfff5b45..ae3abbcb 100644
--- a/lib/core/viewModels/medical/blood_pressure_view_model.dart
+++ b/lib/core/viewModels/medical/blood_pressure_view_model.dart
@@ -1,33 +1,31 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/my_trakers/blood_pressur/BloodPressureResult.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/blood_sugar/DiabtecPatientResult.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/chartData/WeekChartDate.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/chartData/YearMonthlyChartDate.dart';
import 'package:diplomaticquarterapp/core/service/medical/BloodPressureService.dart';
-import 'package:diplomaticquarterapp/core/service/medical/BloodSugarService.dart';
import 'package:diplomaticquarterapp/locator.dart';
-import 'package:charts_flutter/flutter.dart' as charts;
+import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
import '../../../core/viewModels/base_view_model.dart';
class BloodPressureViewMode extends BaseViewModel {
BloodPressureService bloodPressureService = locator();
- ///BLOOD
- List _bloodDiastolicPressureWeeklyTimeSeriesSalesList = List();
- List _bloodSystolicePressureWeeklyTimeSeriesSalesList = List();
+ List get monthDiabtecPatientResult =>
+ bloodPressureService.monthDiabtecPatientResult;
- List _bloodDiastolicMonthlyTimeSeriesSalesList = List();
- List _bloodSystolicMonthlyTimeSeriesSalesList = List();
+ List get weekDiabtecPatientResult =>
+ bloodPressureService.weekDiabtecPatientResult;
- List _bloodSystoliceYearTimeSeriesSalesList = List();
- List _bloodDiastolicYearTimeSeriesSalesList = List();
+ List get yearDiabtecPatientResult =>
+ bloodPressureService.yearDiabtecPatientResult;
- List get monthDiabtecPatientResult => bloodPressureService.monthDiabtecPatientResult;
+ List weightWeekTimeSeriesDataTop = [];
+ List weightWeekTimeSeriesDataLow = [];
- List get weekDiabtecPatientResult => bloodPressureService.weekDiabtecPatientResult;
+ List weighMonthTimeSeriesDataTop = [];
+ List weighMonthTimeSeriesDataLow = [];
- List get yearDiabtecPatientResult => bloodPressureService.yearDiabtecPatientResult;
+ List weightYearTimeSeriesDataTop = [];
+ List weightYearTimeSeriesDataLow = [];
Future getBloodPressure() async {
setState(ViewState.Busy);
@@ -35,114 +33,94 @@ class BloodPressureViewMode extends BaseViewModel {
await bloodPressureService.getDiabtecResults();
if (bloodPressureService.hasError) {
error = bloodPressureService.error;
- setState(ViewState.Error);
+ setState(ViewState.ErrorLocal);
} else {
+ clearDate();
bloodPressureService.weekDiabtectResultAverageList.forEach((element) {
- _bloodDiastolicPressureWeeklyTimeSeriesSalesList.add(WeekChartDate(
- x: element.bloodPressureDate,
- y: element.dailyDiastolicPressureAverageResult));
- _bloodSystolicePressureWeeklyTimeSeriesSalesList.add(WeekChartDate(
- x: element.bloodPressureDate,
- y: element.dailySystolicePressureAverageResult));
- });
+ weightWeekTimeSeriesDataTop.add(TimeSeriesSales2(
+ element.bloodPressureDate,
+ element.dailyDiastolicPressureAverageResult.toDouble()));
+ weightWeekTimeSeriesDataLow.add(TimeSeriesSales2(
+ element.bloodPressureDate,
+ element.dailySystolicePressureAverageResult.toDouble()));
- for (int index = 0;
- index < bloodPressureService.monthDiabtectResultAverageList.length;
- index++) {
- _bloodDiastolicMonthlyTimeSeriesSalesList.add(YearMonthlyChartDate(
- x: index,
- y: bloodPressureService.monthDiabtectResultAverageList[index]
- .weekDiastolicPressureAverageResult));
- _bloodSystolicMonthlyTimeSeriesSalesList.add(YearMonthlyChartDate(
- x: index,
- y: bloodPressureService.monthDiabtectResultAverageList[index]
- .weekSystolicePressureAverageResult));
- }
-
- bloodPressureService.yearDiabtecResultAverageList.forEach((element) {
- _bloodSystoliceYearTimeSeriesSalesList
- .add(WeekChartDate(x: element.date, y: element.monthSystolicePressureAverageResult));
-
- _bloodDiastolicYearTimeSeriesSalesList
- .add(WeekChartDate(x: element.date, y: element.monthDiastolicPressureAverageResult));
- });
+ for (int index = 0; index < bloodPressureService.monthDiabtectResultAverageList.length; index++) {
+
+ weighMonthTimeSeriesDataTop.add(TimeSeriesSales3(index, bloodPressureService.monthDiabtectResultAverageList[index].weekDiastolicPressureAverageResult.toDouble()));
+
+ weighMonthTimeSeriesDataLow.add(TimeSeriesSales3(index, bloodPressureService.monthDiabtectResultAverageList[index].weekSystolicePressureAverageResult.toDouble()));
+ }
+ bloodPressureService.yearDiabtecResultAverageList.forEach((element) {
+ weightYearTimeSeriesDataTop.add(TimeSeriesSales2(element.date,
+ element.monthSystolicePressureAverageResult.toDouble()));
+
+ weightYearTimeSeriesDataLow.add(TimeSeriesSales2(element.date,
+ element.monthDiastolicPressureAverageResult.toDouble()));
+ });
+
+ });
setState(ViewState.Idle);
}
}
- List> getBloodWeeklySeries() {
- return [
- charts.Series(
- id: 'Diastolic',
- colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
- domainFn: (WeekChartDate sales, _) => sales.x,
- measureFn: (WeekChartDate sales, _) => sales.y,
- data: _bloodDiastolicPressureWeeklyTimeSeriesSalesList,
- ),
- charts.Series(
- id: 'Systolice',
- colorFn: (_, __) => charts.MaterialPalette.blue.shadeDefault,
- domainFn: (WeekChartDate sales, _) => sales.x,
- measureFn: (WeekChartDate sales, _) => sales.y,
- data: _bloodSystolicePressureWeeklyTimeSeriesSalesList,
- )
- ];
- }
- List>
- getBloodMonthlyTimeSeriesSales() {
- return [
- charts.Series(
- id: 'Sales',
- colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
- domainFn: (YearMonthlyChartDate sales, _) => sales.x,
- measureFn: (YearMonthlyChartDate sales, _) => sales.y,
- data: _bloodDiastolicMonthlyTimeSeriesSalesList,
- ),
- charts.Series(
- id: 'Sales',
- colorFn: (_, __) => charts.MaterialPalette.blue.shadeDefault,
- domainFn: (YearMonthlyChartDate sales, _) => sales.x,
- measureFn: (YearMonthlyChartDate sales, _) => sales.y,
- data: _bloodSystolicMonthlyTimeSeriesSalesList,
- ),
- ];
+ void clearDate(){
+ weightWeekTimeSeriesDataTop.clear();
+ weightWeekTimeSeriesDataLow.clear();
+ weighMonthTimeSeriesDataTop.clear();
+ weighMonthTimeSeriesDataLow.clear();
+ weightYearTimeSeriesDataTop.clear();
+ weightYearTimeSeriesDataLow.clear();
}
- List> getBloodYearTimeSeriesSales() {
- return [
- charts.Series(
- id: 'Sales',
- colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
- domainFn: (WeekChartDate sales, _) => sales.x,
- measureFn: (WeekChartDate sales, _) => sales.y,
- data: _bloodSystoliceYearTimeSeriesSalesList,
- ),
- charts.Series(
- id: 'Sales',
- colorFn: (_, __) => charts.MaterialPalette.blue.shadeDefault,
- domainFn: (WeekChartDate sales, _) => sales.x,
- measureFn: (WeekChartDate sales, _) => sales.y,
- data: _bloodDiastolicYearTimeSeriesSalesList,
- )
- ];
+ Future sendReportByEmail() async {
+ setState(ViewState.BusyLocal);
+
+ await bloodPressureService.sendReportByEmail();
+ if (bloodPressureService.hasError) {
+ error = bloodPressureService.error;
+ setState(ViewState.ErrorLocal);
+ } else {
+ setState(ViewState.Idle);
+ }
}
- addDiabtecResult(
+ Future addORUpdateDiabtecResult(
{String bloodPressureDate,
- String diastolicPressure,
- String systolicePressure,
- int measuredArm}) async {
+ String diastolicPressure,
+ String systolicePressure,
+ int measuredArm,bool isUpdate = false}) async {
setState(ViewState.BusyLocal);
+ if(!isUpdate)
await bloodPressureService.addDiabtecResult(
bloodPressureDate: bloodPressureDate,
diastolicPressure: diastolicPressure,
systolicePressure: systolicePressure,
measuredArm: measuredArm);
+ else
+ await bloodPressureService.updateDiabtecResult(
+ bloodPressureDate: bloodPressureDate,
+ diastolicPressure: diastolicPressure,
+ systolicePressure: systolicePressure,
+ measuredArm: measuredArm);
+ if (bloodPressureService.hasError) {
+ error = bloodPressureService.error;
+ setState(ViewState.ErrorLocal);
+ } else {
+ await getBloodPressure();
+ setState(ViewState.Idle);
+ }
+ }
+
+
+ Future deactivateDiabeticStatus({int lineItemNo}) async {
+ setState(ViewState.BusyLocal);
+
+ await bloodPressureService.deactivateDiabeticStatus(lineItemNo: lineItemNo);
if (bloodPressureService.hasError) {
error = bloodPressureService.error;
- setState(ViewState.Error);
+ setState(ViewState.ErrorLocal);
} else {
await getBloodPressure();
setState(ViewState.Idle);
diff --git a/lib/core/viewModels/medical/blood_sugar_view_model.dart b/lib/core/viewModels/medical/blood_sugar_view_model.dart
index fb00f80e..8a513992 100644
--- a/lib/core/viewModels/medical/blood_sugar_view_model.dart
+++ b/lib/core/viewModels/medical/blood_sugar_view_model.dart
@@ -5,17 +5,13 @@ import 'package:diplomaticquarterapp/core/model/my_trakers/chartData/YearMonthly
import 'package:diplomaticquarterapp/core/service/medical/BloodSugarService.dart';
import 'package:diplomaticquarterapp/locator.dart';
import 'package:charts_flutter/flutter.dart' as charts;
+import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
import '../../../core/viewModels/base_view_model.dart';
class BloodSugarViewMode extends BaseViewModel {
BloodSugarService bloodSugarService = locator();
- ///BLOOD
- List _bloodWeeklyTimeSeriesSalesList = List();
- List _bloodMonthlyTimeSeriesSalesList = List();
- List _bloodYearTimeSeriesSalesList = List();
-
List get monthDiabtecPatientResult =>
bloodSugarService.monthDiabtecPatientResult;
@@ -25,6 +21,10 @@ class BloodSugarViewMode extends BaseViewModel {
List get yearDiabtecPatientResult =>
bloodSugarService.yearDiabtecPatientResult;
+ List bloodWeekTimeSeriesData = [];
+ List yearTimeSeriesData = [];
+ List monthTimeSeriesData = [];
+
Future getBloodSugar() async {
setState(ViewState.Busy);
await bloodSugarService.getBloodSugar();
@@ -34,67 +34,35 @@ class BloodSugarViewMode extends BaseViewModel {
setState(ViewState.Error);
} else {
bloodSugarService.weekDiabtectResultAverageList.forEach((element) {
- _bloodWeeklyTimeSeriesSalesList.add(
- WeekChartDate(x: element.dateChart, y: element.dailyAverageResult));
+ bloodWeekTimeSeriesData.add(TimeSeriesSales2(
+ element.dateChart,
+ element.dailyAverageResult.toDouble(),
+ ));
});
for (int index = 0;
index < bloodSugarService.monthDiabtectResultAverageList.length;
index++) {
- _bloodMonthlyTimeSeriesSalesList.add(YearMonthlyChartDate(
- x: index,
- y: bloodSugarService
- .monthDiabtectResultAverageList[index].weekAverageResult));
- var asd="";
+ monthTimeSeriesData.add(TimeSeriesSales3(
+ index,
+ bloodSugarService
+ .monthDiabtectResultAverageList[index].weekAverageResult
+ .toDouble(),
+ ));
}
bloodSugarService.yearDiabtecResultAverageList.forEach((element) {
- _bloodYearTimeSeriesSalesList
- .add(WeekChartDate(x: element.date, y: element.monthAverageResult));
+ yearTimeSeriesData.add(TimeSeriesSales2(
+ element.date,
+ element.monthAverageResult.toDouble(),
+ ));
});
setState(ViewState.Idle);
}
}
- List> getBloodWeeklySeries() {
- return [
- new charts.Series(
- id: 'Sales',
- colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
- domainFn: (WeekChartDate sales, _) => sales.x,
- measureFn: (WeekChartDate sales, _) => sales.y,
- data: _bloodWeeklyTimeSeriesSalesList,
- )
- ];
- }
-
- List>
- getBloodMonthlyTimeSeriesSales() {
- return [
- new charts.Series(
- id: 'Sales',
- colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
- domainFn: (YearMonthlyChartDate sales, _) => sales.x,
- measureFn: (YearMonthlyChartDate sales, _) => sales.y,
- data: _bloodMonthlyTimeSeriesSalesList,
- )
- ];
- }
-
- List> getBloodYearTimeSeriesSales() {
- return [
- new charts.Series(
- id: 'Sales',
- colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
- domainFn: (WeekChartDate sales, _) => sales.x,
- measureFn: (WeekChartDate sales, _) => sales.y,
- data: _bloodYearTimeSeriesSalesList,
- )
- ];
- }
-
- addDiabtecResult(
+ Future addDiabtecResult(
{String bloodSugerDateChart,
String bloodSugerResult,
String diabtecUnit,
@@ -102,7 +70,7 @@ class BloodSugarViewMode extends BaseViewModel {
setState(ViewState.BusyLocal);
await bloodSugarService.addDiabtecResult(
bloodSugerDateChart: bloodSugerDateChart,
- bloodSugerResult: bloodSugerResult ,
+ bloodSugerResult: bloodSugerResult,
diabtecUnit: diabtecUnit,
measuredTime: measuredTime);
if (bloodSugarService.hasError) {
@@ -113,7 +81,54 @@ class BloodSugarViewMode extends BaseViewModel {
setState(ViewState.Idle);
}
}
-
-
-
+
+ Future updateDiabtecResult(
+ {DateTime month,
+ DateTime hour,
+ String bloodSugerResult,
+ String diabtecUnit,
+ int measuredTime,
+ int lineItemNo}) async {
+ setState(ViewState.BusyLocal);
+
+ await bloodSugarService.updateDiabtecResult(
+ bloodSugerResult: bloodSugerResult,
+ diabtecUnit: diabtecUnit,
+ hour: hour,
+ measuredTime: measuredTime,
+ lineItemNo: lineItemNo,
+ month: month);
+ if (bloodSugarService.hasError) {
+ error = bloodSugarService.error;
+ setState(ViewState.ErrorLocal);
+ } else {
+ await getBloodSugar();
+ setState(ViewState.Idle);
+ }
+ }
+
+ Future sendReportByEmail() async {
+ setState(ViewState.BusyLocal);
+
+ await bloodSugarService.sendReportByEmail();
+ if (bloodSugarService.hasError) {
+ error = bloodSugarService.error;
+ setState(ViewState.ErrorLocal);
+ } else {
+ setState(ViewState.Idle);
+ }
+ }
+
+ Future deactivateDiabeticStatus({int lineItemNo}) async {
+ setState(ViewState.BusyLocal);
+
+ await bloodSugarService.deactivateDiabeticStatus(lineItemNo: lineItemNo);
+ if (bloodSugarService.hasError) {
+ error = bloodSugarService.error;
+ setState(ViewState.ErrorLocal);
+ } else {
+ await getBloodSugar();
+ setState(ViewState.Idle);
+ }
+ }
}
diff --git a/lib/core/viewModels/medical/my_balance_view_model.dart b/lib/core/viewModels/medical/my_balance_view_model.dart
index f9554d94..acbbee07 100644
--- a/lib/core/viewModels/medical/my_balance_view_model.dart
+++ b/lib/core/viewModels/medical/my_balance_view_model.dart
@@ -41,6 +41,9 @@ class MyBalanceViewModel extends BaseViewModel {
double get totalAdvanceBalanceAmount =>
_myBalanceService.totalAdvanceBalanceAmount;
+ String get updatedRegisterBloodMessage =>
+ _myBalanceService.updatedRegisterBloodMessage;
+
GetAllSharedRecordsByStatusResponse get getAllSharedRecordsByStatusResponse =>
_myBalanceService.getAllSharedRecordsByStatusResponse;
@@ -74,7 +77,6 @@ class MyBalanceViewModel extends BaseViewModel {
setState(ViewState.Idle);
}
-
Future getCities() async {
setState(ViewState.Busy);
await _bloodDonationService.getAllCitiesOrders();
@@ -159,4 +161,17 @@ class MyBalanceViewModel extends BaseViewModel {
setState(ViewState.Idle);
}
}
+
+ Future updateBloodGroup(List_BloodGroupDetailsModel detailsModel) async {
+ setState(ViewState.Busy);
+ await _myBalanceService.updateBloodGroup(detailsModel);
+ if (_myBalanceService.hasError) {
+ error = _myBalanceService.error;
+ setState(ViewState.ErrorLocal);
+ } else {
+ await _myBalanceService.addUserAgreementForBloodDonation();
+ setState(ViewState.Idle);
+ }
+
+ }
}
diff --git a/lib/core/viewModels/medical/weight_pressure_view_model.dart b/lib/core/viewModels/medical/weight_pressure_view_model.dart
index 29095895..42db0a58 100644
--- a/lib/core/viewModels/medical/weight_pressure_view_model.dart
+++ b/lib/core/viewModels/medical/weight_pressure_view_model.dart
@@ -9,16 +9,13 @@ import 'package:diplomaticquarterapp/core/service/medical/BloodSugarService.dart
import 'package:diplomaticquarterapp/core/service/medical/WeightPressureService.dart';
import 'package:diplomaticquarterapp/locator.dart';
import 'package:charts_flutter/flutter.dart' as charts;
+import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
import '../../../core/viewModels/base_view_model.dart';
-class WeightPressureViewMode extends BaseViewModel {
+class WeightPressureViewModel extends BaseViewModel {
WeightService weightService = locator();
- List _weightWeeklyTimeSeriesSalesList = List();
- List _weightMonthlyTimeSeriesSalesList = List();
- List _weightYearTimeSeriesSalesList = List();
-
List get monthWeightMeasurementResult =>
weightService.monthWeightMeasurementResult;
@@ -28,6 +25,10 @@ class WeightPressureViewMode extends BaseViewModel {
List get yearWeightMeasurementResult =>
weightService.yearWeightMeasurementResult;
+ List weightWeekTimeSeriesData = [];
+ List weighMonthTimeSeriesData = [];
+ List weightYearTimeSeriesData = [];
+
Future getWeight() async {
setState(ViewState.Busy);
await weightService.getWeightAverage();
@@ -37,71 +38,84 @@ class WeightPressureViewMode extends BaseViewModel {
setState(ViewState.Error);
} else {
weightService.weekWeightMeasurementResultAverage.forEach((element) {
- _weightWeeklyTimeSeriesSalesList.add(WeekChartDate(
- x: element.weightDate, y: element.dailyAverageResult));
+ weightWeekTimeSeriesData.add(TimeSeriesSales2(
+ element.weightDate,
+ element.dailyAverageResult.toDouble(),
+ ));
});
for (int index = 0;
index < weightService.monthWeightMeasurementResultAverage.length;
index++) {
- _weightMonthlyTimeSeriesSalesList.add(YearMonthlyChartDate(
- x: index,
- y: weightService.monthWeightMeasurementResultAverage[index].weekAverageResult));
+ weighMonthTimeSeriesData.add(TimeSeriesSales3(
+ index,
+ weightService
+ .monthWeightMeasurementResultAverage[index].weekAverageResult
+ .toDouble(),
+ ));
}
weightService.yearWeightMeasurementResultAverage.forEach((element) {
- _weightYearTimeSeriesSalesList
- .add(WeekChartDate(x: element.date, y: element.monthAverageResult));
+ weightYearTimeSeriesData.add(TimeSeriesSales2(
+ element.date,
+ element.monthAverageResult.toDouble(),
+ ));
});
setState(ViewState.Idle);
}
}
- List> getWeightWeeklySeries() {
- return [
- charts.Series(
- id: 'Diastolic',
- colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
- domainFn: (WeekChartDate sales, _) => sales.x,
- measureFn: (WeekChartDate sales, _) => sales.y,
- data: _weightWeeklyTimeSeriesSalesList,
- ),
- ];
+ addWeightResult(
+ {String weightDate, String weightMeasured, int weightUnit}) async {
+ setState(ViewState.BusyLocal);
+ await weightService.addWeightResult(
+ weightDate: weightDate,
+ weightMeasured: weightMeasured,
+ weightUnit: weightUnit,
+ );
+ if (weightService.hasError) {
+ error = weightService.error;
+ setState(ViewState.Error);
+ } else {
+ await getWeight();
+ setState(ViewState.Idle);
+ }
}
+ Future sendReportByEmail() async {
+ setState(ViewState.BusyLocal);
- List>
- getWeightMonthlyTimeSeriesSales() {
- return [
- charts.Series(
- id: 'Sales',
- colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
- domainFn: (YearMonthlyChartDate sales, _) => sales.x,
- measureFn: (YearMonthlyChartDate sales, _) => sales.y,
- data: _weightMonthlyTimeSeriesSalesList,
- ),
- ];
+ await weightService.sendReportByEmail();
+ if (weightService.hasError) {
+ error = weightService.error;
+ setState(ViewState.ErrorLocal);
+ } else {
+ setState(ViewState.Idle);
+ }
}
- List> getWeightYearTimeSeriesSales() {
- return [
- charts.Series(
- id: 'Sales',
- colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
- domainFn: (WeekChartDate sales, _) => sales.x,
- measureFn: (WeekChartDate sales, _) => sales.y,
- data: _weightYearTimeSeriesSalesList,
- ),
- ];
+ updateWeightResult({int lineItemNo, int weightUnit, String weightMeasured,String weightDate}) async {
+ setState(ViewState.BusyLocal);
+ await weightService.updateWeightResult(
+ lineItemNo: lineItemNo,
+ weightMeasured: weightMeasured,
+ weightUnit: weightUnit,
+ weightDate: weightDate
+ );
+ if (weightService.hasError) {
+ error = weightService.error;
+ setState(ViewState.Error);
+ } else {
+ await getWeight();
+ setState(ViewState.Idle);
+ }
}
- addWeightResult(
- {String weightDate, String weightMeasured, int weightUnit}) async {
+ deleteWeightResult({int lineItemNo, }) async {
setState(ViewState.BusyLocal);
- await weightService.addWeightResult(
- weightDate: weightDate,
- weightMeasured: weightMeasured,
- weightUnit: weightUnit,);
+ await weightService.deleteWeightResult(
+ lineItemNo: lineItemNo,
+ );
if (weightService.hasError) {
error = weightService.error;
setState(ViewState.Error);
diff --git a/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart b/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
index a067a54d..ddb10f4e 100644
--- a/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
+++ b/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
@@ -62,6 +62,27 @@ class PharmacyModuleViewModel extends BaseViewModel {
}
}
+ Future createUser() async {
+ setState(ViewState.Busy);
+ await _pharmacyService.createUser();
+ if (_pharmacyService.hasError) {
+ error = _pharmacyService.error;
+ setState(ViewState.ErrorLocal);
+ } else {
+ setState(ViewState.Idle);
+ }
+ }
+ Future generatePharmacyToken() async {
+ setState(ViewState.Busy);
+ await _pharmacyService.generatePharmacyToken();
+ if (_pharmacyService.hasError) {
+ error = _pharmacyService.error;
+ setState(ViewState.ErrorLocal);
+ } else {
+ setState(ViewState.Idle);
+ }
+ }
+
Future getBannerList() async {
setState(ViewState.Busy);
await _pharmacyService.getBannerListList();
diff --git a/lib/core/viewModels/pharmacyModule/product_detail_view_model.dart b/lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
index 47a3bb11..e3a6255e 100644
--- a/lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
+++ b/lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
@@ -50,6 +50,17 @@ class ProductDetailViewModel extends BaseViewModel{
setState(ViewState.Idle);
}
+ Future notifyMe(customerId, itemID) async {
+ hasError = false;
+ setState(ViewState.Busy);
+ await _productLocationService.notifyMe(customerId, itemID);
+ if (_productLocationService.hasError) {
+ error = _productLocationService.error;
+ setState(ViewState.ErrorLocal);
+ } else
+ setState(ViewState.Idle);
+ }
+
Future addToCartData(quantity, itemID) async {
hasError = false;
setState(ViewState.Busy);
diff --git a/lib/core/viewModels/pharmacy_categorise_view_model.dart b/lib/core/viewModels/pharmacy_categorise_view_model.dart
index 5e1f4f9f..d26d860d 100644
--- a/lib/core/viewModels/pharmacy_categorise_view_model.dart
+++ b/lib/core/viewModels/pharmacy_categorise_view_model.dart
@@ -16,30 +16,22 @@ import 'base_view_model.dart';
class PharmacyCategoriseViewModel extends BaseViewModel {
bool hasError = false;
- PharmacyCategoriseService _pharmacyCategoriseService =
- locator();
+ PharmacyCategoriseService _pharmacyCategoriseService = locator();
- List get categorise =>
- _pharmacyCategoriseService.categoriseList;
+ List get categorise => _pharmacyCategoriseService.categoriseList;
- List get categoriseParent =>
- _pharmacyCategoriseService.parentCategoriseList;
+ List get categoriseParent => _pharmacyCategoriseService.parentCategoriseList;
- List get parentProducts =>
- _pharmacyCategoriseService.parentProductsList;
+ List get parentProducts => _pharmacyCategoriseService.parentProductsList;
- List get subCategorise =>
- _pharmacyCategoriseService.subCategoriseList;
+ List get subCategorise => _pharmacyCategoriseService.subCategoriseList;
- List get subProducts =>
- _pharmacyCategoriseService.subProductsList;
+ List get subProducts => _pharmacyCategoriseService.subProductsList;
- List get finalProducts =>
- _pharmacyCategoriseService.finalProducts;
+ List get finalProducts => _pharmacyCategoriseService.finalProducts;
List get brandsList => _pharmacyCategoriseService.brandsList;
- List get searchList =>
- _pharmacyCategoriseService.searchList;
+ List get searchList => _pharmacyCategoriseService.searchList;
List get scanList => _pharmacyCategoriseService.scanList;
diff --git a/lib/core/viewModels/project_view_model.dart b/lib/core/viewModels/project_view_model.dart
index baaf6b5b..2bb75305 100644
--- a/lib/core/viewModels/project_view_model.dart
+++ b/lib/core/viewModels/project_view_model.dart
@@ -32,7 +32,7 @@ class ProjectViewModel extends BaseViewModel {
Locale get appLocal => _appLocale;
- LocaleType get localeType => isArabic ? LocaleType.en : LocaleType.ar;
+ LocaleType get localeType => isArabic ? LocaleType.ar : LocaleType.en;
bool get isArabic => _isArabic;
diff --git a/lib/locator.dart b/lib/locator.dart
index 956f969c..483aaa83 100644
--- a/lib/locator.dart
+++ b/lib/locator.dart
@@ -61,12 +61,14 @@ import 'core/service/parmacyModule/order-preview-service.dart';
import 'core/service/notifications_service.dart';
import 'core/service/parmacyModule/terms-condition-service.dart';
import 'core/service/privilege_service.dart';
+import 'core/service/termsConditionsService.dart';
import 'core/service/weather_service.dart';
import 'core/viewModels/AlHabibMedicalService/cmc_view_model.dart';
import 'core/service/parmacyModule/parmacy_module_service.dart';
import 'core/service/offers_service.dart';
import 'core/service/pharmacy_categorise_service.dart';
+import 'core/viewModels/TermsConditionsViewModel.dart';
import 'core/viewModels/all_habib_medical_services/e_referral_view_model.dart';
import 'core/viewModels/appointment_rate_view_model.dart';
import 'core/viewModels/blooddonation/blood_details_view_model.dart';
@@ -210,6 +212,7 @@ void setupLocator() {
locator.registerLazySingleton(() => PrivilegeService());
locator.registerLazySingleton(() => WeatherService());
+ locator.registerLazySingleton(() => TermsConditionsService());
/// View Model
locator.registerFactory(() => HospitalViewModel());
@@ -248,7 +251,7 @@ void setupLocator() {
locator.registerFactory(() => H2OViewModel());
locator.registerFactory(() => BloodSugarViewMode());
locator.registerFactory(() => BloodPressureViewMode());
- locator.registerFactory(() => WeightPressureViewMode());
+ locator.registerFactory(() => WeightPressureViewModel());
locator.registerFactory(() => EyeViewModel());
locator.registerFactory(() => ActiveMedicationsViewModel());
locator.registerFactory(() => AskDoctorViewModel());
@@ -287,4 +290,5 @@ void setupLocator() {
// ---------------------
locator.registerLazySingleton(
() => GeofencingServices()); // Geofencing Services
+ locator.registerFactory(() => TermsConditionsViewModel());
}
diff --git a/lib/models/SmartWatch/HealthData.dart b/lib/models/SmartWatch/HealthData.dart
new file mode 100644
index 00000000..f01c3bf8
--- /dev/null
+++ b/lib/models/SmartWatch/HealthData.dart
@@ -0,0 +1,8 @@
+class healthData {
+ int MedCategoryID;
+ int MedSubCategoryID;
+ String Value;
+ String Notes;
+ String MachineDate;
+ int TransactionsListID;
+}
diff --git a/lib/models/SmartWatch/YearlyStepsResModel.dart b/lib/models/SmartWatch/YearlyStepsResModel.dart
new file mode 100644
index 00000000..728633d9
--- /dev/null
+++ b/lib/models/SmartWatch/YearlyStepsResModel.dart
@@ -0,0 +1,36 @@
+class YearlyStepsResModel {
+ double valueSum;
+ int medCategoryID;
+ int month;
+ String monthName;
+ int patientID;
+ int year;
+
+ YearlyStepsResModel(
+ {this.valueSum,
+ this.medCategoryID,
+ this.month,
+ this.monthName,
+ this.patientID,
+ this.year});
+
+ YearlyStepsResModel.fromJson(Map json) {
+ valueSum = json['ValueSum'];
+ medCategoryID = json['MedCategoryID'];
+ month = json['Month'];
+ monthName = json['MonthName'];
+ patientID = json['PatientID'];
+ year = json['Year'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['ValueSum'] = this.valueSum;
+ data['MedCategoryID'] = this.medCategoryID;
+ data['Month'] = this.month;
+ data['MonthName'] = this.monthName;
+ data['PatientID'] = this.patientID;
+ data['Year'] = this.year;
+ return data;
+ }
+}
diff --git a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
index 3c3c18c1..d81fe78f 100644
--- a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
+++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
@@ -37,6 +37,8 @@ import 'package:geolocator/geolocator.dart';
import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
+import 'h2o/h2o_page.dart';
+
class AllHabibMedicalService extends StatefulWidget {
//TODO
final Function goToMyProfile;
@@ -56,12 +58,8 @@ class _AllHabibMedicalServiceState extends State {
@override
void initState() {
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
- locationUtils =
- new LocationUtils(isShowConfirmDialog: true, context: context);
- WidgetsBinding.instance.addPostFrameCallback((_) => {
- Geolocator.getLastKnownPosition()
- .then((value) => setLocation(value))
- });
+ locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context);
+ WidgetsBinding.instance.addPostFrameCallback((_) => {Geolocator.getLastKnownPosition().then((value) => setLocation(value))});
});
super.initState();
}
@@ -100,8 +98,7 @@ class _AllHabibMedicalServiceState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
- TranslationBase.of(context)
- .healthWeatherIndicators,
+ TranslationBase.of(context).healthWeatherIndicators,
color: Colors.white,
fontWeight: FontWeight.w600,
),
@@ -134,11 +131,7 @@ class _AllHabibMedicalServiceState extends State {
width: 60,
height: 60,
),
- Directionality(
- textDirection: TextDirection.ltr,
- child: AppText(weather,
- fontSize: 22,
- color: Colors.white))
+ Directionality(textDirection: TextDirection.ltr, child: AppText(weather, fontSize: 22, color: Colors.white))
],
),
Texts(
@@ -158,8 +151,7 @@ class _AllHabibMedicalServiceState extends State {
Navigator.pop(context);
widget.goToMyProfile();
},
- imageLocation:
- 'assets/images/new-design/my_file_bottom_bar.png',
+ imageLocation: 'assets/images/new-design/my_file_bottom_bar.png',
title: TranslationBase.of(context).myMedicalFile,
),
ServicesContainer(
@@ -181,8 +173,7 @@ class _AllHabibMedicalServiceState extends State {
),
),
),
- imageLocation:
- 'assets/images/new-design/booking_icon_active.png',
+ imageLocation: 'assets/images/new-design/booking_icon_active.png',
title: TranslationBase.of(context).bookAppo,
),
ServicesContainer(
@@ -192,8 +183,7 @@ class _AllHabibMedicalServiceState extends State {
page: PaymentService(),
),
),
- imageLocation:
- 'assets/images/al-habib_online_payment_service_icon.png',
+ imageLocation: 'assets/images/al-habib_online_payment_service_icon.png',
title: TranslationBase.of(context).onlinePaymentService,
),
ServicesContainer(
@@ -201,8 +191,7 @@ class _AllHabibMedicalServiceState extends State {
context,
FadePage(),
),
- imageLocation:
- 'assets/images/al-habib_online_payment_service_icon.png',
+ imageLocation: 'assets/images/al-habib_online_payment_service_icon.png',
title: TranslationBase.of(context).covid19_driveThrueTest,
),
ServicesContainer(
@@ -235,17 +224,13 @@ class _AllHabibMedicalServiceState extends State {
page: InsuranceUpdate(),
),
),
- imageLocation:
- 'assets/images/medical/insurance_card_icon.png',
+ imageLocation: 'assets/images/medical/insurance_card_icon.png',
title: TranslationBase.of(context).updateInsurance,
),
ServicesContainer(
onTap: () => Navigator.push(
context,
- FadePage(
- page: authUser.patientID == null
- ? EReferralIndexPage()
- : EReferralPage()),
+ FadePage(page: authUser.patientID == null ? EReferralIndexPage() : EReferralPage()),
),
imageLocation: 'assets/images/ereferral_service_icon.png',
title: TranslationBase.of(context).ereferral,
@@ -257,20 +242,18 @@ class _AllHabibMedicalServiceState extends State {
page: MyFamily(),
),
),
- imageLocation:
- 'assets/images/new-design/family_menu_icon_red.png',
+ imageLocation: 'assets/images/new-design/family_menu_icon_red.png',
title: TranslationBase.of(context).myFamily,
),
- if(projectViewModel.havePrivilege(35))
- ServicesContainer(
- onTap: () => Navigator.push(
- context,
- FadePage(page: ChildVaccinesPage()),
+ if (projectViewModel.havePrivilege(35))
+ ServicesContainer(
+ onTap: () => Navigator.push(
+ context,
+ FadePage(page: ChildVaccinesPage()),
+ ),
+ imageLocation: 'assets/images/new-design/children_vaccines_icon.png',
+ title: TranslationBase.of(context).childVaccine,
),
- imageLocation:
- 'assets/images/new-design/children_vaccines_icon.png',
- title: TranslationBase.of(context).childVaccine,
- ),
ServicesContainer(
onTap: () => Navigator.push(
context,
@@ -278,27 +261,26 @@ class _AllHabibMedicalServiceState extends State {
page: ToDo(isShowAppBar: true),
),
),
- imageLocation:
- 'assets/images/new-design/upcoming_icon_bottom_bar.png',
+ imageLocation: 'assets/images/new-design/upcoming_icon_bottom_bar.png',
title: TranslationBase.of(context).todoList,
),
- if(projectViewModel.havePrivilege(42))
- ServicesContainer(
- onTap: () => Navigator.push(
- context,
- FadePage(page: SymptomInfo()),
- ),
- imageLocation: 'assets/images/new-design/body_icon.png',
- title: TranslationBase.of(context).symptomCheckerTitle),
- if(projectViewModel.havePrivilege(36))
+ if (projectViewModel.havePrivilege(42))
ServicesContainer(
- onTap: () => Navigator.push(
- context,
- FadePage(page: BloodDonationPage()),
+ onTap: () => Navigator.push(
+ context,
+ FadePage(page: SymptomInfo()),
+ ),
+ imageLocation: 'assets/images/new-design/body_icon.png',
+ title: TranslationBase.of(context).symptomCheckerTitle),
+ if (projectViewModel.havePrivilege(36))
+ ServicesContainer(
+ onTap: () => Navigator.push(
+ context,
+ FadePage(page: BloodDonationPage()),
+ ),
+ imageLocation: 'assets/images/new-design/blood_icon.png',
+ title: TranslationBase.of(context).bloodD,
),
- imageLocation: 'assets/images/new-design/blood_icon.png',
- title: TranslationBase.of(context).bloodD,
- ),
ServicesContainer(
onTap: () => Navigator.push(
context,
@@ -306,8 +288,7 @@ class _AllHabibMedicalServiceState extends State {
page: (HealthCalculators()),
),
),
- imageLocation:
- 'assets/images/new-design/health_calculator_icon.png',
+ imageLocation: 'assets/images/new-design/health_calculator_icon.png',
title: TranslationBase.of(context).calculators,
),
ServicesContainer(
@@ -317,30 +298,30 @@ class _AllHabibMedicalServiceState extends State {
page: HealthConverter(),
),
),
- imageLocation:
- 'assets/images/new-design/health_convertor_icon.png',
+ imageLocation: 'assets/images/new-design/health_convertor_icon.png',
title: TranslationBase.of(context).converters,
),
- if(projectViewModel.havePrivilege(38))
- ServicesContainer(
- onTap: () => Navigator.push(
- context,
- FadePage(
- page: H2OPageIndexPage(),
- ),
+ if (projectViewModel.havePrivilege(38))
+ ServicesContainer(
+ onTap: () => Navigator.push(context, FadePage(page: H2OPage())),
+ // Navigator.push(
+ // context,
+ // FadePage(
+ // page: H2OPageIndexPage(),
+ // ),
+ // ),
+ imageLocation: 'assets/images/new-design/water_icon.png',
+ title: TranslationBase.of(context).h2o,
),
- imageLocation: 'assets/images/new-design/water_icon.png',
- title: 'H2O',
- ),
- if(projectViewModel.havePrivilege(41))
- ServicesContainer(
- onTap: () => Navigator.push(
- context,
- FadePage(),
+ if (projectViewModel.havePrivilege(41))
+ ServicesContainer(
+ onTap: () => Navigator.push(
+ context,
+ FadePage(),
+ ),
+ imageLocation: 'assets/images/new-design/smartwatch_icon.png',
+ title: TranslationBase.of(context).smartWatches,
),
- imageLocation: 'assets/images/new-design/smartwatch_icon.png',
- title: TranslationBase.of(context).smartWatches,
- ),
ServicesContainer(
onTap: () => Navigator.push(
context,
@@ -348,15 +329,12 @@ class _AllHabibMedicalServiceState extends State {
page: ParkingPage(),
),
),
- imageLocation:
- 'assets/images/new-design/parking_system_icon.png',
+ imageLocation: 'assets/images/new-design/parking_system_icon.png',
title: TranslationBase.of(context).parking,
),
ServicesContainer(
- onTap: () => launch(
- "https://hmgwebservices.com/vt_mobile/html/index.html"),
- imageLocation:
- 'assets/images/new-design/virtual_tour_icon.png',
+ onTap: () => launch("https://hmgwebservices.com/vt_mobile/html/index.html"),
+ imageLocation: 'assets/images/new-design/virtual_tour_icon.png',
title: TranslationBase.of(context).vTour,
),
ServicesContainer(
@@ -364,12 +342,10 @@ class _AllHabibMedicalServiceState extends State {
Navigator.of(context).push(MaterialPageRoute(
builder: (BuildContext context) => MyWebView(
title: "HMG News",
- selectedUrl:
- "https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live",
+ selectedUrl: "https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live",
)));
},
- imageLocation:
- 'assets/images/new-design/twitter_dashboard_icon.png',
+ imageLocation: 'assets/images/new-design/twitter_dashboard_icon.png',
title: TranslationBase.of(context).latestNews,
),
ServicesContainer(
@@ -392,8 +368,7 @@ class _AllHabibMedicalServiceState extends State {
getAuthUser() async {
if (await this.sharedPref.getObject(USER_PROFILE) != null) {
- var data = AuthenticatedUser.fromJson(
- await this.sharedPref.getObject(USER_PROFILE));
+ var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE));
setState(() {
authUser = data;
});
@@ -407,8 +382,7 @@ class _AllHabibMedicalServiceState extends State {
});
} else {
setState(() {
- weather =
- data != null ? data['Temperature'].toString() + '\u2103' : '--';
+ weather = data != null ? data['Temperature'].toString() + '\u2103' : '--';
});
}
}
diff --git a/lib/pages/AlHabibMedicalService/h2o/Dialog/confirm_add_amount_dialog.dart b/lib/pages/AlHabibMedicalService/h2o/Dialog/confirm_add_amount_dialog.dart
index 90386827..1558b8c7 100644
--- a/lib/pages/AlHabibMedicalService/h2o/Dialog/confirm_add_amount_dialog.dart
+++ b/lib/pages/AlHabibMedicalService/h2o/Dialog/confirm_add_amount_dialog.dart
@@ -12,9 +12,7 @@ class ConfirmAddAmountDialog extends StatefulWidget {
final String unit;
final H2OViewModel model;
-
- ConfirmAddAmountDialog(
- {Key key, this.model,this.amount,this.unit ="ml"});
+ ConfirmAddAmountDialog({Key key, this.model, this.amount, this.unit = "ml"});
@override
_ConfirmAddAmountDialogState createState() => _ConfirmAddAmountDialogState();
@@ -29,10 +27,12 @@ class _ConfirmAddAmountDialogState extends State {
@override
Widget build(BuildContext context) {
return SimpleDialog(
- contentPadding: EdgeInsets.fromLTRB(28.0, 24.0, 28.0, 0.0),
+ contentPadding: EdgeInsets.fromLTRB(24.0, 0.0, 24.0, 8.0),
+ titlePadding: EdgeInsets.fromLTRB(24.0, 16.0, 24.0, 8.0),
title: Center(
child: Texts(
- "Confirm",
+ TranslationBase.of(context).confirm,
+ textAlign: TextAlign.center,
color: Colors.black,
),
),
@@ -42,12 +42,13 @@ class _ConfirmAddAmountDialogState extends State {
Divider(),
Center(
child: Texts(
- "Are you sure you want to Add ${widget.amount} ${widget.unit} ?",
+ "${TranslationBase.of(context).areyousure} ${widget.amount} ${widget.unit} ?",
+ textAlign: TextAlign.center,
color: Colors.grey,
),
),
SizedBox(
- height: 5.0,
+ height: 16.0,
),
Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -79,8 +80,8 @@ class _ConfirmAddAmountDialogState extends State {
Expanded(
flex: 1,
child: InkWell(
- onTap: () async{
- InsertUserActivityRequestModel insertUserActivityRequestModel= InsertUserActivityRequestModel(quantityIntake:widget.amount );
+ onTap: () async {
+ InsertUserActivityRequestModel insertUserActivityRequestModel = InsertUserActivityRequestModel(quantityIntake: widget.amount);
await widget.model.insertUserActivity(insertUserActivityRequestModel);
Navigator.pop(context);
},
@@ -88,20 +89,17 @@ class _ConfirmAddAmountDialogState extends State {
padding: const EdgeInsets.all(8.0),
child: Center(
child: Texts(
- TranslationBase.of(context).ok,
- fontWeight: FontWeight.w400,
- )),
+ TranslationBase.of(context).ok.toUpperCase(),
+ fontWeight: FontWeight.w400,
+ )),
),
),
),
],
- )
+ ),
],
)
],
);
}
}
-
-
-
diff --git a/lib/pages/AlHabibMedicalService/h2o/Dialog/select_amount_dialog.dart b/lib/pages/AlHabibMedicalService/h2o/Dialog/select_amount_dialog.dart
index d70aec4e..2df90419 100644
--- a/lib/pages/AlHabibMedicalService/h2o/Dialog/select_amount_dialog.dart
+++ b/lib/pages/AlHabibMedicalService/h2o/Dialog/select_amount_dialog.dart
@@ -1,3 +1,5 @@
+import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
+import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/cupertino.dart';
@@ -5,25 +7,32 @@ import 'package:flutter/material.dart';
// ignore: must_be_immutable
class SelectAmountDialog extends StatefulWidget {
- List searchAmount = [
- AmountModel(name: "l",nameAr:"لتر",value: 1),
- AmountModel(name: "ml",nameAr:"مم لتر",value: 2),
- ];
final Function(AmountModel) onValueSelected;
AmountModel selectedAmount;
- SelectAmountDialog(
- {Key key, this.onValueSelected, this.selectedAmount});
+ SelectAmountDialog({Key key, this.onValueSelected, this.selectedAmount});
@override
_SelectAmountDialogState createState() => _SelectAmountDialogState();
}
class _SelectAmountDialogState extends State {
+ List searchAmount = [
+ AmountModel(name: "l", nameAr: "لتر", value: 1),
+ AmountModel(name: "ml", nameAr: "مم لتر", value: 2),
+ ];
@override
void initState() {
super.initState();
- widget.selectedAmount = widget.selectedAmount ?? widget.searchAmount[0];
+ widget.selectedAmount = widget.selectedAmount ?? searchAmount[0];
+ getLanguage();
+ }
+
+ String languageID = "en";
+
+ void getLanguage() async {
+ languageID = await sharedPref.getString(APP_LANGUAGE);
+ setState(() {});
}
@override
@@ -32,11 +41,14 @@ class _SelectAmountDialogState extends State {
children: [
Column(
children: [
- Texts("Select the preferred unit", fontSize: 20,),
+ Texts(
+ TranslationBase.of(context).preferredunit,
+ fontSize: 20,
+ ),
Divider(),
...List.generate(
- widget.searchAmount.length,
- (index) => Column(
+ searchAmount.length,
+ (index) => Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
@@ -49,13 +61,13 @@ class _SelectAmountDialogState extends State {
child: InkWell(
onTap: () {
setState(() {
- widget.selectedAmount = widget.searchAmount[index];
+ widget.selectedAmount = searchAmount[index];
});
},
child: ListTile(
- title: Text(widget.searchAmount[index].name),
+ title: Text(languageID == "ar" ? searchAmount[index].nameAr : searchAmount[index].name),
leading: Radio(
- value: widget.searchAmount[index],
+ value: searchAmount[index],
groupValue: widget.selectedAmount,
activeColor: Colors.red[800],
onChanged: (value) {
@@ -116,9 +128,9 @@ class _SelectAmountDialogState extends State {
padding: const EdgeInsets.all(8.0),
child: Center(
child: Texts(
- TranslationBase.of(context).ok,
- fontWeight: FontWeight.w400,
- )),
+ TranslationBase.of(context).ok,
+ fontWeight: FontWeight.w400,
+ )),
),
),
),
@@ -130,6 +142,7 @@ class _SelectAmountDialogState extends State {
);
}
}
+
class AmountModel {
String name;
String nameAr;
@@ -151,7 +164,3 @@ class AmountModel {
return data;
}
}
-
-
-
-
diff --git a/lib/pages/AlHabibMedicalService/h2o/Dialog/setting_page_radio_button_list_dialog.dart b/lib/pages/AlHabibMedicalService/h2o/Dialog/setting_page_radio_button_list_dialog.dart
new file mode 100644
index 00000000..580207d8
--- /dev/null
+++ b/lib/pages/AlHabibMedicalService/h2o/Dialog/setting_page_radio_button_list_dialog.dart
@@ -0,0 +1,101 @@
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:flutter/material.dart';
+
+class CommonRadioButtonDialog extends StatefulWidget {
+ final List list;
+ final String title;
+ final int selectedIndex;
+ final Function(int) onSelect;
+ CommonRadioButtonDialog({Key key, this.title = "", this.selectedIndex = 0, this.list, this.onSelect}) : super(key: key);
+
+ @override
+ _CommonRadioButtonDialogState createState() {
+ return _CommonRadioButtonDialogState();
+ }
+}
+
+class _CommonRadioButtonDialogState extends State {
+ int _selectedIndex = 0;
+
+ @override
+ void initState() {
+ super.initState();
+ _selectedIndex = widget.selectedIndex;
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Dialog(
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(4),
+ ),
+ elevation: 0,
+ backgroundColor: Colors.white,
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Container(
+ height: widget.title == "" ? 24 : 50,
+ alignment: Alignment.center,
+ child: Text(
+ widget.title,
+ style: TextStyle(color: Colors.black87, fontSize: 18, fontWeight: FontWeight.w500),
+ ),
+ ),
+ Divider(height: 1, color: Colors.black38),
+ ListView.builder(
+ shrinkWrap: true,
+ padding: EdgeInsets.only(top: 4, bottom: 4),
+ physics: NeverScrollableScrollPhysics(),
+ itemBuilder: (context, index) {
+ return RadioListTile(
+ value: index,
+ dense: true,
+ activeColor: Colors.black54,
+ groupValue: _selectedIndex,
+ onChanged: (_index) => setState(() => _selectedIndex = _index),
+ title: Text(
+ widget.list[index],
+ style: TextStyle(fontWeight: FontWeight.w500),
+ ),
+ );
+ },
+ itemCount: widget.list?.length ?? 0,
+ ),
+ Divider(height: 1, color: Colors.black38),
+ Container(
+ height: 50,
+ alignment: Alignment.center,
+ child: Row(
+ children: [
+ Expanded(
+ child: FlatButton(
+ child: Text(
+ TranslationBase.of(context).cancel,
+ style: TextStyle(color: Colors.redAccent, fontSize: 16, fontWeight: FontWeight.w500),
+ ),
+ onPressed: () => Navigator.pop(context),
+ ),
+ ),
+ Expanded(
+ child: FlatButton(
+ child: Text(
+ TranslationBase.of(context).ok,
+ style: TextStyle(color: Colors.black87, fontSize: 16, fontWeight: FontWeight.w500),
+ ),
+ onPressed: () => widget.onSelect(_selectedIndex),
+ ),
+ )
+ ],
+ ),
+ ),
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/pages/AlHabibMedicalService/h2o/add_custom_amount.dart b/lib/pages/AlHabibMedicalService/h2o/add_custom_amount.dart
index 036ed186..2b22a100 100644
--- a/lib/pages/AlHabibMedicalService/h2o/add_custom_amount.dart
+++ b/lib/pages/AlHabibMedicalService/h2o/add_custom_amount.dart
@@ -1,6 +1,7 @@
import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/H2O_view_model.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/Dialog/confirm_add_amount_dialog.dart';
import 'package:diplomaticquarterapp/pages/medical/balance/new_text_Field.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@@ -36,7 +37,7 @@ class _AddCustomAmountState extends State {
Widget build(BuildContext context) {
return AppScaffold(
isShowAppBar: true,
- appBarTitle: "Enter amount",
+ appBarTitle:TranslationBase.of(context).customLabel,
body: SingleChildScrollView(
physics: ScrollPhysics(),
child: Container(
@@ -51,7 +52,7 @@ class _AddCustomAmountState extends State {
height: 12,
),
NewTextFields(
- hintText: "Enter the amount of water:",
+ hintText: TranslationBase.of(context).h2oAmountOfWater,
// type: "Number",
controller: _nameTextController,
),
@@ -81,7 +82,7 @@ class _AddCustomAmountState extends State {
),
SecondaryButton(
textColor: Colors.white,
- label: "OK",
+ label: TranslationBase.of(context).ok,
onTap: () async {
Navigator.of(context).pop();
showConfirmMessage (int.parse(_nameTextController.text), widget.model);
@@ -120,7 +121,7 @@ void confirmAmountTypeDialog() {
if (selectedAmount != null)
return selectedAmount.name;
else
- return "Select unit";
+ return TranslationBase.of(context).selectUnit;
}
diff --git a/lib/pages/AlHabibMedicalService/h2o/h20_setting.dart b/lib/pages/AlHabibMedicalService/h2o/h20_setting.dart
new file mode 100644
index 00000000..4295558a
--- /dev/null
+++ b/lib/pages/AlHabibMedicalService/h2o/h20_setting.dart
@@ -0,0 +1,463 @@
+import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/user_detail_model.dart';
+import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/H2O_service.dart';
+import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/H2O_view_model.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart';
+import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/painting.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+
+import 'Dialog/setting_page_radio_button_list_dialog.dart';
+
+class H2oSetting extends StatefulWidget {
+ final UserDetailModel userDetailModel;
+ final H2OViewModel viewModel;
+ H2oSetting({Key key, this.userDetailModel, this.viewModel}) : super(key: key);
+
+ @override
+ _H2oSettingState createState() {
+ return _H2oSettingState();
+ }
+}
+
+class _H2oSettingState extends State {
+ TextEditingController _nameController = TextEditingController();
+ TextEditingController _heightController = TextEditingController();
+ TextEditingController _weightController = TextEditingController();
+ bool _isUnitML = false;
+ bool _isGenderMale = false;
+ bool _isHeightCM = false;
+ bool _isWeightKG = false;
+ double _heightValue = 1;
+ double _weightValue = 1;
+
+ List _activityLevelListEng = [];
+ List _remindedTimeListEng = [];
+ int _selectedActiveLevel = 1;
+ int _selectedRemindedTime = 0;
+ DateTime _dobDate = DateTime.now();
+ DateTime _tempDate = DateTime.now();
+
+ UserDetailModel _userDetailModel;
+
+ @override
+ void initState() {
+ super.initState();
+ _userDetailModel = widget.userDetailModel;
+ _heightValue = _userDetailModel.height;
+ _weightValue = _userDetailModel.weight;
+ _heightController.text = _heightValue.toStringAsFixed(0);
+ _weightController.text = _weightValue.toStringAsFixed(0);
+ _nameController.text = _userDetailModel.firstName;
+ _isWeightKG = _userDetailModel.isWeightInKG;
+ _isHeightCM = _userDetailModel.isHeightInCM;
+ _isGenderMale = _userDetailModel.gender == "M" ? true : false;
+ _dobDate = DateUtil.convertStringToDate(_userDetailModel.dOB);
+ _selectedActiveLevel = _userDetailModel.activityID ?? 1;
+ }
+
+ @override
+ void didChangeDependencies() {
+ // TODO: implement didChangeDependencies
+ super.didChangeDependencies();
+
+ _activityLevelListEng = [
+ TranslationBase.of(context).notActive,
+ TranslationBase.of(context).lightActive,
+ TranslationBase.of(context).modActive,
+ TranslationBase.of(context).active
+ ];
+
+ _remindedTimeListEng = [
+ "1 ${TranslationBase.of(context).time}",
+ "2 ${TranslationBase.of(context).times}",
+ "3 ${TranslationBase.of(context).times}",
+ "4 ${TranslationBase.of(context).times}"
+ ];
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return AppScaffold(
+ isShowAppBar: true,
+ appBarTitle: TranslationBase.of(context).h2o,
+ showHomeAppBarIcon: false,
+ body: SingleChildScrollView(
+ padding: EdgeInsets.fromLTRB(8, 8, 8, 80),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ TextField(
+ controller: _nameController,
+ decoration: InputDecoration(
+ labelText: TranslationBase.of(context).enterNameHere,
+ labelStyle: TextStyle(color: Colors.black87),
+ fillColor: Colors.white,
+ filled: true,
+ border: UnderlineInputBorder(
+ borderSide: BorderSide(
+ width: 0,
+ style: BorderStyle.none,
+ ),
+ borderRadius: BorderRadius.circular(6.0),
+ ),
+ ),
+ ),
+ SizedBox(height: 8),
+ Text(TranslationBase.of(context).preferredunit),
+ SizedBox(height: 8),
+ _commonButtonsRow(TranslationBase.of(context).ml, TranslationBase.of(context).l, _isUnitML, (value) {
+ if (_isUnitML != value) {
+ setState(() {
+ _isUnitML = value;
+ });
+ }
+ }),
+ Padding(
+ padding: EdgeInsets.only(top: 8.0, bottom: 8.0),
+ child: Divider(height: 1.5, color: Colors.black54),
+ ),
+ Text(TranslationBase.of(context).gender),
+ SizedBox(height: 8),
+ _commonButtonsRow(TranslationBase.of(context).male, TranslationBase.of(context).female, _isGenderMale, (value) {
+ if (_isGenderMale != value) {
+ setState(() {
+ _isGenderMale = value;
+ });
+ }
+ }),
+ Padding(
+ padding: EdgeInsets.only(top: 8.0, bottom: 8.0),
+ child: Divider(height: 1.5, color: Colors.black54),
+ ),
+ Text(TranslationBase.of(context).height),
+ _commonSlidersRow(_heightController, 1, 270, _heightValue, (text) {
+ _heightController.text = text;
+ }, (value) {
+ setState(() {
+ _heightValue = value;
+ });
+ }),
+ SizedBox(height: 8),
+ Text(TranslationBase.of(context).heightUnit),
+ SizedBox(height: 8),
+ _commonButtonsRow(TranslationBase.of(context).cm, TranslationBase.of(context).ft, _isHeightCM, (value) {
+ if (_isHeightCM != value) {
+ setState(() {
+ _isHeightCM = value;
+ });
+ }
+ }),
+ SizedBox(height: 8),
+ _commonSlidersRow(_weightController, 1, 250, _weightValue, (text) {
+ _weightController.text = text;
+ }, (value) {
+ setState(() {
+ _weightValue = value;
+ });
+ }),
+ SizedBox(height: 8),
+ Text(TranslationBase.of(context).weightUnit),
+ SizedBox(height: 8),
+ _commonButtonsRow(TranslationBase.of(context).kg, TranslationBase.of(context).lb, _isWeightKG, (value) {
+ if (_isWeightKG != value) {
+ setState(() {
+ _isWeightKG = value;
+ });
+ }
+ }),
+ Padding(
+ padding: EdgeInsets.only(top: 8.0, bottom: 8.0),
+ child: Divider(height: 1.5, color: Colors.black54),
+ ),
+ Container(
+ padding: EdgeInsets.all(8),
+ width: MediaQuery.of(context).size.width,
+ decoration: BoxDecoration(borderRadius: BorderRadius.circular(8), color: Colors.white),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text("${TranslationBase.of(context).birth_date}:"),
+ SizedBox(height: 8),
+ InkWell(
+ onTap: () {
+ showModalBottomSheet(
+ context: context,
+ builder: (context) {
+ return Container(
+ height: 250,
+ padding: EdgeInsets.all(8),
+ child: Column(children: [
+ Container(
+ height: 40,
+ alignment: Alignment.centerRight,
+ child: Row(mainAxisSize: MainAxisSize.min, children: [
+ InkWell(
+ onTap: () => Navigator.pop(context),
+ child: Container(
+ alignment: Alignment.center,
+ padding: EdgeInsets.fromLTRB(8, 4, 8, 4),
+ child: Text(TranslationBase.of(context).cancel),
+ ),
+ ),
+ SizedBox(width: 8),
+ InkWell(
+ onTap: () {
+ Navigator.pop(context);
+ setState(() {
+ _dobDate = _tempDate;
+ });
+ },
+ child: Container(
+ alignment: Alignment.center,
+ padding: EdgeInsets.fromLTRB(8, 4, 8, 4),
+ child: Text(TranslationBase.of(context).ok),
+ ),
+ )
+ ]),
+ ),
+ Expanded(
+ child: Container(
+ width: MediaQuery.of(context).size.width,
+ child: CupertinoDatePicker(
+ initialDateTime: _dobDate,
+ mode: CupertinoDatePickerMode.date,
+ onDateTimeChanged: (_date) {
+ _tempDate = _date;
+ },
+ ),
+ ),
+ )
+ ]),
+ );
+ });
+ }, // implement cupertino dialog to select date
+ child: Row(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [Text(DateUtil.getFormattedDate(_dobDate, "yyyy-MM-dd")), Icon(Icons.arrow_drop_down_outlined)]),
+ )
+ ],
+ ),
+ ),
+ SizedBox(height: 8),
+ _commonDialogSelectorRow(TranslationBase.of(context).activityLevel, _activityLevelListEng[_selectedActiveLevel - 1], () {
+ showDialog(
+ context: context,
+ child: CommonRadioButtonDialog(
+ list: _activityLevelListEng,
+ title: TranslationBase.of(context).activityLevel,
+ onSelect: (index) {
+ Navigator.pop(context);
+ setState(() {
+ _selectedActiveLevel = index + 1;
+ });
+ },
+ selectedIndex: _selectedActiveLevel - 1,
+ ),
+ );
+ }),
+ SizedBox(height: 8),
+ _commonDialogSelectorRow(TranslationBase.of(context).reminderLabel, _remindedTimeListEng[_selectedRemindedTime], () {
+ showDialog(
+ context: context,
+ child: CommonRadioButtonDialog(
+ list: _remindedTimeListEng,
+ onSelect: (index) {
+ Navigator.pop(context);
+ setState(() {
+ _selectedRemindedTime = index;
+ });
+ },
+ selectedIndex: _selectedRemindedTime,
+ ),
+ );
+ }),
+ SizedBox(height: 16),
+ SizedBox(
+ height: 50,
+ width: MediaQuery.of(context).size.width,
+ child: FlatButton(
+ color: Theme.of(context).appBarTheme.color,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(8.0),
+ ),
+ onPressed: _updateUserDetails,
+ child: Text(
+ TranslationBase.of(context).save,
+ style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w600),
+ ),
+ ),
+ )
+ ],
+ ),
+ ),
+ );
+ }
+
+ Widget _commonButtonsRow(String rightText, String leftText, bool checkParam, Function(bool) callBack) {
+ return Row(children: [
+ Expanded(
+ child: SizedBox(
+ height: 40,
+ child: RaisedButton(
+ color: checkParam ? Theme.of(context).appBarTheme.color : Colors.white,
+ child: Text(
+ rightText,
+ style: TextStyle(color: checkParam ? Colors.white : Theme.of(context).appBarTheme.color, fontWeight: FontWeight.w600),
+ ),
+ onPressed: () => callBack(true),
+ ),
+ ),
+ ),
+ SizedBox(width: 12),
+ Expanded(
+ child: SizedBox(
+ height: 40,
+ child: RaisedButton(
+ color: !checkParam ? Theme.of(context).appBarTheme.color : Colors.white,
+ child: Text(
+ leftText,
+ style: TextStyle(color: !checkParam ? Colors.white : Theme.of(context).appBarTheme.color, fontWeight: FontWeight.w600),
+ ),
+ onPressed: () => callBack(false),
+ ),
+ ),
+ ),
+ ]);
+ }
+
+ Widget _commonSlidersRow(
+ _controller, double _minValue, double _maxValue, double _valueOrg, Function(String) onTextValueChange, Function(double) onValueChange) {
+ return Container(
+ margin: EdgeInsets.only(top: 6),
+ padding: EdgeInsets.all(6),
+ color: Colors.white,
+ height: 50,
+ child: Row(
+ children: [
+ SizedBox(
+ width: 75,
+ child: TextField(
+ controller: _controller,
+ textAlign: TextAlign.center,
+ keyboardType: TextInputType.number,
+ onChanged: (value) {
+ double _value = double.parse(value);
+ if (_value > _maxValue) {
+ onTextValueChange(_maxValue.toStringAsFixed(0));
+ onValueChange(_maxValue);
+ return;
+ } else if (_value < _minValue) {
+ onTextValueChange(_minValue.toStringAsFixed(0));
+ onValueChange(_minValue);
+ return;
+ } else if (_value >= _minValue && _value <= _maxValue) {
+ onValueChange(_value);
+ return;
+ }
+ },
+ inputFormatters: [
+ FilteringTextInputFormatter.allow(RegExp(r'[0-9]')),
+ ],
+ decoration: InputDecoration(
+ contentPadding: EdgeInsets.only(left: 4, right: 4),
+ fillColor: Colors.white,
+ filled: true,
+ focusedBorder: OutlineInputBorder(
+ borderSide: BorderSide(
+ width: 1,
+ color: Colors.grey,
+ style: BorderStyle.solid,
+ ),
+ borderRadius: BorderRadius.circular(6.0),
+ ),
+ enabledBorder: OutlineInputBorder(
+ borderSide: BorderSide(
+ width: 1,
+ color: Colors.grey,
+ style: BorderStyle.solid,
+ ),
+ borderRadius: BorderRadius.circular(6.0),
+ ),
+ ),
+ ),
+ ),
+ Expanded(
+ flex: 6,
+ child: Slider(
+ min: _minValue,
+ max: _maxValue,
+ activeColor: Colors.redAccent,
+ inactiveColor: Colors.redAccent.withOpacity(.3),
+ value: _valueOrg,
+ onChanged: (value) {
+ onTextValueChange(value.toStringAsFixed(0));
+ onValueChange(value);
+ },
+ ),
+ )
+ ],
+ ),
+ );
+ }
+
+ Widget _commonDialogSelectorRow(String title, String selectedText, VoidCallback onPressed) {
+ return Column(crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [
+ Text(title),
+ SizedBox(height: 8),
+ InkWell(
+ onTap: onPressed,
+ child: Container(
+ height: 50,
+ padding: EdgeInsets.all(8),
+ width: MediaQuery.of(context).size.width,
+ decoration: BoxDecoration(borderRadius: BorderRadius.circular(8), color: Colors.white),
+ child: Row(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [Text(selectedText), Icon(Icons.arrow_drop_down_outlined)],
+ ),
+ ),
+ )
+ ]);
+ }
+
+ void _updateUserDetails() async {
+ _userDetailModel.height = _heightValue;
+ _userDetailModel.weight = _weightValue;
+ _userDetailModel.firstName = _nameController.text;
+ _userDetailModel.isWeightInKG = _isWeightKG;
+ _userDetailModel.isHeightInCM = _isHeightCM;
+ _userDetailModel.gender = _isGenderMale ? "M" : "F";
+
+ var tempDate = DateUtil.convertDateToString(_dobDate);
+ if (!tempDate.endsWith("/")) {
+ tempDate = tempDate + "/";
+ }
+
+ _userDetailModel.dOB = tempDate;
+ _userDetailModel.activityID = _selectedActiveLevel;
+ GifLoaderDialogUtils.showMyDialog(context);
+ await widget.viewModel.updateUserDetail(_userDetailModel, (tag) {
+ if (tag) {
+ AppToast.showSuccessToast(message: TranslationBase.of(context).success);
+ }
+ GifLoaderDialogUtils.hideDialog(context);
+ });
+
+ Navigator.pop(context);
+ }
+}
diff --git a/lib/pages/AlHabibMedicalService/h2o/h2o_page.dart b/lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
index 8ac7b437..b4d39682 100644
--- a/lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
+++ b/lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
@@ -1,12 +1,15 @@
import 'dart:ui';
import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/H2O_view_model.dart';
+import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/h20_setting.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/month_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/today_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/week_page.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
+import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@@ -34,9 +37,26 @@ class _H2OPageState extends State
@override
Widget build(BuildContext context) {
return BaseView(
+ onModelReady: (model) => model.getUserDetail(),
builder: (_, model, widget) => AppScaffold(
isShowAppBar: true,
- appBarTitle: "Water Tracker",
+ appBarTitle: TranslationBase.of(context).waterTracker,
+ showHomeAppBarIcon: false,
+ baseViewModel: model,
+ appBarIcons: [
+ IconButton(
+ icon: Image.asset("assets/images/new-design/setting_gear_icon.png"),
+ color: Colors.white,
+ onPressed: () {
+ Navigator.push(
+ context,
+ FadePage(
+ page: H2oSetting(userDetailModel: model.userDetail, viewModel: model),
+ ),
+ );
+ },
+ ),
+ ],
body: Scaffold(
extendBodyBehindAppBar: true,
appBar: PreferredSize(
@@ -50,9 +70,7 @@ class _H2OPageState extends State
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
child: Container(
- color: Theme.of(context)
- .scaffoldBackgroundColor
- .withOpacity(0.8),
+ color: Theme.of(context).scaffoldBackgroundColor.withOpacity(0.8),
height: 70.0,
),
),
@@ -60,48 +78,46 @@ class _H2OPageState extends State
Center(
child: Container(
height: 60.0,
- margin: EdgeInsets.only(top: 10.0),
- width: MediaQuery.of(context).size.width * 0.9,
+ alignment: Alignment.center,
+ // margin: EdgeInsets.only(top: 10.0),
+ // width: MediaQuery.of(context).size.width * 0.9,
- child: Center(
- child: TabBar(
- isScrollable: false,
- controller: _tabController,
- indicatorWeight: 5.0,
- indicatorSize: TabBarIndicatorSize.tab,
- indicatorColor: Colors.red[800],
- labelColor: Theme.of(context).primaryColor,
- labelPadding:
- EdgeInsets.only(top: 4.0, left: 10.0, right: 13.0),
- unselectedLabelColor: Colors.grey[800],
- tabs: [
- Container(
- width: MediaQuery.of(context).size.width * 0.28,
- child: Center(
- child: Texts(
- "Today"),
- ),
+ child: TabBar(
+ isScrollable: false,
+ controller: _tabController,
+ indicatorWeight: 5.0,
+ indicatorSize: TabBarIndicatorSize.tab,
+ indicatorColor: Colors.red[800],
+ labelColor: Theme.of(context).primaryColor,
+ labelPadding: EdgeInsets.only(top: 4.0, left: 10.0, right: 13.0),
+ unselectedLabelColor: Colors.grey[800],
+ tabs: [
+ Container(
+ width: MediaQuery.of(context).size.width * 0.28,
+ child: Center(
+ child: Texts(TranslationBase.of(context).today),
),
- Container(
- width: MediaQuery.of(context).size.width * 0.28,
- child: Center(
- child: Texts("Week"),
- ),
+ ),
+ Container(
+ width: MediaQuery.of(context).size.width * 0.28,
+ child: Center(
+ child: Texts(TranslationBase.of(context).week),
),
- Container(
- width: MediaQuery.of(context).size.width * 0.28,
- child: Center(
- child: Texts("Month"),
- ),
+ ),
+ Container(
+ width: MediaQuery.of(context).size.width * 0.28,
+ child: Center(
+ child: Texts(TranslationBase.of(context).month),
),
- ],
- ),
+ ),
+ ],
),
),
),
],
),
),
+ backgroundColor: Colors.white,
body: Column(
children: [
Expanded(
diff --git a/lib/pages/AlHabibMedicalService/h2o/month_page.dart b/lib/pages/AlHabibMedicalService/h2o/month_page.dart
index f0baf34d..e0118495 100644
--- a/lib/pages/AlHabibMedicalService/h2o/month_page.dart
+++ b/lib/pages/AlHabibMedicalService/h2o/month_page.dart
@@ -1,11 +1,13 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/H2O_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/charts/app_bar_chart.dart';
import 'package:diplomaticquarterapp/widgets/errors/app_embedded_error.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/progress_indicator/app_circular_progress_Indeicator.dart';
import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
class MonthPage extends StatelessWidget {
@override
@@ -14,12 +16,39 @@ class MonthPage extends StatelessWidget {
onModelReady: (model) => model.getUserProgressForMonthData(),
builder: (_, model, widget) => AppScaffold(
isShowAppBar: false,
- appBarTitle: "Water Tracker",
- baseViewModel:model ,
- body: SingleChildScrollView(
- padding: EdgeInsets.symmetric(vertical: 12),
- child: AppBarChart(
- seriesList: model.userProgressForMonthDataSeries),
+ appBarTitle: TranslationBase.of(context).h2o,
+ baseViewModel: model,
+ body: Padding(
+ padding: EdgeInsets.all(8.0),
+ child: ListView(
+ children: [
+ Center(
+ child: Text(
+ TranslationBase.of(context).waterConsumedInMonth,
+ textAlign: TextAlign.center,
+ style: TextStyle(fontSize: 20.0, color: Colors.black87),
+ ),
+ ),
+ SizedBox(height: 16),
+ Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Container(
+ height: 10,
+ width: 40,
+ color: Colors.blue,
+ ),
+ SizedBox(width: 8),
+ Text(
+ TranslationBase.of(context).waterConsumedInMonth,
+ style: TextStyle(fontSize: 12.0),
+ ),
+ ],
+ ),
+ // SizedBox(height: 8),
+ AppBarChart(seriesList: model.userProgressForMonthDataSeries),
+ ],
+ ),
),
),
);
diff --git a/lib/pages/AlHabibMedicalService/h2o/today_page.dart b/lib/pages/AlHabibMedicalService/h2o/today_page.dart
index b92efc9e..33383287 100644
--- a/lib/pages/AlHabibMedicalService/h2o/today_page.dart
+++ b/lib/pages/AlHabibMedicalService/h2o/today_page.dart
@@ -1,6 +1,7 @@
import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/H2O_view_model.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/widgets/h20_floating_action_button.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@@ -14,7 +15,7 @@ class TodayPage extends StatelessWidget {
onModelReady: (model) => model.getUserProgressForTodayData(),
builder: (_, model, widget) => AppScaffold(
isShowAppBar: false,
- appBarTitle: "Water Tracker",
+ appBarTitle: TranslationBase.of(context).h2o,
baseViewModel: model,
body: SingleChildScrollView(
padding: EdgeInsets.symmetric(vertical: 12),
@@ -36,13 +37,14 @@ class TodayPage extends StatelessWidget {
//,
center: Center(
child: Column(
+ mainAxisSize: MainAxisSize.min,
children: [
- SizedBox(
- height: 40,
- ),
+ // SizedBox(
+ // height: 40,
+ // ),
Text(
- "Consumed",
- style: TextStyle(fontSize: 20.0),
+ TranslationBase.of(context).consumed,
+ style: TextStyle(fontSize: 16.0),
),
SizedBox(
height: 4,
@@ -50,13 +52,8 @@ class TodayPage extends StatelessWidget {
Text(
model.userProgressData == null
? "0.0"
- : model.userProgressData.quantityConsumed
- .toString() +
- 'ml',
- style: TextStyle(
- fontWeight: FontWeight.bold,
- fontSize: 20.0,
- color: HexColor("#60BCF9")),
+ : model.userProgressData.quantityConsumed.toString() + TranslationBase.of(context).ml,
+ style: TextStyle(fontWeight: FontWeight.bold, fontSize: 14.0, color: HexColor("#60BCF9")),
),
SizedBox(
height: 4,
@@ -70,8 +67,8 @@ class TodayPage extends StatelessWidget {
height: 4,
),
Text(
- "Remaining",
- style: TextStyle(fontSize: 20.0),
+ TranslationBase.of(context).remaining,
+ style: TextStyle(fontSize: 16.0),
),
SizedBox(
height: 4,
@@ -79,18 +76,11 @@ class TodayPage extends StatelessWidget {
Text(
model.userProgressData == null
? "0.0"
- : (model.userProgressData.quantityLimit -
- model.userProgressData
- .quantityConsumed) <
- 0
- ? "0 ml"
- : (model.userProgressData.quantityLimit -
- model.userProgressData
- .quantityConsumed)
- .toString() +
- ' ml',
- style: TextStyle(
- fontWeight: FontWeight.bold, fontSize: 18.0),
+ : (model.userProgressData.quantityLimit - model.userProgressData.quantityConsumed) < 0
+ ? "0 ${TranslationBase.of(context).ml}"
+ : (model.userProgressData.quantityLimit - model.userProgressData.quantityConsumed).toString() +
+ ' ${TranslationBase.of(context).ml}',
+ style: TextStyle(fontWeight: FontWeight.bold, fontSize: 14.0),
),
],
),
@@ -104,42 +94,32 @@ class TodayPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Column(
- crossAxisAlignment: CrossAxisAlignment.start,
+ crossAxisAlignment: CrossAxisAlignment.center,
children: [
- Center(
- child: Container(
- margin: EdgeInsets.only(left: 20),
- height: 30,
- width: 70,
- decoration: BoxDecoration(
- color: HexColor("#D1E3F6"),
- borderRadius:
- BorderRadius.all(Radius.circular(30))),
- ),
+ Container(
+ margin: EdgeInsets.only(bottom: 16),
+ height: 30,
+ width: 70,
+ decoration: BoxDecoration(color: HexColor("#D1E3F6"), borderRadius: BorderRadius.all(Radius.circular(30))),
),
Text(
- "Remaining % ",
- style: TextStyle(fontSize: 20.0),
+ "${TranslationBase.of(context).remaining} %",
+ style: TextStyle(fontSize: 16.0),
)
],
),
Column(
- crossAxisAlignment: CrossAxisAlignment.start,
+ crossAxisAlignment: CrossAxisAlignment.center,
children: [
- Center(
- child: Container(
- margin: EdgeInsets.only(left: 20),
- height: 30,
- width: 70,
- decoration: BoxDecoration(
- color: HexColor("#60BCF9"),
- borderRadius:
- BorderRadius.all(Radius.circular(30))),
- ),
+ Container(
+ margin: EdgeInsets.only(bottom: 16),
+ height: 30,
+ width: 70,
+ decoration: BoxDecoration(color: HexColor("#60BCF9"), borderRadius: BorderRadius.all(Radius.circular(30))),
),
Text(
- "Consumed % ",
- style: TextStyle(fontSize: 20.0),
+ "${TranslationBase.of(context).consumed} %",
+ style: TextStyle(fontSize: 16.0),
)
],
)
diff --git a/lib/pages/AlHabibMedicalService/h2o/week_page.dart b/lib/pages/AlHabibMedicalService/h2o/week_page.dart
index e42eb19b..34e365e6 100644
--- a/lib/pages/AlHabibMedicalService/h2o/week_page.dart
+++ b/lib/pages/AlHabibMedicalService/h2o/week_page.dart
@@ -1,6 +1,7 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/H2O_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/charts/app_bar_chart.dart';
import 'package:diplomaticquarterapp/widgets/errors/app_embedded_error.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@@ -15,16 +16,41 @@ class WeekPage extends StatelessWidget {
onModelReady: (model) => model.getUserProgressForWeekData(),
builder: (_, model, widget) => AppScaffold(
isShowAppBar: false,
- appBarTitle: "Water Tracker",
+ appBarTitle: TranslationBase.of(context).h2o,
baseViewModel: model,
- body: SingleChildScrollView(
- padding: EdgeInsets.symmetric(vertical: 12),
- child: AppBarChart(seriesList: model.userProgressForWeekDataSeries),
+ body: Padding(
+ padding: EdgeInsets.all(8.0),
+ child: ListView(
+ children: [
+ Center(
+ child: Text(
+ TranslationBase.of(context).waterConsumedInWeek,
+ textAlign: TextAlign.center,
+ style: TextStyle(fontSize: 20.0, color: Colors.black87),
+ ),
+ ),
+ SizedBox(height: 16),
+ Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Container(
+ height: 10,
+ width: 40,
+ color: Colors.blue,
+ ),
+ SizedBox(width: 8),
+ Text(
+ TranslationBase.of(context).waterConsumedInWeek,
+ style: TextStyle(fontSize: 12.0),
+ ),
+ ],
+ ),
+ // SizedBox(height: 8),
+ AppBarChart(seriesList: model.userProgressForWeekDataSeries),
+ ],
+ ),
),
),
);
}
}
-
-
-
diff --git a/lib/pages/AlHabibMedicalService/h2o/widgets/h20_floating_action_button.dart b/lib/pages/AlHabibMedicalService/h2o/widgets/h20_floating_action_button.dart
index 7eaed1a8..b692e6ba 100644
--- a/lib/pages/AlHabibMedicalService/h2o/widgets/h20_floating_action_button.dart
+++ b/lib/pages/AlHabibMedicalService/h2o/widgets/h20_floating_action_button.dart
@@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/insert
import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/H2O_view_model.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/Dialog/confirm_add_amount_dialog.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
@@ -12,13 +13,7 @@ import 'package:flutter/material.dart';
import '../add_custom_amount.dart';
class H20FloatingActionButton extends StatefulWidget {
- const H20FloatingActionButton({
- Key key,
- @required AnimationController controller,
- @required this.model
-
- }) :
- super(key: key);
+ const H20FloatingActionButton({Key key, @required AnimationController controller, @required this.model}) : super(key: key);
final H2OViewModel model;
@@ -26,7 +21,7 @@ class H20FloatingActionButton extends StatefulWidget {
_H20FloatingActionButtonState createState() => _H20FloatingActionButtonState();
}
-class _H20FloatingActionButtonState extends State with TickerProviderStateMixin {
+class _H20FloatingActionButtonState extends State with TickerProviderStateMixin {
AnimationController _controller;
@override
void initState() {
@@ -37,15 +32,20 @@ class _H20FloatingActionButtonState extends State with
super.initState();
}
+ void showConfirmMessage(int amount, H2OViewModel model) {
+ showDialog(
+ context: context,
+ child: ConfirmAddAmountDialog(
+ model: model,
+ amount: amount,
+ ),
+ );
+ }
+
@override
Widget build(BuildContext context) {
-
- void showConfirmMessage(int amount, H2OViewModel model) {
- showDialog(context: context, child: ConfirmAddAmountDialog(model: model,amount:amount,));
- }
-
return Container(
- margin: EdgeInsets.only(left: 20),
+ margin: EdgeInsets.only(left: 20, right: 20),
child: new Column(mainAxisSize: MainAxisSize.min, children: [
Row(
mainAxisAlignment: MainAxisAlignment.start,
@@ -55,21 +55,21 @@ class _H20FloatingActionButtonState extends State with
children: [
ActionButton(
controller: _controller,
- text: "600ml",
+ text: "600${TranslationBase.of(context).ml}",
onTap: () {
showConfirmMessage(600, widget.model);
},
),
ActionButton(
controller: _controller,
- text: "330ml",
+ text: "330${TranslationBase.of(context).ml}",
onTap: () {
showConfirmMessage(330, widget.model);
},
),
ActionButton(
controller: _controller,
- text: "200ml",
+ text: "200${TranslationBase.of(context).ml}",
onTap: () {
showConfirmMessage(200, widget.model);
},
@@ -87,11 +87,9 @@ class _H20FloatingActionButtonState extends State with
animation: _controller,
builder: (BuildContext context, Widget child) {
return new Transform(
- transform: new Matrix4.rotationZ(
- _controller.value * 0.5 * math.pi),
+ transform: new Matrix4.rotationZ(_controller.value * 0.5 * math.pi),
alignment: FractionalOffset.center,
- child: new Icon(
- _controller.isDismissed ? Icons.add : Icons.close),
+ child: new Icon(_controller.isDismissed ? Icons.add : Icons.close),
);
},
),
@@ -104,21 +102,21 @@ class _H20FloatingActionButtonState extends State with
},
),
new Container(
+ margin: EdgeInsets.only(left: 8, bottom: 4),
alignment: FractionalOffset.topCenter,
child: new ScaleTransition(
scale: new CurvedAnimation(
parent: _controller,
- curve: new Interval(0.0, 1.0 - 0 / 6 / 2.0,
- curve: Curves.easeOut),
+ curve: new Interval(0.0, 1.0 - 0 / 6 / 2.0, curve: Curves.easeOut),
),
child: new FloatingActionButton(
backgroundColor: Colors.white,
heroTag: null,
- mini: true,
+ // mini: true,
child: Text(
- "Custom",
+ TranslationBase.of(context).custom,
textAlign: TextAlign.center,
- style: TextStyle(fontSize: 14.0, color: Colors.grey),
+ style: TextStyle(fontSize: 12, color: Colors.grey),
),
onPressed: () {
Navigator.push(
@@ -134,23 +132,23 @@ class _H20FloatingActionButtonState extends State with
),
),
new Container(
+ margin: EdgeInsets.only(left: 8, bottom: 4),
alignment: FractionalOffset.topCenter,
child: new ScaleTransition(
scale: new CurvedAnimation(
parent: _controller,
- curve: new Interval(0.0, 1.0 - 0 / 6 / 2.0,
- curve: Curves.easeOut),
+ curve: new Interval(0.0, 1.0 - 0 / 6 / 2.0, curve: Curves.easeOut),
),
child: new FloatingActionButton(
backgroundColor: Colors.white,
heroTag: null,
- mini: true,
+ //mini: true,
child: Text(
- "Undo",
+ TranslationBase.of(context).undo,
textAlign: TextAlign.center,
- style: TextStyle(fontSize: 14.0, color: Colors.grey),
+ style: TextStyle(fontSize: 12.0, color: Colors.grey),
),
- onPressed: () {},
+ onPressed: undoVolume,
),
),
),
@@ -159,14 +157,16 @@ class _H20FloatingActionButtonState extends State with
]),
);
}
+
+ void undoVolume() async {
+ GifLoaderDialogUtils.showMyDialog(context);
+ await widget.model.undoUserActivity();
+ GifLoaderDialogUtils.hideDialog(context);
+ }
}
class ActionButton extends StatelessWidget {
- const ActionButton(
- {Key key,
- @required AnimationController controller,
- @required this.text,
- this.onTap})
+ const ActionButton({Key key, @required AnimationController controller, @required this.text, this.onTap})
: _controller = controller,
super(key: key);
@@ -177,6 +177,7 @@ class ActionButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
+ margin: EdgeInsets.only(left: 4, bottom: 8),
alignment: FractionalOffset.topCenter,
child: new ScaleTransition(
scale: new CurvedAnimation(
@@ -184,16 +185,15 @@ class ActionButton extends StatelessWidget {
curve: new Interval(0.0, 1.0 - 0 / 6 / 2.0, curve: Curves.easeOut),
),
child: new FloatingActionButton(
- heroTag: null,
- backgroundColor: Colors.white,
- mini: true,
- child: Text(
- text,
- textAlign: TextAlign.center,
- style: TextStyle(fontSize: 14.0, color: Colors.grey),
- ),
- onPressed: onTap
- ),
+ heroTag: null,
+ backgroundColor: Colors.white,
+ //mini: true,
+ child: Text(
+ text,
+ textAlign: TextAlign.center,
+ style: TextStyle(fontSize: 12.0, color: Colors.grey),
+ ),
+ onPressed: onTap),
),
);
}
diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart
index c84053c5..68cd2c99 100644
--- a/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart
+++ b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart
@@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
@@ -490,11 +491,11 @@ class _BMICalculatorState extends State {
height: 25.0,
),
Container(
- height: 100.0,
+ height: 50.0,
width: 350.0,
- child: Button(
+ child: SecondaryButton(
label: 'CALCULATE',
- onTap: () {
+ onTap: () => {
setState(() {
calculateBMI();
showTextResult();
@@ -510,7 +511,7 @@ class _BMICalculatorState extends State {
)),
);
}
- });
+ })
},
),
),
diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart
index 1af0f949..01393e0b 100644
--- a/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart
+++ b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart
@@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
@@ -687,9 +688,9 @@ class _BmrCalculatorState extends State {
height: 30.0,
),
Container(
- height: 100.0,
+ height: 50.0,
width: 350.0,
- child: Button(
+ child: SecondaryButton(
label: 'CALCULATE',
onTap: () {
setState(() {
diff --git a/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
index 91847e37..51b4cad6 100644
--- a/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
+++ b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
@@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
@@ -985,8 +986,13 @@ class _BodyFatState extends State {
Container(
height: 100.0,
width: 350.0,
- child: Button(
+ child: SecondaryButton(
label: 'CALCULATE',
+ // onTap: () => {
+ // setState(() {
+ // print('hiii');
+ // })
+ // }
onTap: () {
setState(() {
calculateBodyFat();
diff --git a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart
index 4361425a..e2196540 100644
--- a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart
+++ b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart
@@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
@@ -648,7 +649,7 @@ class _CalorieCalculatorState extends State {
Container(
height: 100.0,
width: 350.0,
- child: Button(
+ child: SecondaryButton(
label: 'CALCULATE',
onTap: () {
setState(() {
diff --git a/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart b/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart
index e273b075..50152328 100644
--- a/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart
+++ b/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart
@@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
@@ -329,9 +330,9 @@ class _CarbsState extends State {
height: 55.0,
),
Container(
- height: 100.0,
+ height: 50.0,
width: 350.0,
- child: Button(
+ child: SecondaryButton(
label: 'CALCULATE',
onTap: () {
setState(() {
diff --git a/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart b/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart
index c9993b95..c69f0564 100644
--- a/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart
+++ b/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart
@@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
@@ -111,9 +112,9 @@ class _DeliveryDueState extends State {
height: 280.0,
),
Container(
- height: 100.0,
+ height: 50.0,
width: 350.0,
- child: Button(
+ child: SecondaryButton(
label: 'CALCULATE',
onTap: () {
setState(() {
diff --git a/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart b/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart
index 9bdbfb36..2aff7836 100644
--- a/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart
+++ b/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart
@@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
@@ -518,7 +519,7 @@ class _IdealBodyState extends State {
Container(
height: 100.0,
width: 350.0,
- child: Button(
+ child: SecondaryButton(
label: 'CALCULATE',
onTap: () {
setState(() {
diff --git a/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart b/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart
index 1a272c11..9c5dc0d3 100644
--- a/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart
+++ b/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart
@@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
@@ -319,9 +320,9 @@ class _OvulationPeriodState extends State {
height: 220.0,
),
Container(
- height: 100.0,
+ height: 50.0,
width: 350.0,
- child: Button(
+ child: SecondaryButton(
label: 'CALCULATE',
onTap: () {
setState(() {
diff --git a/lib/pages/AlHabibMedicalService/health_converter.dart b/lib/pages/AlHabibMedicalService/health_converter.dart
index 61ea406f..2b3b1a8e 100644
--- a/lib/pages/AlHabibMedicalService/health_converter.dart
+++ b/lib/pages/AlHabibMedicalService/health_converter.dart
@@ -18,7 +18,7 @@ class _HealthConverterState extends State {
Widget build(BuildContext context) {
return AppScaffold(
isShowAppBar: true,
- appBarTitle: 'Health Converter',
+ appBarTitle: TranslationBase.of(context).converters,
body: Column(
children: [
Container(
@@ -37,9 +37,9 @@ class _HealthConverterState extends State {
);
},
child: MedicalProfileItem(
- title: 'Blood',
+ title: TranslationBase.of(context).bloodSugar,
imagePath: 'blood_sugar_icon.png',
- subTitle: 'Sugar',
+ subTitle: TranslationBase.of(context).sugar,
),
),
),
@@ -55,9 +55,9 @@ class _HealthConverterState extends State {
);
},
child: MedicalProfileItem(
- title: 'Blood',
+ title: TranslationBase.of(context).bloodCholesterol,
imagePath: 'blood_cholesterol_icon.png',
- subTitle: 'Cholesterol',
+ subTitle: TranslationBase.of(context).cholesterol,
),
),
),
@@ -77,9 +77,9 @@ class _HealthConverterState extends State {
);
},
child: MedicalProfileItem(
- title: 'Triglycerides',
+ title: TranslationBase.of(context).triglycerides,
imagePath: 'triglycerides_blood_icon.png',
- subTitle: 'Fat in blood',
+ subTitle: TranslationBase.of(context).fatInBlood,
),
),
),
diff --git a/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart b/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart
index 58caee36..513b50ab 100644
--- a/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart
+++ b/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart
@@ -1,3 +1,4 @@
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
@@ -62,7 +63,7 @@ class _BloodCholesterolState extends State {
Widget build(BuildContext context) {
return AppScaffold(
isShowAppBar: true,
- appBarTitle: 'Blood Cholesterol ',
+ appBarTitle: TranslationBase.of(context).bloodCholesterol,
body: Padding(
padding: const EdgeInsets.all(16.0),
child: SingleChildScrollView(
@@ -74,7 +75,7 @@ class _BloodCholesterolState extends State {
Container(
width: 350.0,
child: Text(
- 'Convert blood cholesterol from\n mmol/l to mg/dlt and vice versa.',
+ TranslationBase.of(context).convertCholesterolStatement,
//textAlign: TextAlign.center,
style: TextStyle(fontSize: 20.0),
),
@@ -95,7 +96,7 @@ class _BloodCholesterolState extends State {
child: Row(
children: [
Texts(
- 'Convert from',
+ TranslationBase.of(context).convertFrom,
),
],
),
@@ -117,7 +118,7 @@ class _BloodCholesterolState extends State {
});
},
child: Container(
- height: 55.0,
+ height: 65.0,
width: 150.0,
decoration: BoxDecoration(
boxShadow: [
@@ -150,7 +151,7 @@ class _BloodCholesterolState extends State {
});
},
child: Container(
- height: 55.0,
+ height: 65.0,
width: 150.0,
decoration: BoxDecoration(
color: cardMMOLColor,
@@ -196,7 +197,7 @@ class _BloodCholesterolState extends State {
decoration: InputDecoration(
border: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black45)),
- labelText: " Enter the reading value",
+ labelText: TranslationBase.of(context).enterReadingValue,
labelStyle: TextStyle(
color: Colors.black87,
),
@@ -209,7 +210,7 @@ class _BloodCholesterolState extends State {
Visibility(
visible: _visible,
child: Container(
- height: 95.0,
+ height: 115.0,
width: 350.0,
decoration: BoxDecoration(
color: Colors.white,
@@ -222,7 +223,7 @@ class _BloodCholesterolState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
- Texts('Result:'),
+ Texts(TranslationBase.of(context).result + ":"),
Row(
children: [
Text(
@@ -252,10 +253,10 @@ class _BloodCholesterolState extends State {
),
Flexible(
child: Container(
- height: 100.0,
+ height: 60.0,
width: 150.0,
- child: Button(
- label: 'CALCULATE',
+ child: SecondaryButton(
+ label: TranslationBase.of(context).calculate,
onTap: () {
setState(() {
_visible == false
diff --git a/lib/pages/AlHabibMedicalService/health_converter/blood_sugar.dart b/lib/pages/AlHabibMedicalService/health_converter/blood_sugar.dart
index f5d66ccf..8a7e9792 100644
--- a/lib/pages/AlHabibMedicalService/health_converter/blood_sugar.dart
+++ b/lib/pages/AlHabibMedicalService/health_converter/blood_sugar.dart
@@ -64,7 +64,7 @@ class _BloodSugarState extends State {
Widget build(BuildContext context) {
return AppScaffold(
isShowAppBar: true,
- appBarTitle: 'Blood Sugar Conversion',
+ appBarTitle: TranslationBase.of(context).bloodSugarConversion,
body: Padding(
padding: const EdgeInsets.all(16.0),
child: SingleChildScrollView(
@@ -76,7 +76,7 @@ class _BloodSugarState extends State {
Container(
width: 350.0,
child: Text(
- 'Convert blood sugar/glucose from mmol/l (UK standard) to mg/dlt (US standard) and vice versa.',
+ TranslationBase.of(context).convertBloodSugarStatement,
//textAlign: TextAlign.center,
style: TextStyle(fontSize: 20.0),
),
@@ -97,7 +97,7 @@ class _BloodSugarState extends State {
child: Row(
children: [
Texts(
- 'Convert from',
+ TranslationBase.of(context).convertFrom,
)
],
),
@@ -119,7 +119,7 @@ class _BloodSugarState extends State {
});
},
child: Container(
- height: 55.0,
+ height: 65.0,
width: 150.0,
decoration: BoxDecoration(
boxShadow: [
@@ -152,7 +152,7 @@ class _BloodSugarState extends State {
});
},
child: Container(
- height: 55.0,
+ height: 65.0,
width: 150.0,
decoration: BoxDecoration(
color: cardMMOLColor,
@@ -196,7 +196,7 @@ class _BloodSugarState extends State {
],
keyboardType: TextInputType.number,
decoration: InputDecoration(
- labelText: " Enter the reading value",
+ labelText: TranslationBase.of(context).enterReadingValue,
border: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black45)),
labelStyle: TextStyle(
@@ -211,7 +211,7 @@ class _BloodSugarState extends State {
Visibility(
visible: _visible,
child: Container(
- height: 95.0,
+ height: 115.0,
width: 350.0,
decoration: BoxDecoration(
color: Colors.white,
@@ -224,7 +224,7 @@ class _BloodSugarState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
- Texts('Result:'),
+ Texts(TranslationBase.of(context).result + ": "),
Row(
children: [
Text(
@@ -254,10 +254,10 @@ class _BloodSugarState extends State {
),
Flexible(
child: Container(
- height: 100.0,
+ height: 60.0,
width: 150.0,
- child: Button(
- label: 'CALCULATE',
+ child: SecondaryButton(
+ label: TranslationBase.of(context).calculate,
onTap: () {
setState(() {
_visible == false
diff --git a/lib/pages/AlHabibMedicalService/health_converter/triglycerides.dart b/lib/pages/AlHabibMedicalService/health_converter/triglycerides.dart
index a86fdb88..4c5f9a83 100644
--- a/lib/pages/AlHabibMedicalService/health_converter/triglycerides.dart
+++ b/lib/pages/AlHabibMedicalService/health_converter/triglycerides.dart
@@ -1,3 +1,4 @@
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@@ -64,7 +65,7 @@ class _TriglyceridesState extends State {
Widget build(BuildContext context) {
return AppScaffold(
isShowAppBar: true,
- appBarTitle: 'Triglycerides',
+ appBarTitle: TranslationBase.of(context).triglycerides,
body: Padding(
padding: const EdgeInsets.all(16.0),
child: SingleChildScrollView(
@@ -76,7 +77,7 @@ class _TriglyceridesState extends State {
Container(
width: 350.0,
child: Text(
- 'Convert Triglycerides from mmol/l to\n mg/dlt and vice versa.',
+ TranslationBase.of(context).triglyceridesConvertStatement,
//textAlign: TextAlign.center,
style: TextStyle(fontSize: 20.0),
),
@@ -95,7 +96,9 @@ class _TriglyceridesState extends State {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 15.0),
child: Row(
- children: [Texts('Convert from')],
+ children: [
+ Texts(TranslationBase.of(context).convertFrom)
+ ],
),
),
SizedBox(
@@ -115,7 +118,7 @@ class _TriglyceridesState extends State {
});
},
child: Container(
- height: 55.0,
+ height: 65.0,
width: 150.0,
decoration: BoxDecoration(
boxShadow: [
@@ -148,7 +151,7 @@ class _TriglyceridesState extends State {
});
},
child: Container(
- height: 55.0,
+ height: 65.0,
width: 150.0,
decoration: BoxDecoration(
color: cardMMOLColor,
@@ -194,7 +197,7 @@ class _TriglyceridesState extends State {
decoration: InputDecoration(
border: OutlineInputBorder(
borderSide: BorderSide(color: Colors.black45)),
- labelText: " Enter the reading value",
+ labelText: TranslationBase.of(context).enterReadingValue,
labelStyle: TextStyle(
color: Colors.black87,
),
@@ -207,7 +210,7 @@ class _TriglyceridesState extends State {
Visibility(
visible: _visible,
child: Container(
- height: 95.0,
+ height: 115.0,
width: 350.0,
decoration: BoxDecoration(
color: Colors.white,
@@ -220,7 +223,7 @@ class _TriglyceridesState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
- Texts('Result:'),
+ Texts(TranslationBase.of(context).result + ":"),
Row(
children: [
Text(
@@ -250,10 +253,11 @@ class _TriglyceridesState extends State {
),
Flexible(
child: Container(
- height: 100.0,
+ height: 60.0,
width: 250.0,
- child: Button(
- label: 'CALCULATE',
+ child: SecondaryButton(
+ label:
+ TranslationBase.of(context).calculate.toUpperCase(),
onTap: () {
setState(() {
_visible == false
diff --git a/lib/pages/Blood/blood_donation.dart b/lib/pages/Blood/blood_donation.dart
index 99e5242e..e0fa2aec 100644
--- a/lib/pages/Blood/blood_donation.dart
+++ b/lib/pages/Blood/blood_donation.dart
@@ -1,14 +1,15 @@
-
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/blooddonation/blood_groub_details.dart';
import 'package:diplomaticquarterapp/core/model/blooddonation/get_all_cities.dart';
+
//import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/AdvanceModel.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/patient_info.dart';
import 'package:diplomaticquarterapp/core/service/blood/blood_details_servies.dart';
import 'package:diplomaticquarterapp/core/viewModels/blooddonation/blood_details_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/my_balance_view_model.dart';
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart';
import 'package:diplomaticquarterapp/pages/Blood/user_agreement_page.dart';
@@ -27,6 +28,7 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:giffy_dialog/giffy_dialog.dart';
+import 'package:provider/provider.dart';
import 'package:smart_progress_bar/smart_progress_bar.dart';
//import '../../../core/model/my_balance/AdvanceModel.dart';
@@ -39,8 +41,8 @@ import 'dialogs/SelectPatientInfoDialog.dart';
import 'new_text_Field.dart';
enum BeneficiaryType { MyAccount, MyFamilyFiles, OtherAccount, NON }
-enum Gender{Male,Female,NON}
-enum Blood{Oplus,Ominus,Aplus,Aminus,Bplus,Bminus,ABplus,ABminus,NON}
+enum Gender { Male, Female, NON }
+enum Blood { Oplus, Ominus, Aplus, Aminus, Bplus, Bminus, ABplus, ABminus, NON }
class BloodDonationPage extends StatefulWidget {
@override
@@ -51,8 +53,8 @@ class _BloodDonationPageState extends State {
TextEditingController _fileTextController = TextEditingController();
TextEditingController _notesTextController = TextEditingController();
BeneficiaryType beneficiaryType = BeneficiaryType.NON;
- Gender gender = Gender.Male;//Gender.NON;
- Blood blood = Blood.Aminus;//Blood.NON;
+ Gender gender = Gender.Male; //Gender.NON;
+ Blood blood = Blood.Aminus; //Blood.NON;
//HospitalsModel _selectedHospital;
CitiesModel _selectedHospital;
@@ -62,22 +64,27 @@ class _BloodDonationPageState extends State {
AuthenticatedUser authenticatedUser;
GetAllSharedRecordsByStatusList selectedPatientFamily;
AdvanceModel advanceModel = AdvanceModel();
- List_BloodGroupDetailsModel bloodDetails=List_BloodGroupDetailsModel();
+ List_BloodGroupDetailsModel bloodDetails = List_BloodGroupDetailsModel(bloodGroup: "A-");
AppSharedPreferences sharedPref = AppSharedPreferences();
AuthenticatedUser authUser;
- var checkedValue = false;
+ var checkedValue = false;
+
@override
void initState() {
super.initState();
getAuthUser();
}
+
@override
Widget build(BuildContext context) {
+ ProjectViewModel projectProvider = Provider.of(context);
+
return BaseView(
- onModelReady: (model) => model.getCities(),//model.getHospitals(),
+ onModelReady: (model) => model.getCities(), //model.getHospitals(),
builder: (_, model, w) => AppScaffold(
isShowAppBar: true,
- appBarTitle: "Blood Donation",//TranslationBase.of(context).advancePayment,
+ baseViewModel: model,
+ appBarTitle: TranslationBase.of(context).bloodD,
body: SingleChildScrollView(
physics: ScrollPhysics(),
child: Container(
@@ -86,15 +93,16 @@ class _BloodDonationPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
- // TranslationBase.of(context).advancePaymentLabel,
- "Enter the required information, In order to register for Blood Donation Service",//+model.user.firstName,
+ TranslationBase.of(context).bloodDEnterDesc,
textAlign: TextAlign.center,
),
SizedBox(
height: 12,
),
InkWell(
- onTap: () => confirmSelectHospitalDialog(model.CitiesModelList),//model.hospitals
+ onTap: () =>
+ confirmSelectHospitalDialog(model.CitiesModelList),
+ //model.hospitals
child: Container(
padding: EdgeInsets.all(12),
width: double.infinity,
@@ -105,7 +113,7 @@ class _BloodDonationPageState extends State {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
- Texts(getHospitalName()),
+ Texts(getHospitalName(projectProvider, context)),
Icon(Icons.arrow_drop_down)
],
),
@@ -116,7 +124,8 @@ class _BloodDonationPageState extends State {
),
InkWell(
//======Gender========
- onTap: () => confirmSelectGenderDialog(),//confirmSelectBeneficiaryDialog(model),
+ onTap: () => confirmSelectGenderDialog(),
+ //confirmSelectBeneficiaryDialog(model),
child: Container(
padding: EdgeInsets.all(12),
width: double.infinity,
@@ -128,49 +137,19 @@ class _BloodDonationPageState extends State {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
//Texts(getBeneficiaryType()),
- Texts(getGender()),
+ Texts(getGender(context)),
Icon(Icons.arrow_drop_down)
],
),
),
),
- // if (beneficiaryType == BeneficiaryType.MyFamilyFiles)
- // SizedBox(
- // height: 12,
- // ),
- // if (beneficiaryType == BeneficiaryType.MyFamilyFiles)
- // InkWell(
- // onTap: () {
- // model.getFamilyFiles().then((value) {
- // confirmSelectFamilyDialog(model
- // .getAllSharedRecordsByStatusResponse
- // .getAllSharedRecordsByStatusList);
- // }).showProgressBar(
- // text: "Loading",
- // backgroundColor: Colors.blue.withOpacity(0.6));
- // },
- // child: Container(
- // padding: EdgeInsets.all(12),
- // width: double.infinity,
- // height: 65,
- // decoration: BoxDecoration(
- // borderRadius: BorderRadius.circular(12),
- // color: Colors.white),
- // child: Row(
- // mainAxisAlignment: MainAxisAlignment.spaceBetween,
- // children: [
- // Texts(getFamilyMembersName()),
- // Icon(Icons.arrow_drop_down)
- // ],
- // ),
- // ),
- // ),
SizedBox(
height: 12,
),
InkWell(
//======Gender========
- onTap: () => confirmSelectBloodDialog(),//confirmSelectBeneficiaryDialog(model),
+ onTap: () => confirmSelectBloodDialog(),
+ //confirmSelectBeneficiaryDialog(model),
child: Container(
padding: EdgeInsets.all(12),
width: double.infinity,
@@ -188,44 +167,14 @@ class _BloodDonationPageState extends State {
),
),
),
- // if (beneficiaryType == BeneficiaryType.MyFamilyFiles)
- // SizedBox(
- // height: 12,
- // ),
- // if (beneficiaryType == BeneficiaryType.MyFamilyFiles)
- // InkWell(
- // onTap: () {
- // model.getFamilyFiles().then((value) {
- // confirmSelectFamilyDialog(model
- // .getAllSharedRecordsByStatusResponse
- // .getAllSharedRecordsByStatusList);
- // }).showProgressBar(
- // text: "Loading",
- // backgroundColor: Colors.blue.withOpacity(0.6));
- // },
- // child: Container(
- // padding: EdgeInsets.all(12),
- // width: double.infinity,
- // height: 65,
- // decoration: BoxDecoration(
- // borderRadius: BorderRadius.circular(12),
- // color: Colors.white),
- // child: Row(
- // mainAxisAlignment: MainAxisAlignment.spaceBetween,
- // children: [
- // Texts(getFamilyMembersName()),
- // Icon(Icons.arrow_drop_down)
- // ],
- // ),
- // ),
- // ),
SizedBox(
height: 12,
),
Row(
children: [
Container(
- child: Text(" To view the terms and conditions "),
+ child: Text(
+ TranslationBase.of(context).viewTermsConditions),
),
SizedBox(
width: MediaQuery.of(context).size.height * 0.10,
@@ -233,10 +182,14 @@ class _BloodDonationPageState extends State {
InkWell(
onTap: () {
Navigator.of(context).push(MaterialPageRoute(
- builder: (BuildContext context) => UserAgreementPage()));
+ builder: (BuildContext context) =>
+ UserAgreementPage()));
},
child: Container(
- child: Texts(" Click here ",color: Colors.blue,),
+ child: Texts(
+ TranslationBase.of(context).clickHere,
+ color: Colors.blue,
+ ),
),
)
],
@@ -247,99 +200,34 @@ class _BloodDonationPageState extends State {
Row(
children: [
Checkbox(
- onChanged: (bool value) {
+ onChanged: (bool value) {
setState(() {
checkedValue = value;
});
},
- // tristate: checkedValue==true,//i == 1,
+ // tristate: checkedValue==true,//i == 1,
value: checkedValue,
- activeColor: Colors.red,//Color(0xFF6200EE),
+ activeColor: Color(0xFFc5272d), //Color(0xFF6200EE),
+ ),
+ SizedBox(
+ height: 10,
+ ),
+ Row(
+ children: [],
),
- SizedBox(height: 10,),
- Row(children: [
-
- ],),
SizedBox(
width: 10,
),
Text(
- 'I agree to the terms and conditions ',
- style: Theme.of(context).textTheme.subtitle1.copyWith(color: checkedValue? Colors.red : Colors.black),
+ TranslationBase.of(context)
+ .iAgreeToTheTermsAndConditions,
+ style: Theme.of(context).textTheme.subtitle1.copyWith(
+ color: checkedValue
+ ? Color(0xFFc5272d)
+ : Colors.black),
),
],
),
- // NewTextFields(
- // hintText: TranslationBase.of(context).fileNumber,
- // controller: _fileTextController,
- // ),
- // if (beneficiaryType == BeneficiaryType.OtherAccount)
- // SizedBox(
- // height: 12,
- // ),
- // if (beneficiaryType == BeneficiaryType.OtherAccount)
- // InkWell(
- // onTap: () {
- // if (_fileTextController.text.isNotEmpty)
- // model
- // .getPatientInfoByPatientID(
- // id: _fileTextController.text)
- // .then((value) {
- // confirmSelectPatientDialog(model.patientInfoList);
- // }).showProgressBar(
- // text: "Loading",
- // backgroundColor:
- // Colors.blue.withOpacity(0.6));
- // else
- // AppToast.showErrorToast(
- // message: 'Please Enter The File Number');
- // },
- // child: Container(
- // padding: EdgeInsets.all(12),
- // width: double.infinity,
- // height: 65,
- // decoration: BoxDecoration(
- // borderRadius: BorderRadius.circular(12),
- // color: Colors.white),
- // child: Row(
- // mainAxisAlignment: MainAxisAlignment.spaceBetween,
- // children: [
- // Texts(getPatientName()),
- // Icon(Icons.arrow_drop_down)
- // ],
- // ),
- // ),
- // ),
- // SizedBox(
- // height: 12,
- // ),
-
- // NewTextFields(
- // hintText: TranslationBase.of(context).amount,
- // keyboardType: TextInputType.number,
- // onChanged: (value) {
- // setState(() {
- // amount = value;
- // });
- // },
- // ),
- // SizedBox(
- // height: 12,
- // ),
- // NewTextFields(
- // hintText: TranslationBase.of(context).depositorEmail,
- // initialValue: model.user.emailAddress,
- // onChanged: (value) {
- // email = value;
- // },
- // ),
- // SizedBox(
- // height: 12,
- // ),
- // NewTextFields(
- // hintText: TranslationBase.of(context).notes,
- // controller: _notesTextController,
- // ),
SizedBox(
height: 10,
),
@@ -355,29 +243,25 @@ class _BloodDonationPageState extends State {
onTap: () {
showDialog(
context: context,
- builder: (_) =>
- AssetGiffyDialog(
+ builder: (_) => AssetGiffyDialog(
title: Text(
"",
style: TextStyle(
fontSize: 22.0,
- fontWeight:
- FontWeight
- .w600),
+ fontWeight: FontWeight.w600),
),
image: Image.asset(
'assets/images/BloodChrt_EN.png'),
- buttonCancelText:
- Text('cancel'),
- buttonCancelColor:
- Colors.grey,
+ buttonCancelText: Text(
+ TranslationBase.of(context).cancel),
+ buttonCancelColor: Colors.grey,
onlyCancelButton: true,
));
},
child: Container(
width: 250,
height: 200,
- child:Image.asset(
+ child: Image.asset(
'assets/images/BloodChrt_EN.png')),
),
),
@@ -395,25 +279,41 @@ class _BloodDonationPageState extends State {
bottomSheet: Container(
height: MediaQuery.of(context).size.height * 0.12,
width: double.infinity,
-
padding: EdgeInsets.all(12),
child: SecondaryButton(
textColor: Colors.white,
- color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,),
- label: "Save",
- //
- onTap: (){
-
- bloodDetails.city=_selectedHospital.toString();
-
- // bloodDetails.
+ color: checkedValue == false
+ ? Color(0xFFa0a4a6)
+ : Color.fromRGBO(
+ 63,
+ 72,
+ 74,
+ 1,
+ ),
+ label: TranslationBase.of(context).save,
+ onTap: () async {
+ if(_selectedHospital == null){
+ AppToast.showErrorToast(message: TranslationBase.of(context).selectCity);
+ return;
+ }
+ bloodDetails.city = projectProvider.isArabic
+ ? _selectedHospital.descriptionN
+ : _selectedHospital.description;
+ bloodDetails.cityCode = _selectedHospital.iD.toString();
+ bloodDetails.gender = gender == Gender.Male ? 1 : 2;
+ await model.updateBloodGroup(bloodDetails);
+ if (model.state == ViewState.Idle) {
+ AppToast.showSuccessToast(
+ message: model.updatedRegisterBloodMessage);
+ } else {
+ AppToast.showErrorToast(message: model.error);
+ }
},
-
-
),
)),
);
}
+
//==============
void confirmSelectBeneficiaryDialog(MyBalanceViewModel model) {
showDialog(
@@ -435,94 +335,85 @@ class _BloodDonationPageState extends State {
),
);
}
- void confirmSelectBloodDialog(){
+
+ void confirmSelectBloodDialog() {
showDialog(
context: context,
- child: SelectBloodDialog(bloodType: blood,
+ child: SelectBloodDialog(
+ bloodType: blood,
onValueSelected: (value) {
setState(() {
if (value == Blood.Oplus) {
- bloodDetails.bloodGroup="O+";
+ bloodDetails.bloodGroup = "O+";
// _fileTextController.text = model.user.patientID.toString();
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
- }else
- if (value == Blood.Ominus) {
+ } else if (value == Blood.Ominus) {
// _fileTextController.text = model.user.patientID.toString();
- bloodDetails.bloodGroup="O-";
+ bloodDetails.bloodGroup = "O-";
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
- }else
- if (value == Blood.ABplus) {
- bloodDetails.bloodGroup="AB+";
+ } else if (value == Blood.ABplus) {
+ bloodDetails.bloodGroup = "AB+";
// _fileTextController.text = model.user.patientID.toString();
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
- }else
- if (value == Blood.ABminus) {
- bloodDetails.bloodGroup="AB-";
+ } else if (value == Blood.ABminus) {
+ bloodDetails.bloodGroup = "AB-";
// _fileTextController.text = model.user.patientID.toString();
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
- }else
- if (value == Blood.Aplus) {
- bloodDetails.bloodGroup="A+";
+ } else if (value == Blood.Aplus) {
+ bloodDetails.bloodGroup = "A+";
// _fileTextController.text = model.user.patientID.toString();
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
- }else
- if (value == Blood.Aminus) {
- bloodDetails.bloodGroup="A-";
+ } else if (value == Blood.Aminus) {
+ bloodDetails.bloodGroup = "A-";
// _fileTextController.text = model.user.patientID.toString();
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
- }else
- if (value == Blood.Bplus) {
- bloodDetails.bloodGroup="B+";
+ } else if (value == Blood.Bplus) {
+ bloodDetails.bloodGroup = "B+";
// _fileTextController.text = model.user.patientID.toString();
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
- }else
- if (value == Blood.Bminus) {
- bloodDetails.bloodGroup="B-";
+ } else if (value == Blood.Bminus) {
+ bloodDetails.bloodGroup = "B-";
// _fileTextController.text = model.user.patientID.toString();
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
- }
-
-
- else
+ } else
_fileTextController.text = "";
// beneficiaryType = value;
- blood=value;
- }
-
-
-
-
- );
+ blood = value;
+ });
},
),
);
}
- void confirmSelectGenderDialog(){
+
+ void confirmSelectGenderDialog() {
showDialog(
context: context,
- child: SelectGenderDialog(beneficiaryType: gender,
+ child: SelectGenderDialog(
+ beneficiaryType: gender,
onValueSelected: (value) {
setState(() {
if (value == Gender.Male) {
// _fileTextController.text = model.user.patientID.toString();
- bloodDetails.patientType=1;
+ bloodDetails.patientType = 1;
// advanceModel.depositorName =
// model.user.firstName + " " + model.user.lastName;
} else
- // _fileTextController.text = "";
- {bloodDetails.gender=2;}
+ // _fileTextController.text = "";
+ {
+ bloodDetails.gender = 2;
+ }
- // beneficiaryType = value;
- gender=value;
+ // beneficiaryType = value;
+ gender = value;
});
},
),
@@ -591,23 +482,25 @@ class _BloodDonationPageState extends State {
return TranslationBase.of(context).otherAccount;
break;
case BeneficiaryType.NON:
- return "Select Gender";//TranslationBase.of(context).selectBeneficiary;
+ return TranslationBase.of(context).selectBeneficiary;
}
- return "Select Gender";//TranslationBase.of(context).selectBeneficiary;
+ return TranslationBase.of(context).selectBeneficiary;
}
- String getGender() {
+
+ String getGender(BuildContext context) {
switch (gender) {
case Gender.Male:
- return "Male";
+ return TranslationBase.of(context).male;
case Gender.Female:
- return "Female";
+ return TranslationBase.of(context).female;
break;
case Gender.NON:
- return "Select Gender";//TranslationBase.of(context).selectBeneficiary;
+ return TranslationBase.of(context).selectGender;
}
- return "Select Gender";//TranslationBase.of(context).selectBeneficiary;
+ return TranslationBase.of(context).selectGender;
}
+
String getBlood() {
switch (blood) {
case Blood.Oplus:
@@ -639,18 +532,19 @@ class _BloodDonationPageState extends State {
break;
case Blood.NON:
- return "Select Blood Type";//TranslationBase.of(context).selectBeneficiary;
+ return "Select Blood Type"; //TranslationBase.of(context).selectBeneficiary;
}
- return "Select Blood Type";//TranslationBase.of(context).selectBeneficiary;
+ return "Select Blood Type"; //TranslationBase.of(context).selectBeneficiary;
}
- String getHospitalName() {
+ String getHospitalName(ProjectViewModel projectProvider, BuildContext context) {
if (_selectedHospital != null)
- return _selectedHospital.description;
+ return projectProvider.isArabic
+ ? _selectedHospital.descriptionN
+ : _selectedHospital.description;
else
- return
- "Riyadh";
- // return List_BloodGroupDetailsModel.fromJson(0).city.toString();//"Select City";//TranslationBase.of(context).selectHospital;
+ return TranslationBase.of(context).selectCity;
+ // return List_BloodGroupDetailsModel.fromJson(0).city.toString();//"Select City";//TranslationBase.of(context).selectHospital;
}
String getPatientName() {
@@ -677,8 +571,6 @@ class _BloodDonationPageState extends State {
return TranslationBase.of(context).selectFamilyPatientName;
}
-
- //================
-
+//================
}
diff --git a/lib/pages/Blood/confirm_payment_page.dart b/lib/pages/Blood/confirm_payment_page.dart
index 75282190..c384b7b5 100644
--- a/lib/pages/Blood/confirm_payment_page.dart
+++ b/lib/pages/Blood/confirm_payment_page.dart
@@ -2,7 +2,6 @@ import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/AdvanceModel.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/patient_info_and_mobile_number.dart';
-import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/my_balance_view_model.dart';
import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
@@ -166,7 +165,7 @@ class ConfirmPaymentPage extends StatelessWidget {
patientID: int.parse(advanceModel.fileNumber),
projectID: advanceModel.hospitalsModel.iD)
.then((value) {
- GifLoaderDialogUtils.hideDialog(context);
+ GifLoaderDialogUtils.hideDialog(context);
if (model.state != ViewState.ErrorLocal &&
model.state != ViewState.Error) showSMSDialog();
});
@@ -218,7 +217,8 @@ class ConfirmPaymentPage extends StatelessWidget {
authenticatedUser.firstName,
authenticatedUser.patientID,
authenticatedUser,
- browser);
+ browser,
+ false);
}
onBrowserLoadStart(String url) {
@@ -277,8 +277,8 @@ class ConfirmPaymentPage extends StatelessWidget {
String paymentReference = res['Fort_id'].toString();
GifLoaderDialogUtils.showMyDialog(AppGlobal.context);
service
- .createAdvancePayment(appo, appo.projectID.toString(), res['Amount'], res['Fort_id'],
- res['PaymentMethod'], AppGlobal.context)
+ .createAdvancePayment(appo, appo.projectID.toString(), res['Amount'],
+ res['Fort_id'], res['PaymentMethod'], AppGlobal.context)
.then((res) {
GifLoaderDialogUtils.hideDialog(AppGlobal.context);
print(res['OnlineCheckInAppointments'][0]['AdvanceNumber']);
@@ -315,5 +315,4 @@ class ConfirmPaymentPage extends StatelessWidget {
Future navigateToHome(context) async {
Navigator.of(context).pushNamed(HOME);
}
-
}
diff --git a/lib/pages/Blood/dialogs/SelectGenderDialog.dart b/lib/pages/Blood/dialogs/SelectGenderDialog.dart
index 295c6dcd..a097ae8e 100644
--- a/lib/pages/Blood/dialogs/SelectGenderDialog.dart
+++ b/lib/pages/Blood/dialogs/SelectGenderDialog.dart
@@ -38,7 +38,7 @@ class _SelectGenderDialogState extends State {
});
},
child: ListTile(
- title: Text("Male"),
+ title: Text(TranslationBase.of(context).male),
leading: Radio(
value: Gender.Male,
groupValue: beneficiaryType,
@@ -68,7 +68,7 @@ class _SelectGenderDialogState extends State {
});
},
child: ListTile(
- title: Text("Female"),
+ title: Text(TranslationBase.of(context).female),
leading: Radio(
value: Gender.Female,
groupValue: beneficiaryType,
diff --git a/lib/pages/Blood/user_agreement_page.dart b/lib/pages/Blood/user_agreement_page.dart
index d05725b4..36989ea5 100644
--- a/lib/pages/Blood/user_agreement_page.dart
+++ b/lib/pages/Blood/user_agreement_page.dart
@@ -1,55 +1,23 @@
+import 'package:diplomaticquarterapp/core/viewModels/TermsConditionsViewModel.dart';
+import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart';
+import 'package:flutter_html/flutter_html.dart';
class UserAgreementPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return AppScaffold(
- isShowAppBar: true,
- appBarTitle: "User Agreement",
-
- body:
- Container(
- child:ListView(
- scrollDirection: Axis.vertical,
- children: [
- ///////////
- Column(
- children: [
- SizedBox(
- height: 20,
- ),
- Container(
- child:Text("Communication via email, text messages and phone calls",textAlign: TextAlign.center,style: TextStyle(fontWeight: FontWeight.bold,fontSize: 16)),
- ),
- SizedBox(
- height: 20,
- ),
- Container(
- child:
- Text("I understand that the contact number or Email that \n I have provided on registration will be used for communication by HMG.\n I hereby agree to be notified by HMG through SMS, Email or any other method for appointments notifications, current HMG’s medical services, and any services introduced by the HMG in the future or any modifications made to the services offered by the HMG. And these messages may be submitted as evidence where the HMG has the right to use at any time whatsoever and as it sees fit.",textAlign: TextAlign.center,style: TextStyle(fontWeight: FontWeight.bold,fontSize: 16)),
- ),
- SizedBox(
- height: 20,
- ),
- Container(
- child:
- Text("I understand the risks of communicating by email and text messages, in particular the privacy risks. \nI understand that HMG cannot guarantee the security and confidentiality of email or text communication. HMG will not be responsible for messages that are not received or delivered due to technical failure, or for disclosure of confidential information unless caused by intentional misconduct.",textAlign: TextAlign.center,style: TextStyle(fontWeight: FontWeight.bold,fontSize: 16)),
- ),
- SizedBox(
- height: 20,
- ),
- Container(
- child:
- Text("\b I hereby agree to receive emails, text messages, phone calls for appointments notifications, special promotions and new features or products introduced by HMG or any third party.",textAlign: TextAlign.center,style: TextStyle(fontWeight: FontWeight.bold,fontSize: 16)),
- ),
- ],
- )
- ///////////
- ])
-
-
-
- ));
+ return BaseView(
+ onModelReady: (model) => model.getUserTermsAndConditions(),
+ builder: (_, model, w) => AppScaffold(
+ isShowAppBar: true,
+ appBarTitle: TranslationBase.of(context).userAgreement,
+ body: SingleChildScrollView(
+ child: Html(
+ data: model.userAgreementContent,
+ ),
+ )),
+ );
}
}
diff --git a/lib/pages/BookAppointment/BookConfirm.dart b/lib/pages/BookAppointment/BookConfirm.dart
index d7e08a66..03a28d90 100644
--- a/lib/pages/BookAppointment/BookConfirm.dart
+++ b/lib/pages/BookAppointment/BookConfirm.dart
@@ -187,27 +187,29 @@ class _BookConfirmState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
children: [
- Row(
- mainAxisAlignment: MainAxisAlignment.start,
- children: [
- Container(
- margin: EdgeInsets.fromLTRB(5.0, 0.0, 5.0, 0.0),
- child: Image.asset(
- "assets/images/new-design/icon_hospital.png"),
- ),
- Container(
- margin: EdgeInsets.fromLTRB(20.0, 5.0, 10.0, 5.0),
- child: Text(
- TranslationBase.of(context).hospital +
- ": " +
- widget.doctor.projectName,
- style: TextStyle(
- fontSize: 14.0,
- color: Colors.grey[700],
- letterSpacing: 1.0)),
- ),
- ],
- ),
+ !widget.isLiveCareAppointment ? Row(
+ mainAxisAlignment: MainAxisAlignment.start,
+ children: [
+ Container(
+ margin:
+ EdgeInsets.fromLTRB(5.0, 0.0, 5.0, 0.0),
+ child: Image.asset(
+ "assets/images/new-design/icon_hospital.png"),
+ ),
+ Container(
+ margin:
+ EdgeInsets.fromLTRB(20.0, 5.0, 10.0, 5.0),
+ child: Text(
+ TranslationBase.of(context).hospital +
+ ": " +
+ widget.doctor.projectName,
+ style: TextStyle(
+ fontSize: 14.0,
+ color: Colors.grey[700],
+ letterSpacing: 1.0)),
+ ),
+ ],
+ ) : Container(),
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
@@ -325,7 +327,8 @@ class _BookConfirmState extends State {
Container(
margin: EdgeInsets.only(top: 5.0),
child: Text(
- TranslationBase.of(context).gender + ": " +
+ TranslationBase.of(context).gender +
+ ": " +
widget.authUser.genderDescription,
style: TextStyle(
fontSize: 12.0,
@@ -335,7 +338,9 @@ class _BookConfirmState extends State {
Container(
margin: EdgeInsets.only(top: 5.0, bottom: 3.0),
child: Text(
- TranslationBase.of(context).age + ": " + widget.authUser.age.toString(),
+ TranslationBase.of(context).age +
+ ": " +
+ widget.authUser.age.toString(),
style: TextStyle(
fontSize: 12.0,
color: Colors.grey[600],
@@ -423,7 +428,8 @@ class _BookConfirmState extends State {
context)
.then((res) {
if (res['MessageStatus'] == 1) {
- AppToast.showSuccessToast(message: TranslationBase.of(context).bookedSuccess);
+ AppToast.showSuccessToast(
+ message: TranslationBase.of(context).bookedSuccess);
print(res['AppointmentNo']);
Future.delayed(new Duration(milliseconds: 500), () {
@@ -543,13 +549,13 @@ class _BookConfirmState extends State