Merge branch 'develop' into feature/getFromLocalStorageOrApi

QuantiModo · Jun 4, 2021 · 2747d55 · 2747d55 · mikepsinn · Jun 4, 2021
2 parents f9c0bde + 1c60f1f
commit 2747d55
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
@@ -0,0 +1,5 @@
+FROM gitpod/workspace-full:latest
+
+RUN bash -c ". .nvm/nvm.sh     && nvm install 10     && nvm use 10     && nvm alias default 10"
+
+RUN echo "nvm use default &>/dev/null" >> ~/.bashrc.d/51-nvm-fix
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -0,0 +1,9 @@
+image:
+  file: .gitpod.Dockerfile
+tasks:
+  - command: gp await-port 3000 && sleep 3 && gp preview $(gp url 3000)/src/index.html
+  - init: npm install -g eslint bower && npm install
+    command: npm start
+ports:
+  - port: 3000
+    onOpen: ignore
diff --git a/src/data/qmStates.js b/src/data/qmStates.js
@@ -144,7 +144,7 @@ var qmStates = [
             "variableSearchParameters": {
                 "limit": 100,
                 "includePublic": true,
-                "manualTracking": true
+                // Don't do this or blood pressure doesn't show up. Plus we just put manualTracking at the top anyway.  "manualTracking": true
             },
             "hideNavigationMenu": null,
             "doneState": null,
@@ -174,7 +174,7 @@ var qmStates = [
             "variableSearchParameters": {
                 "limit": 100,
                 "includePublic": true,
-                "manualTracking": true
+                // Don't do this or blood pressure doesn't show up. Plus we just put manualTracking at the top anyway.  "manualTracking": true
             },
             "hideNavigationMenu": null,
             "skipReminderSettingsIfPossible": null,
@@ -206,7 +206,7 @@ var qmStates = [
             "variableSearchParameters": {
                 "limit": 100,
                 "includePublic": true,
-                "manualTracking": true
+                // Don't do this or blood pressure doesn't show up. Plus we just put manualTracking at the top anyway.  "manualTracking": true
             },
             "hideNavigationMenu": null,
             "doneState": null,

diff --git a/src/js/controllers/measurementAddCtrl.js b/src/js/controllers/measurementAddCtrl.js
@@ -286,7 +286,9 @@ angular.module('starter').controller('MeasurementAddCtrl', [
                 setupUnit(category.defaultUnitAbbreviatedName, v.valence);
             }
             var m = qm.measurements.newMeasurement(v);
-            if(m.variableName.toLowerCase().indexOf('blood pressure') > -1){$rootScope.bloodPressure.show = true;}
+            if(m.variableName.toLowerCase().indexOf('blood pressure') > -1){
+                qmService.rootScope.setProperty('bloodPressure', {systolicValue: null, diastolicValue: null, show: true});
+            }
             if(m.variableCategoryName){
                 setupVariableCategory(m.variableCategoryName);
             }else{