Skip to content

Commit 1050629

Browse files
mikepsinnmikepsinn
authored
Merge branch 'develop' into feature/graceful-fs
2 parents 98eb8d5 + 39f2f18 commit 1050629

File tree

135 files changed

+27206
-1291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+27206
-1291
lines changed

‎Gemfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@ source "https://rubygems.org"
22

33
gem "fastlane"
44
gem 'travis'
5+
#gem 'fastlane-plugin-cordova'
6+
#gem 'fastlane-plugin-ionic'
7+
#gem 'fastlane-plugin-upgrade_super_old_xcode_project'
8+
59
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
610
eval_gemfile(plugins_path) if File.exist?(plugins_path)

‎Gemfile.lock‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ GEM
6666
xcodeproj (>= 1.5.7, < 2.0.0)
6767
xcpretty (~> 0.2.8)
6868
xcpretty-travis-formatter (>= 0.0.3)
69-
fastlane-plugin-cordova (2.0.0)
70-
fastlane-plugin-ionic (0.0.4)
71-
fastlane-plugin-upgrade_super_old_xcode_project (0.0.2)
7269
ffi (1.9.25)
7370
gh (0.14.0)
7471
addressable
@@ -178,10 +175,7 @@ PLATFORMS
178175

179176
DEPENDENCIES
180177
fastlane
181-
fastlane-plugin-cordova
182-
fastlane-plugin-ionic
183-
fastlane-plugin-upgrade_super_old_xcode_project
184178
travis
185179

