diff --git a/assets/images/new/indoor_nav_home.svg b/assets/images/new/indoor_nav_home.svg
new file mode 100644
index 00000000..bfe32eec
--- /dev/null
+++ b/assets/images/new/indoor_nav_home.svg
@@ -0,0 +1,11 @@
+
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 8a15c641..ebc73034 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -2140,7 +2140,7 @@ const Map localizedValues = {
"download": {"en": "Download", "ar": "تحميل"},
"share": {"en": "Share", "ar": "يشارك"},
- "byFace":{"en": "By Face", "ar": "حسب الوجه"}
+ "byFace":{"en": "By Face", "ar": "حسب الوجه"},
"stress": {"en": "Stress", "ar": "ضغط"},
"cvd": {"en": "Cardiovascular Disease (CVD) Risk", "ar": "مخاطر أمراض القلب والأوعية الدموية (CVD)"},
"generalWellness": {"en": "General Wellness", "ar": "العافية العامة"},
diff --git a/lib/pages/landing/fragments/home_page_fragment2.dart b/lib/pages/landing/fragments/home_page_fragment2.dart
index aed34535..dcbd5e03 100644
--- a/lib/pages/landing/fragments/home_page_fragment2.dart
+++ b/lib/pages/landing/fragments/home_page_fragment2.dart
@@ -55,7 +55,7 @@ class _HomePageFragment2State extends State {
hmgServices.add(HmgServices(0, TranslationBase.of(context).book, TranslationBase.of(context).appointmentLabel, "assets/images/new/book appointment.svg", isLogin));
hmgServices.add(HmgServices(1, TranslationBase.of(context).liveCare, TranslationBase.of(context).onlineConsulting, "assets/images/new/Live_Care.svg", isLogin));
- hmgServices.add(HmgServices(1, TranslationBase.of(context).vitalSign, TranslationBase.of(context).byFace, "assets/images/new/facial-recognition.svg", isLogin));
+ hmgServices.add(HmgServices(111, TranslationBase.of(context).vitalSign, TranslationBase.of(context).byFace, "assets/images/new/facial-recognition.svg", isLogin));
projectViewModel.isIndoorNavigationEnabled
? hmgServices.add(HmgServices(2, TranslationBase.of(context).hospitalNavigationTitle, TranslationBase.of(context).hospitalNavigationSubtitle, "assets/images/new/indoor_nav_home.svg", isLogin,
diff --git a/lib/pages/landing/widgets/services_view.dart b/lib/pages/landing/widgets/services_view.dart
index 752f9b93..f15cbbd6 100644
--- a/lib/pages/landing/widgets/services_view.dart
+++ b/lib/pages/landing/widgets/services_view.dart
@@ -231,8 +231,9 @@ class ServicesView extends StatelessWidget {
locator().hmgServices.logServiceName('book appointment');
} else if (hmgServices.action == 1) {
openLiveCare(context);
- } else if (hmgServices.action == 2) {
+ } else if (hmgServices.action == 111) {
Navigator.push(context, FadePage(page: VitalSigns()));
+ } else if (hmgServices.action == 2) {
//todo for temporary basis
// Navigator.push(context, FadePage(page: ResultScreen(
// healthResult: Health(null, null, VitalSign(92,1, 1, null,null,null,null,null,null,null,null,null, null,null,null,null), null,null,),
@@ -240,12 +241,12 @@ class ServicesView extends StatelessWidget {
// initPenguinSDK();
- // if (projectViewModel.isIndoorNavigationEnabled) {
- // if (!isLocked) openNavigationProjectSelection(context);
- // } else {
- // Navigator.push(context, FadePage(page: ErOptions(isAppbar: true)));
- // locator().hmgServices.logServiceName('emergency service');
- // }
+ if (projectViewModel.isIndoorNavigationEnabled) {
+ if (!isLocked) openNavigationProjectSelection(context);
+ } else {
+ Navigator.push(context, FadePage(page: ErOptions(isAppbar: true)));
+ locator().hmgServices.logServiceName('emergency service');
+ }
} else if (hmgServices.action == 3) {
Navigator.push(context, FadePage(page: HomeHealthCarePage()));
locator().hmgServices.logServiceName('home health care');
diff --git a/lib/vital_signs/components/vital_sign_widget.dart b/lib/vital_signs/components/vital_sign_widget.dart
index 3176fdf2..1984d4d8 100644
--- a/lib/vital_signs/components/vital_sign_widget.dart
+++ b/lib/vital_signs/components/vital_sign_widget.dart
@@ -87,28 +87,28 @@ class VitalSignWidget extends StatelessWidget {
SizedBox(
height: 8,
),
- SizedBox(
- height: 32,
- child: Row(mainAxisSize: MainAxisSize.max, children: [
- Expanded(
- flex: 1,
- child: ListView.separated(
- separatorBuilder: (_, __) => SizedBox(
- width: 8,
- ),
- scrollDirection: Axis.horizontal,
- shrinkWrap: true,
- itemCount: condition.condition?.length ?? 0,
- itemBuilder: (_, index) => RangeWidget(
- title: condition.condition?[index].title ?? 'test',
- isSelected: condition.condition?[index]
- .isInRange(vitalSignValue) ==
- true,
- ),
- ),
- ),
- ]),
- ),
+ // SizedBox(
+ // height: 30,
+ // child: Row(mainAxisSize: MainAxisSize.max, children: [
+ // Expanded(
+ // flex: 1,
+ // child: ListView.separated(
+ // separatorBuilder: (_, __) => SizedBox(
+ // width: 8,
+ // ),
+ // scrollDirection: Axis.horizontal,
+ // shrinkWrap: true,
+ // itemCount: condition.condition?.length ?? 0,
+ // itemBuilder: (_, index) => RangeWidget(
+ // title: condition.condition?[index].title ?? 'test',
+ // isSelected: condition.condition?[index]
+ // .isInRange(vitalSignValue) ==
+ // true,
+ // ),
+ // ),
+ // ),
+ // ]),
+ // ),
SizedBox(
height: 8,
),
@@ -153,7 +153,7 @@ class RangeWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
return SizedBox(
- height: 23,
+ height: 30,
child: Material(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(3),
@@ -163,12 +163,14 @@ class RangeWidget extends StatelessWidget {
? CustomColors.accentColor
: CustomColors.lightGreyColor,
child: Padding(
- padding: EdgeInsets.all(8),
- child: Text(
- title,
- textAlign: TextAlign.center,
- style:
- TextStyle(color: (isSelected) ? Colors.white : Colors.black),
+ padding: const EdgeInsets.all(8.0),
+ child: Center(
+ child: Text(
+ title,
+ textAlign: TextAlign.center,
+ style:
+ TextStyle(color: (isSelected) ? Colors.white : Colors.black, fontSize: 12),
+ ),
),
),
),
diff --git a/lib/vital_signs/data/vitals_benchmark.dart b/lib/vital_signs/data/vitals_benchmark.dart
index 6279a4e8..8e322b99 100644
--- a/lib/vital_signs/data/vitals_benchmark.dart
+++ b/lib/vital_signs/data/vitals_benchmark.dart
@@ -33,7 +33,7 @@ var vital = {
]
},"hrvv": {
- "unit": "bpm",
+ "unit": "ms",
"values":[
{
"min": 0,
@@ -343,6 +343,7 @@ class RangeCondition {
double value = 0.0;
if(data.contains('/')){
value = double.parse(data.split("/")[0])/double.parse(data.split("/")[1]);
+ print("the blood pressure is ${value}");
}else{
value = double.parse(data);
}