Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

getVariableCategoryName #3951

Open
wants to merge 24 commits into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
2706624
getVariableCategoryName
mikepsinn May 24, 2020
f4be4dd
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn May 25, 2020
394d3a2
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn May 25, 2020
67a5c51
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn May 25, 2020
5e24d66
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn May 25, 2020
814b234
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn May 25, 2020
36d6701
measurements = measurements || [];
mikepsinn May 26, 2020
845d6dd
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn May 26, 2020
adf83bf
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn May 26, 2020
50b1e06
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn May 26, 2020
c1e056f
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn May 30, 2020
0d3322d
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn Jun 20, 2020
39a90f3
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn Sep 17, 2020
f343192
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn Sep 17, 2020
7dbf7e2
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn Sep 17, 2020
a26a1cc
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn Sep 17, 2020
8d0c0f6
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn Sep 17, 2020
6e4f719
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn Sep 19, 2020
ab3689c
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn Sep 19, 2020
a74f307
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn Sep 21, 2020
5965da4
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn Sep 21, 2020
78744e3
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn Sep 22, 2020
b28b985
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn Sep 28, 2020
e03cab8
Merge branch 'develop' into feature/getVariableCategoryName
mikepsinn Sep 29, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions src/js/services/qmService.js
Original file line number Diff line number Diff line change
Expand Up @@ -1797,7 +1797,8 @@ angular.module('starter').factory('qmService', ["$http", "$q", "$rootScope", "$i
return false;
}
if(!measurement.variableCategoryName){
measurement.variableCategoryName = qm.urlHelper.getParam('variableCategoryName');
measurement.variableCategoryName =
qm.variableCategoryHelper.getVariableCategoryNameFromStateParamsOrUrl();
}
if(!measurement.variableCategoryName){
message = 'Please select a variable category';
Expand Down Expand Up @@ -3884,18 +3885,6 @@ angular.module('starter').factory('qmService', ["$http", "$q", "$rootScope", "$i
successHandler,
errorHandler);
};
qmService.getVariableCategoryNameFromStateParamsOrUrl = function($stateParams){
var variableCategoryName;
if($stateParams && $stateParams.variableCategoryName){
variableCategoryName = $stateParams.variableCategoryName;
}else if(qm.urlHelper.getParam('variableCategoryName')){
variableCategoryName = qm.urlHelper.getParam('variableCategoryName');
}
if(variableCategoryName && variableCategoryName !== "Anything"){
return variableCategoryName;
}
return null;
};
qmService.goToState = function(to, params, options){
if(params && params.variableObject && !params.variableName){params.variableName = params.variableObject.name;}
//qmLog.info('Called goToState: ' + to, null, qmLog.getStackTrace());
Expand Down