186180
BUNDLED WITH
187-
1.16.1
181+
2.1.4

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@
130130
"postinstall": "",
131131
"preinstall": "npx npm-force-resolutions",
132132
"pretest": "npm run build",
133+
"pull-develop": "bash scripts/git-pull-develop.sh",
133134
"test": "npm run configure:app && npm run test:cypress && npm run test:gi",
134-
"test:cypress": "bash ./scripts/cypress.sh",
135-
"test:gi": "cd tests && gulp _unit-gi-failed-gi-all",
136135
"test-unit": "cd tests && gulp _unit-tests",
137-
"pull-develop": "bash scripts/git-pull-develop.sh"
136+
"test:cypress": "bash ./scripts/cypress.sh",
137+
"test:gi": "cd tests && gulp _unit-gi-failed-gi-all"
138138
},
139139
"resolutions": {
140140
"graceful-fs": "^4.2.4"

‎renovate.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"enabled": false
77
},
88
"ignorePaths": [
9-
"src/package.json"
9+
"src/package.json",
10+
"tests/package.json"
1011
],
1112
"packageRules": [
1213
{

‎src/js/controllers/appCtrl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,10 +411,10 @@ angular.module('starter')// Parent Controller - This controller runs before ever
411411
};
412412
$rootScope.setMicAndSpeechEnabled = function(value, hideRobot){
413413
if($rootScope.micEnabled === value && $rootScope.speechEnabled === value){
414-
qmLog.info("micEnabled and speechEnabled already set to " + value);
414+
qmLog.debug("micEnabled and speechEnabled already set to " + value);
415415
return;
416416
}
417-
qmLog.info("$rootScope.setMicAndSpeechEnabled");
417+
qmLog.debug("$rootScope.setMicAndSpeechEnabled");
418418
if(value === 'toggle'){
419419
value = !qm.mic.getMicEnabled();
420420
}

‎src/js/controllers/historyAllMeasurementsCtrl.js‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,15 @@ angular.module('starter').controller('historyAllMeasurementsCtrl', ["$scope", "$
5353
$timeout(function(){
5454
qmService.rootScope.setShowActionSheetMenu(function(){
5555
// Show the action sheet
56+
var allButtons = qmService.actionSheets.actionSheetButtons;
5657
var hideSheet = $ionicActionSheet.show({
5758
buttons: [
58-
qmService.actionSheets.actionSheetButtons.refresh,
59-
qmService.actionSheets.actionSheetButtons.settings,
60-
qmService.actionSheets.actionSheetButtons.sortDescendingValue,
61-
qmService.actionSheets.actionSheetButtons.sortAscendingValue,
62-
qmService.actionSheets.actionSheetButtons.sortDescendingTime,
63-
qmService.actionSheets.actionSheetButtons.sortAscendingTime
59+
allButtons.refresh,
60+
allButtons.settings,
61+
allButtons.sortDescendingValue,
62+
allButtons.sortAscendingValue,
63+
allButtons.sortDescendingTime,
64+
allButtons.sortAscendingTime
6465
],
6566
cancelText: '<i class="icon ion-ios-close"></i>Cancel',
6667
cancel: function(){
@@ -73,16 +74,16 @@ angular.module('starter').controller('historyAllMeasurementsCtrl', ["$scope", "$
7374
if(index === 1){
7475
qmService.goToState(qm.stateNames.settings);
7576
}
76-
if(button.text === qmService.actionSheets.actionSheetButtons.sortDescendingValue.text){
77+
if(button.text === allButtons.sortDescendingValue.text){
7778
changeSortAndGetHistory('-value');
7879
}
79-
if(button.text === qmService.actionSheets.actionSheetButtons.sortAscendingValue.text){
80+
if(button.text === allButtons.sortAscendingValue.text){
8081
changeSortAndGetHistory('value');
8182
}
82-
if(button.text === qmService.actionSheets.actionSheetButtons.sortDescendingTime.text){
83+
if(button.text === allButtons.sortDescendingTime.text){
8384
changeSortAndGetHistory('-startTime');
8485
}
85-
if(button.text === qmService.actionSheets.actionSheetButtons.sortAscendingTime.text){
86+
if(button.text === allButtons.sortAscendingTime.text){
8687
changeSortAndGetHistory('startTime');
8788
}
8889
return true;
@@ -277,26 +278,27 @@ angular.module('starter').controller('historyAllMeasurementsCtrl', ["$scope", "$
277278
}, 20000);
278279
});
279280
}
280-
$scope.deleteMeasurement = function(measurement){
281-
measurement.hide = true;
282-
qmService.deleteMeasurementFromServer(measurement);
281+
$scope.deleteMeasurement = function(m){
282+
m.hide = true;
283+
qmService.deleteMeasurementFromServer(m);
283284
};
284285
qmService.navBar.setFilterBarSearchIcon(false);
285-
$scope.showActionSheetForMeasurement = function(measurement){
286-
$scope.state.measurement = measurement;
287-
var variableObject = JSON.parse(JSON.stringify(measurement));
288-
variableObject.variableId = measurement.variableId;
289-
variableObject.name = measurement.variableName;
286+
$scope.showActionSheetForMeasurement = function(m){
287+
$scope.state.measurement = m;
288+
var variableObject = JSON.parse(JSON.stringify(m));
289+
variableObject.variableId = m.variableId;
290+
variableObject.name = m.variableName;
291+
var allButtons = qmService.actionSheets.actionSheetButtons;
290292
var buttons = [
291293
{text: '<i class="icon ion-edit"></i>Edit Measurement'},
292-
qmService.actionSheets.actionSheetButtons.reminderAdd,
293-
qmService.actionSheets.actionSheetButtons.charts,
294-
qmService.actionSheets.actionSheetButtons.historyAllVariable,
295-
qmService.actionSheets.actionSheetButtons.variableSettings,
296-
qmService.actionSheets.actionSheetButtons.relationships
294+
allButtons.reminderAdd,
295+
allButtons.charts,
296+
allButtons.historyAllVariable,
297+
allButtons.variableSettings,
298+
allButtons.relationships
297299
];
298-
if(measurement.url){
299-
buttons.push(qmService.actionSheets.actionSheetButtons.openUrl);
300+
if(m.url){
301+
buttons.push(allButtons.openUrl);
300302
}
301303
var hideSheet = $ionicActionSheet.show({
302304
buttons: buttons,
@@ -327,12 +329,12 @@ angular.module('starter').controller('historyAllMeasurementsCtrl', ["$scope", "$
327329
qmService.goToCorrelationsListForVariable($scope.state.measurement.variableName);
328330
}
329331
if(index === 6){
330-
qm.urlHelper.openUrlInNewTab(measurement.url);
332+
qm.urlHelper.openUrlInNewTab(m.url);
331333
}
332334
return true;
333335
},
334336
destructiveButtonClicked: function(){
335-
$scope.deleteMeasurement(measurement);
337+
$scope.deleteMeasurement(m);
336338
return true;
337339
}
338340
});

‎src/js/controllers/measurementAddCtrl.js‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,25 +45,25 @@ angular.module('starter').controller('MeasurementAddCtrl', ["$scope", "$q", "$ti
4545
var m = $stateParams.measurement;
4646
var v = $stateParams.variableObject;
4747
var n = $stateParams.reminderNotification;
48-
var id = qm.urlHelper.getParam('measurementId', location.href, true);
49-
if (tr) {
50-
setupTrackingByReminder(tr);
48+
var id = qm.urlHelper.getParam(['measurementId', 'id'], location.href, true);
49+
if (id) {
50+
setupByID(id).then(function () {
51+
if (!$scope.state.measurementIsSetup) {
52+
$scope.goBack();
53+
}
54+
});
55+
} else if (tr) {
56+
setupByReminder(tr);
5157
} else if (m) {
52-
setupTrackingByMeasurement(m);
58+
setupByMeasurement(m);
5359
} else if (measurementFromUrl) {
54-
setupTrackingByMeasurement(JSON.parse(measurementFromUrl));
60+
setupByMeasurement(JSON.parse(measurementFromUrl));
5561
} else if (v) {
5662
setupFromVariable(v);
5763
} else if (reminderFromUrl) {
58-
setupTrackingByReminder(JSON.parse(reminderFromUrl));
64+
setupByReminder(JSON.parse(reminderFromUrl));
5965
} else if (n) {
60-
setupTrackingByReminder(n);
61-
} else if (id) {
62-
setMeasurementVariablesByMeasurementId(id).then(function () {
63-
if (!$scope.state.measurementIsSetup) {
64-
$scope.goBack();
65-
}
66-
});
66+
setupByReminder(n);
6767
} else if ($stateParams.variableName) {
6868
setupFromVariableName($stateParams.variableName);
6969
}
@@ -227,7 +227,7 @@ angular.module('starter').controller('MeasurementAddCtrl', ["$scope", "$q", "$ti
227227
m.variableName = variableName;
228228
m.startTimeEpoch = startTimeEpoch;
229229
m.value = value;
230-
setupTrackingByMeasurement(m);
230+
setupByMeasurement(m);
231231
}
232232
};
233233
function isYesNo() {
@@ -286,14 +286,14 @@ angular.module('starter').controller('MeasurementAddCtrl', ["$scope", "$q", "$ti
286286
qmLogService.error(error);
287287
});
288288
};
289-
var setMeasurementVariablesByMeasurementId = function(id){
289+
var setupByID = function(id){
290290
var deferred = $q.defer();
291291
qmService.showBlackRingLoader();
292292
qmService.getMeasurementById(id)
293293
.then(function(m){
294294
qmService.hideLoader();
295295
$scope.state.measurementIsSetup = true;
296-
setupTrackingByMeasurement(m);
296+
setupByMeasurement(m);
297297
deferred.resolve();
298298
}, function(error){
299299
qmService.hideLoader();
@@ -310,7 +310,7 @@ angular.module('starter').controller('MeasurementAddCtrl', ["$scope", "$q", "$ti
310310
measurement: $stateParams.measurement
311311
});
312312
};
313-
function setVariableObjectFromMeasurement(){
313+
function setVariableFromMeasurement(){
314314
$scope.state.variableObject = {
315315
unitAbbreviatedName: $scope.state.measurement.unitAbbreviatedName,
316316
variableCategoryName: getVariableCategoryName(),
@@ -324,11 +324,11 @@ angular.module('starter').controller('MeasurementAddCtrl', ["$scope", "$q", "$ti
324324
if($stateParams.variableObject){
325325
$scope.state.variableObject = $stateParams.variableObject;
326326
}else{
327-
setVariableObjectFromMeasurement();
327+
setVariableFromMeasurement();
328328
}
329329
}
330330
}
331-
var setupTrackingByMeasurement = function(m){
331+
var setupByMeasurement = function(m){
332332
if(isNaN(m.startTimeEpoch)){m.startTimeEpoch = moment(m.startTimeEpoch).unix();}
333333
if(!m.id){m.prevStartTimeEpoch = m.startTimeEpoch;}
334334
$scope.state.title = "Edit Measurement";
@@ -339,7 +339,7 @@ angular.module('starter').controller('MeasurementAddCtrl', ["$scope", "$q", "$ti
339339
setupUnit(m.unitAbbreviatedName, m.valence);
340340
setStateVariable();
341341
};
342-
var setupTrackingByReminder = function(n){
342+
var setupByReminder = function(n){
343343
$scope.state.title = "Record Measurement";
344344
if(!$scope.state.measurement.unitAbbreviatedName){
345345
setupUnit(n.unitAbbreviatedName);

‎src/js/controllers/trackPrimaryOutcomeCtrl.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ angular.module('starter').controller('TrackPrimaryOutcomeCtrl', ["$scope", "$sta
5757
qmLog.info("Got 0 measurements from localforage");
5858
}
5959
$scope.state.primaryOutcomeMeasurements = measurements;
60-
var measurementsQueue = qm.storage.getItem('measurementsQueue');
61-
if(measurementsQueue){
62-
qmLog.info("Got " + measurementsQueue.length + " measurements from measurementsQueue");
60+
var queue = qm.storage.getItem('measurementsQueue');
61+
if(queue){
62+
qmLog.info("Got " + queue.length + " measurements from measurementsQueue");
6363
}else{
6464
qmLog.info("Got 0 measurements from measurementsQueue");
6565
}
6666
if(!$scope.state.primaryOutcomeMeasurements){
6767
$scope.state.primaryOutcomeMeasurements = [];
6868
}
69-
if(measurementsQueue){
70-
$scope.state.primaryOutcomeMeasurements = $scope.state.primaryOutcomeMeasurements.concat(measurementsQueue);
69+
if(queue){
70+
$scope.state.primaryOutcomeMeasurements = $scope.state.primaryOutcomeMeasurements.concat(queue);
7171
}
7272
if($scope.state.primaryOutcomeMeasurements){
7373
$scope.state.distributionChartConfig = null; // Necessary to render update for some reason

0 commit comments

Comments
 (0)