From 12afcf6ae620ac1648b560a8733aaa56200648dd Mon Sep 17 00:00:00 2001 From: "Mike P. Sinn" Date: Sat, 12 Sep 2020 15:50:51 -0500 Subject: [PATCH 1/2] setHideDefaultValueField --- src/js/controllers/reminderAddCtrl.js | 8 ++++++++ src/js/qmHelpers.js | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/src/js/controllers/reminderAddCtrl.js b/src/js/controllers/reminderAddCtrl.js index 182b3220ab..d1047f251c 100644 --- a/src/js/controllers/reminderAddCtrl.js +++ b/src/js/controllers/reminderAddCtrl.js @@ -113,6 +113,10 @@ angular.module('starter').controller('ReminderAddCtrl', ["$scope", "$state", "$s return qm.variableCategoryHelper.getVariableCategoryNameFromStateParamsOrUrl( $scope.state.trackingReminder, $stateParams, $stateParams.variableObject); } + function getVariableCategory(){ + return qm.variableCategoryHelper.getVariableCategoryFromStateParamsOrUrl( + $scope.state.trackingReminder, $stateParams, $stateParams.variableObject); + } $scope.openReminderStartTimePicker = function(order){ var a = new Date(); setupReminderTimes(order, a); @@ -522,6 +526,10 @@ angular.module('starter').controller('ReminderAddCtrl', ["$scope", "$state", "$s if(!$scope.state.showMoreOptions){ var number = getNumberOfUniqueValues($scope); if(number && number > 30){hide = true;} + var cat = getVariableCategory(); + if(cat && number = null && cat.name === "Sleep"){ + hide = true; + } } $scope.state.hideDefaultValueField = hide; } diff --git a/src/js/qmHelpers.js b/src/js/qmHelpers.js index 8888dd23d9..3e2aa1e2cc 100644 --- a/src/js/qmHelpers.js +++ b/src/js/qmHelpers.js @@ -9843,6 +9843,12 @@ var qm = { if(name){name = qm.variableCategoryHelper.replaceCategoryAliasWithActualNameIfNecessary(name);} return name; }, + getVariableCategoryFromStateParamsOrUrl: function(obj1, obj2, obj3){ + var name = qm.variableCategoryHelper.getVariableCategoryNameFromStateParamsOrUrl( + $scope.state.trackingReminder, $stateParams, $stateParams.variableObject); + if(!$name){return null;} + return qm.variableCategoryHelper.getVariableCategory(name); + }, getByNameOrId: function(nameOrId){ var cats = qm.variableCategoryHelper.getVariableCategoriesFromGlobals(); if(isNaN(nameOrId)){ From 4118005628a770ca97169723ee42ba9a327bcf05 Mon Sep 17 00:00:00 2001 From: "Mike P. Sinn" Date: Sun, 20 Sep 2020 20:25:11 -0500 Subject: [PATCH 2/2] if(cat && number === null && cat.name === "Sleep"){hide = true;} --- src/js/controllers/reminderAddCtrl.js | 4 +--- src/js/qmHelpers.js | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/reminderAddCtrl.js b/src/js/controllers/reminderAddCtrl.js index d1047f251c..f0c5f0df7e 100644 --- a/src/js/controllers/reminderAddCtrl.js +++ b/src/js/controllers/reminderAddCtrl.js @@ -527,9 +527,7 @@ angular.module('starter').controller('ReminderAddCtrl', ["$scope", "$state", "$s var number = getNumberOfUniqueValues($scope); if(number && number > 30){hide = true;} var cat = getVariableCategory(); - if(cat && number = null && cat.name === "Sleep"){ - hide = true; - } + if(cat && number === null && cat.name === "Sleep"){hide = true;} } $scope.state.hideDefaultValueField = hide; } diff --git a/src/js/qmHelpers.js b/src/js/qmHelpers.js index 3e2aa1e2cc..4056e3ddd0 100644 --- a/src/js/qmHelpers.js +++ b/src/js/qmHelpers.js @@ -4355,6 +4355,7 @@ var qm = { }, addInfoAndImagesToMeasurements: function(measurements){ function parseJsonIfPossible(str){ + if(str === "{}"){return false;} var object = false; try{ object = JSON.parse(str);