getVariableCategoryName

Author: mikepsinn

src/js/controllers/measurementAddCtrl.js

@@ -390,18 +390,20 @@ angular.module('starter').controller('MeasurementAddCtrl', ["$scope", "$q", "$ti
                 hideSheet();
             }, 20000);
         });
-        function getVariableCategoryName(object){
-            var name;
-            if(object && object.variableCategoryName){name = object.variableCategoryName;}
-            if(!name && $scope.state && $scope.state.measurement && $scope.state.measurement.variableCategoryName){
-                name = $scope.state.measurement.variableCategoryName;
-            }
-            if(!name){name = $stateParams.variableCategoryName;}
-            if(!name){name = qm.urlHelper.getParam('variableCategoryName');}
-            if(!name && $stateParams.variableObject){name = $stateParams.variableObject.variableCategoryName;}
-            return name;
+        function getVariableCategoryName(obj){
+            var cat = getVariableCategory(obj);
+            if(!cat){return null;}
+            return cat.name;
         }
-        function getVariableCategory(){
-            return qm.variableCategoryHelper.findVariableCategory(getVariableCategoryName());
+        function getVariableCategory(obj){
+            var cat;
+            if(obj){cat = qm.variableCategoryHelper.findVariableCategory(obj);}
+            if(!cat && $scope.state){cat = qm.variableCategoryHelper.findVariableCategory($scope.state);}
+            if(!cat){cat = qm.variableCategoryHelper.findVariableCategory($stateParams);}
+            if(!cat){
+                qmLog.error("No variable category name from getVariableCategory")
+                return null;
+            }
+            return cat;
         }
     }]);

src/js/qmHelpers.js

@@ -9919,14 +9919,25 @@ var qm = {
         },
         findVariableCategory: function(nameOrId){
             if(typeof nameOrId === 'object' && nameOrId !== null){
+                var obj = nameOrId;
                 nameOrId = nameOrId.variableCategoryName || nameOrId.variableCategoryId;
+                if(!nameOrId && obj.measurement){
+                    nameOrId = obj.measurement.variableCategoryName || obj.measurement.variableCategoryId;
+                }
+                if(!nameOrId && obj.variableObject){
+                    nameOrId = obj.variableObject.variableCategoryName || obj.variableObject.variableCategoryId;
+                }
+                if(!nameOrId){
+                    qmLog.debug("No name or id from object in findVariableCategory", obj)
+                    return null;
+                }
             }
             if(!nameOrId){nameOrId = qm.urlHelper.getParam('variableCategoryName');}
             if(!nameOrId){nameOrId = qm.urlHelper.getParam('variableCategoryId');}
             var categories = qm.variableCategoryHelper.getVariableCategories();
             var id, name = null;
             if(!nameOrId){
-                qmLog.error("No name or id provided!")
+                qmLog.error("No name or id provided to findVariableCategory")
                 return null;
             }
             if(Number.isInteger(nameOrId)){

src/js/qmLogger.js

@@ -258,6 +258,7 @@ var qmLog = {
         return false;
     },
     bugsnagNotify: function(name, message, errorSpecificMetaData, logLevel, stackTrace){
+        debugger
         if(typeof bugsnagClient === "undefined"){
             if(!qmLog.qm.appMode.isDevelopment()){
                 console.error('bugsnagClient not defined', errorSpecificMetaData);