From 7b9c321ae0f115640a7b295554034ef2f07c528c Mon Sep 17 00:00:00 2001 From: Attawit Kittikrairit Date: Sun, 27 Oct 2019 18:47:59 +0700 Subject: [PATCH 1/5] fix(survey): fix last commit --- www/js/diary/services.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/www/js/diary/services.js b/www/js/diary/services.js index 34193cc01..f7e55f5e4 100644 --- a/www/js/diary/services.js +++ b/www/js/diary/services.js @@ -1009,15 +1009,12 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger', } else { return tripList; } - }).then(function(combinedTripList) { - var tq = { key: 'write_ts', startTs: 0, endTs: moment().endOf('day').unix(), }; - return Promise.all([ - UnifiedDataLoader.getUnifiedMessagesForInterval('manual/mode_confirm', tq), - UnifiedDataLoader.getUnifiedMessagesForInterval('manual/purpose_confirm', tq) - ]).then(function(results) { + }).then(function([combinedTripList, modes, purposes]) { + return EnketoSurvey.getAllSurveyAnswers("manual/confirm_survey", { populateLabels: true }).then(function(surveyAnswers) { timeline.data.unifiedConfirmsResults = { - modes: results[0], - purposes: results[1], + modes: modes, + purposes: purposes, + surveyAnswers: surveyAnswers, }; return combinedTripList; }); From 4a9e968857e673dfe2a615c81906ee6e9f515f50 Mon Sep 17 00:00:00 2001 From: Attawit Kittikrairit Date: Mon, 28 Oct 2019 00:01:40 +0700 Subject: [PATCH 2/5] fix(survey): move getAllSurveyAnswers to the first Promise.all as well --- www/js/diary/services.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/www/js/diary/services.js b/www/js/diary/services.js index f7e55f5e4..16b796a52 100644 --- a/www/js/diary/services.js +++ b/www/js/diary/services.js @@ -991,12 +991,23 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger', var tripsFromServerPromise = timeline.updateFromServer(day); var isProcessingCompletePromise = timeline.isProcessingComplete(day); + // Also mode/purpose and survey answers + var tq = { key: 'write_ts', startTs: 0, endTs: moment().endOf('day').unix(), }; + const modesPromise = UnifiedDataLoader.getUnifiedMessagesForInterval('manual/mode_confirm', tq); + const purposesPromise = UnifiedDataLoader.getUnifiedMessagesForInterval('manual/purpose_confirm', tq); + const surveyAnswersPromise = EnketoSurvey.getAllSurveyAnswers("manual/confirm_survey", { populateLabels: true }); + // Deal with all the trip retrieval - Promise.all([tripsFromServerPromise, isProcessingCompletePromise]) - .then(function([processedTripList, completeStatus]) { + Promise.all([tripsFromServerPromise, isProcessingCompletePromise, modesPromise, purposesPromise, surveyAnswersPromise]) + .then(function([processedTripList, completeStatus, modes, purposes, surveyAnswers]) { console.log("Promise.all() finished successfully with length " +processedTripList.length+" completeStatus = "+completeStatus); var tripList = processedTripList; + timeline.data.unifiedConfirmsResults = { + modes: modes, + purposes: purposes, + surveyAnswers: surveyAnswers, + }; if (!completeStatus) { return timeline.readUnprocessedTrips(day, processedTripList) .then(function(unprocessedTripList) { @@ -1009,16 +1020,6 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger', } else { return tripList; } - }).then(function([combinedTripList, modes, purposes]) { - return EnketoSurvey.getAllSurveyAnswers("manual/confirm_survey", { populateLabels: true }).then(function(surveyAnswers) { - timeline.data.unifiedConfirmsResults = { - modes: modes, - purposes: purposes, - surveyAnswers: surveyAnswers, - }; - return combinedTripList; - }); - return combinedTripList; }).then(function(combinedTripList) { processOrDisplayNone(day, combinedTripList); }).catch(function(error) { From 2b8659572c770d13def52648aa35fb0fb10bc6e7 Mon Sep 17 00:00:00 2001 From: Attawit Kittikrairit Date: Mon, 28 Oct 2019 00:24:12 +0700 Subject: [PATCH 3/5] fix(survey): add logging --- www/js/diary/services.js | 1 + 1 file changed, 1 insertion(+) diff --git a/www/js/diary/services.js b/www/js/diary/services.js index 16b796a52..0d6d17b5e 100644 --- a/www/js/diary/services.js +++ b/www/js/diary/services.js @@ -1002,6 +1002,7 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger', .then(function([processedTripList, completeStatus, modes, purposes, surveyAnswers]) { console.log("Promise.all() finished successfully with length " +processedTripList.length+" completeStatus = "+completeStatus); + console.log(` with ${modes.length} modes, ${purposes.length} purposes, ${surveyAnswers.length} surveyAnswers`); var tripList = processedTripList; timeline.data.unifiedConfirmsResults = { modes: modes, From 65953f23a094068a8757c22c5b34065c8f77cd29 Mon Sep 17 00:00:00 2001 From: Attawit Kittikrairit Date: Mon, 28 Oct 2019 00:31:11 +0700 Subject: [PATCH 4/5] fix(survey): a bit of refactoring --- www/js/diary/services.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/js/diary/services.js b/www/js/diary/services.js index 0d6d17b5e..641d91ccf 100644 --- a/www/js/diary/services.js +++ b/www/js/diary/services.js @@ -992,10 +992,10 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger', var isProcessingCompletePromise = timeline.isProcessingComplete(day); // Also mode/purpose and survey answers - var tq = { key: 'write_ts', startTs: 0, endTs: moment().endOf('day').unix(), }; - const modesPromise = UnifiedDataLoader.getUnifiedMessagesForInterval('manual/mode_confirm', tq); - const purposesPromise = UnifiedDataLoader.getUnifiedMessagesForInterval('manual/purpose_confirm', tq); - const surveyAnswersPromise = EnketoSurvey.getAllSurveyAnswers("manual/confirm_survey", { populateLabels: true }); + var tq = $window.cordova.plugins.BEMUserCache.getAllTimeQuery(); + var modesPromise = UnifiedDataLoader.getUnifiedMessagesForInterval('manual/mode_confirm', tq); + var purposesPromise = UnifiedDataLoader.getUnifiedMessagesForInterval('manual/purpose_confirm', tq); + var surveyAnswersPromise = EnketoSurvey.getAllSurveyAnswers("manual/confirm_survey", { populateLabels: true }); // Deal with all the trip retrieval Promise.all([tripsFromServerPromise, isProcessingCompletePromise, modesPromise, purposesPromise, surveyAnswersPromise]) From 202624c61d69414eb120a84c981c3ecde751907d Mon Sep 17 00:00:00 2001 From: Shankari Date: Sun, 19 Jul 2020 14:53:50 -0700 Subject: [PATCH 5/5] Remove survey answers from the list since master does not use it --- www/js/diary/services.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/www/js/diary/services.js b/www/js/diary/services.js index 641d91ccf..3d086158d 100644 --- a/www/js/diary/services.js +++ b/www/js/diary/services.js @@ -991,23 +991,22 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger', var tripsFromServerPromise = timeline.updateFromServer(day); var isProcessingCompletePromise = timeline.isProcessingComplete(day); - // Also mode/purpose and survey answers + // Also mode/purpose and (currently disabled) survey answers var tq = $window.cordova.plugins.BEMUserCache.getAllTimeQuery(); var modesPromise = UnifiedDataLoader.getUnifiedMessagesForInterval('manual/mode_confirm', tq); var purposesPromise = UnifiedDataLoader.getUnifiedMessagesForInterval('manual/purpose_confirm', tq); - var surveyAnswersPromise = EnketoSurvey.getAllSurveyAnswers("manual/confirm_survey", { populateLabels: true }); + // var surveyAnswersPromise = EnketoSurvey.getAllSurveyAnswers("manual/confirm_survey", { populateLabels: true }); // Deal with all the trip retrieval - Promise.all([tripsFromServerPromise, isProcessingCompletePromise, modesPromise, purposesPromise, surveyAnswersPromise]) - .then(function([processedTripList, completeStatus, modes, purposes, surveyAnswers]) { + Promise.all([tripsFromServerPromise, isProcessingCompletePromise, modesPromise, purposesPromise]) + .then(function([processedTripList, completeStatus, modes, purposes]) { console.log("Promise.all() finished successfully with length " +processedTripList.length+" completeStatus = "+completeStatus); - console.log(` with ${modes.length} modes, ${purposes.length} purposes, ${surveyAnswers.length} surveyAnswers`); + console.log(' with ${modes.length} modes, ${purposes.length} purposes'); var tripList = processedTripList; timeline.data.unifiedConfirmsResults = { modes: modes, - purposes: purposes, - surveyAnswers: surveyAnswers, + purposes: purposes }; if (!completeStatus) { return timeline.readUnprocessedTrips(day, processedTripList)