From e8c1321f72e6552e7289cf65f318855aad2e83c3 Mon Sep 17 00:00:00 2001 From: shankari Date: Thu, 26 May 2022 12:50:30 -0700 Subject: [PATCH] Revert unsw specific changes (#831) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Revert "chore: remove unused json" This reverts commit d825fc2ddea1032aaee9fe2ff7314a50687b42c9. * Revert "patch(Diary): update tripgj label directly with the new answer" This reverts commit c5ead07d23f4e18f33bcd2bfdea7943f9ddcf534. * Revert "patch(Diary): get rid of isAnalyzed and migrate to isDraft" This reverts commit 9e6a2cd3b048074ea621205bcb4224544fee33db. * Revert "patch(Intro): use SurveyLaunch" This reverts commit c82d60a26458aa6911f19745526bd04ab1445db2. * Revert "patch(Settings): refactor to use new startSurveyPrefilled options param" This reverts commit b8a7ab0bef9c8ab4887a15395053f8faa6d1b18d. * Revert "patch(Diary): optimize isAnalyzed call" This reverts commit b57742a68746273b62a4b3bbe91b76d209d365c4. * Revert "patch(Settings): change domain to fourstep.dev" This reverts commit 2447ecb52269bb27e87be88ea7b55fa7d6d727e3. * Revert "patch(Login): login with anonymous token" This reverts commit 4b3cbab87e5316f3535d8faa7e3859c6f1c81761. * Revert "patch(Login): login with anonymous token" This reverts commit 4b3cbab87e5316f3535d8faa7e3859c6f1c81761. * Revert "patch(Intro): update consent and intro pages to match RCITI profile" This reverts commit b38e5a4dc45576250e2b8056bc141d64f626ae20. * Revert "patch(Profile): add edit User Profile and End Survey buttons that launch surveys" This reverts commit 32425b927b15e0579870faee52e441b4f018b828. * Revert "patch(Enketo): fix answers not restore correctly" This reverts commit 04eb99fa5700e9afdd4de66d37da7d999eee370a. * Revert "patch(Diary): use EnketoSurvey for trip confirmation" This reverts commit e425caf7d7a1038442ac0ce099d5e2c56f3f9813. * Revert "patch(Diary): Dynamic input confirm button sizing" This reverts commit a7f43d1558ae7c1aa43b169fdb81cefe0b7f77b4. * Revert "feat(Enketo): Enketo survey support" This reverts commit fb338f12df472f002f4b591bc315d9cd0023fef7. * Revert "patch(Tabs): hide Label and Heatmap tabs" This reverts commit 610fdab4c3ffc452e988c1efc99bbfa46902ddf4. * Revert "Shorten trip confirm options with emojis ๐Ÿ™‰" This reverts commit 7e6672eafe8e10c72816343684ee1c5319fd9144. * Revert "Modify trip confirm options" This reverts commit 26173fbdb8159ed4af9d00124de9c232913038df. * Revert "Update the login instruction" This reverts commit 75eb6dbaeb2d96361b5695b638fb7e6d4804dbca. * Revert "Update the support line number" This reverts commit 1ab10023a1135dc1988717467dcde14f08bd2faf. * Revert "Make styling changes to consent-text.html" This reverts commit 802d39af0223fa2578e2e5ffa323e888cbfd4ad8. * Revert "Change consent text's text-align from 'justify' to 'left'" This reverts commit 8024fcbe2f6e74cdab9ef923c5b32ebb23b60ea3. * Revert "Comment out onCurentTrip" This reverts commit 32f3b07733a2f1955138aa6a2103311e8e65150f. * Revert "Remove some options from the control list" This reverts commit 34980a7c1e58e578afd0124188829572f341b2b7. * Revert "Use the defined css classes in consent-text.html" This reverts commit 9c90fd85693fdfdc03a390db8339caffe1dc0736. * Revert "Modify the login screen to only accept token" This reverts commit c1b2c6add2832c12f5982fadd7a118b354ad6e44. * Revert "Increase text size in intro.css" This reverts commit 714018da39e3705cfe8d13834810aee2317b3df5. * Revert "Replace a missing function" This reverts commit ed2b9c2d0ae4a9442af877f1a9017c7b242abcb0. * Revert "Add edit user profile and end survey buttons." This reverts commit 5104cecb3b117ff5b35cd7df08631931d3bffedc. * Revert "Use an indirect link to open the user profile survey" This reverts commit cdeaf45fda63017d8037aefb9bce70bcb01d50f7. * Revert "Use random token login and initial kobotoolbox survey" This reverts commit d2028a368b7ac96fad102bde980ac96cbfa1081d. * Revert "Comment out the summary screen" This reverts commit 25e8795ff69763ba02702433250adcef7818de58. * Restore the labels for the survey option * Revert "Revert "feat(Enketo): Enketo survey support"" This reverts commit 28a0b637d1f21a2a2794c81250425af06d78a15f. * Manually revert isAnalysed function Manually revert parts of https://github.com/e-mission/e-mission-phone/commit/fb338f12df472f002f4b591bc315d9cd0023fef7 that are not related to enabling the survey code and that we don't want to restore * Revert other changes that we don't want to include just yet * Remove external survey launch dependency from the control settings Since we use the new button directive instead * revert to multilabel + restore answers while switching between diary and label + whitespace fixes * Change the default options to map to MULTILABEL instead of ENKETO To be consistent with the list view * Revert the description for the share button Should change to NREL later * One final change to metrics * Remove merge conflict * Remove merge conflict! * Revert email address from Amarin to me * Remove the overridden trip confirmation To avoid future merge conflicts + fix the sample * Remove this specific configuration To avoid future conflicts + expand the sample * Restore whitespace * Fix whitespace * Restore dashboard since we also restored the multilabel survey * Ensure that we show the survey page after the login So we replace `finish` with `next` This should not have been reverted --- www/css/intro.css | 21 +-- www/css/main.diary.css | 3 +- www/css/style.css | 9 +- www/i18n/en.json | 6 +- www/index.html | 2 +- www/js/control/general-settings.js | 9 +- www/js/diary/list.js | 7 +- www/js/diary/services.js | 2 +- www/js/intro.js | 55 ++----- www/js/metrics.js | 20 +-- www/js/survey/enketo/service.js | 2 +- www/json/emailConfig.json.sample | 2 +- www/json/enketoSurveyConfig.json | 14 -- www/json/enketoSurveyConfig.json.sample | 6 +- www/json/trip_confirm_options.json.sample | 44 +++--- www/templates/control/main-control.html | 18 +-- www/templates/intro/consent-text.html | 176 +++++++++++----------- www/templates/intro/intro.html | 4 +- www/templates/intro/login.html | 32 ++-- www/templates/intro/summary.html | 2 +- www/templates/main.html | 12 +- 21 files changed, 179 insertions(+), 267 deletions(-) delete mode 100644 www/json/enketoSurveyConfig.json diff --git a/www/css/intro.css b/www/css/intro.css index 60b694338..b636a38d6 100644 --- a/www/css/intro.css +++ b/www/css/intro.css @@ -31,19 +31,11 @@ padding-left: 8%; font-size: 18px; } -.intro-text-large { - padding-top: 5%; - padding-right: 8%; - padding-left: 8%; - font-size: 18px; - line-height: 1.5; - text-align: left; -} .intro-text { padding-top: 5%; padding-right: 8%; padding-left: 8%; - font-size: 16px; + font-size: 15px; line-height: 1.5; text-align: left; } @@ -64,7 +56,7 @@ padding-top: 5%; padding-right: 8%; padding-left: 8%; - font-size: 16px; + font-size: 15px; line-height: 1.5; text-align: left; } @@ -93,12 +85,3 @@ padding-left: 8%; padding-right: 8%; } -/* rciti start */ -ul { - list-style-type: initial; -} - -ol { - list-style-type: decimal; -} -/* rciti end */ diff --git a/www/css/main.diary.css b/www/css/main.diary.css index abeab2cd4..cc0f33317 100644 --- a/www/css/main.diary.css +++ b/www/css/main.diary.css @@ -140,8 +140,7 @@ a.item-content { line-height: 30px; min-height: 30px; font-size: 0.8em !important; - /* NOTE: Please use ConfirmHelper.inputDetails["key"].width config if you need to resize the button */ - width: 100%; + width: 115px; padding: 0; } .input-confirm-container { diff --git a/www/css/style.css b/www/css/style.css index 27e5bb3ca..33254c355 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -701,14 +701,7 @@ background-image: none !important; } width: 64px; font-size:20px; } -/* rciti start */ -.control-icon-user-profile { - background-color: rgb(201, 217, 236); -} -.control-icon-end-survey { - background-color: #E0A1A1 !important; -} -/* rciti end */ + #switch-user.control-icon-button{ background-color: #E0A1A1 !important; diff --git a/www/i18n/en.json b/www/i18n/en.json index e397b50a1..a1f3dc499 100644 --- a/www/i18n/en.json +++ b/www/i18n/en.json @@ -98,9 +98,9 @@ "consent-found": "Consent found!", "consented-to": "Consented to protocol {{protocol_id}}, {{approval_date}}", "consented-ok": "OK", - "share-message": "Join me in making transportation greener and healthier \nDownload the emTripLog app:", - "share-subject": "UNSW Travel Survey", - "share-url": "https://www.taharashidi.com/travel-survey" + "share-message": "Join me in making transportation greener and healthier \nDownload the emission app:", + "share-subject": "Emission - UC Berkeley Research Project", + "share-url": "https://bic2cal.eecs.berkeley.edu/#download" }, "metrics":{ diff --git a/www/index.html b/www/index.html index 731916c0c..64695133c 100644 --- a/www/index.html +++ b/www/index.html @@ -47,7 +47,7 @@ - + diff --git a/www/js/control/general-settings.js b/www/js/control/general-settings.js index 77bb64d80..3d6578ab1 100644 --- a/www/js/control/general-settings.js +++ b/www/js/control/general-settings.js @@ -13,14 +13,13 @@ angular.module('emission.main.control',['emission.services', 'emission.stats.clientstats', 'emission.plugin.kvstore', 'emission.survey.enketo.demographics', - 'emission.survey.external.launch', 'emission.plugin.logger']) .controller('ControlCtrl', function($scope, $window, $ionicScrollDelegate, $ionicPlatform, $state, $ionicPopup, $ionicActionSheet, $ionicPopover, $ionicModal, $stateParams, - $rootScope, KVStore, SurveyLaunch, ionicDatePicker, + $rootScope, KVStore, ionicDatePicker, StartPrefs, ControlHelper, EmailHelper, UploadHelper, ControlCollectionHelper, ControlSyncHelper, ControlTransitionNotifyHelper, @@ -494,12 +493,6 @@ angular.module('emission.main.control',['emission.services', } }); }; - $scope.launchEndSurvey = function() { - SurveyLaunch.startSurveyPrefilled('https://pe.fourstep.dev/', { - returnURL: 'https://www.taharashidi.com/endsurvey', - }); - $scope.endForceSync(); - }; $scope.userStartStopTracking = function() { if ($scope.settings.collect.trackingOn){ return ControlCollectionHelper.forceTransition('STOP_TRACKING'); diff --git a/www/js/diary/list.js b/www/js/diary/list.js index 349d29c2c..c0f6fc86b 100644 --- a/www/js/diary/list.js +++ b/www/js/diary/list.js @@ -27,11 +27,11 @@ angular.module('emission.main.diary.list',['ui-leaflet', $timeout, ionicDatePicker, leafletData, Timeline, CommonGraph, DiaryHelper, - SurveyOptions, + SurveyOptions, Config, ImperialConfig, PostTripManualMarker, nzTour, KVStore, Logger, UnifiedDataLoader, $ionicPopover, $translate) { console.log("controller DiaryListCtrl called"); const DEFAULT_ITEM_HT = 335; - $scope.surveyOpt = SurveyOptions.ENKETO; + $scope.surveyOpt = SurveyOptions.MULTILABEL; ClientStats.addReading(ClientStats.getStatKeys().LABEL_TAB_SWITCH, {"source": null, "dest": $scope.data? $scope.data.currDay : undefined}); // Add option @@ -161,6 +161,7 @@ angular.module('emission.main.diary.list',['ui-leaflet', ionicDatePicker.openDatePicker($scope.datepickerObject); } + $scope.populateBasicClasses = function(tripgj) { tripgj.display_start_time = DiaryHelper.getLocalTimeString(tripgj.data.properties.start_local_dt); tripgj.display_end_time = DiaryHelper.getLocalTimeString(tripgj.data.properties.end_local_dt); @@ -480,6 +481,7 @@ angular.module('emission.main.diary.list',['ui-leaflet', the code to read the manual inputs is completely different. Instead, let's find the corresponding trip from the label view and copy over the `userInput` (and potentially the `user_input`) values over + */ $scope.$apply(() => { if ($scope.data && $scope.data.currDayTripWrappers) { $scope.data.currDayTripWrappers.forEach(function(tripgj, tripIndex, array) { @@ -493,7 +495,6 @@ angular.module('emission.main.diary.list',['ui-leaflet', console.log("No trips loaded yet, no inputs to copy over"); } }); - */ if($rootScope.barDetail){ readAndUpdateForDay($rootScope.barDetailDate); $rootScope.barDetail = false; diff --git a/www/js/diary/services.js b/www/js/diary/services.js index 4c8910052..8e1d4d217 100644 --- a/www/js/diary/services.js +++ b/www/js/diary/services.js @@ -383,7 +383,7 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger', timeline.data.unifiedConfirmsResults = null; timeline.UPDATE_DONE = "TIMELINE_UPDATE_DONE"; - const surveyOpt = SurveyOptions.ENKETO; + const surveyOpt = SurveyOptions.MULTILABEL; const manualInputFactory = $injector.get(surveyOpt.service); // Internal function, not publicly exposed diff --git a/www/js/intro.js b/www/js/intro.js index 57a330642..28eaec601 100644 --- a/www/js/intro.js +++ b/www/js/intro.js @@ -22,7 +22,7 @@ angular.module('emission.intro', ['emission.splash.startprefs', }); }) -.controller('IntroCtrl', function($scope, $rootScope, $http, $state, $window, +.controller('IntroCtrl', function($scope, $rootScope, $state, $window, $ionicPlatform, $ionicSlideBoxDelegate, $ionicPopup, $ionicHistory, ionicToast, $timeout, CommHelper, StartPrefs, SurveyLaunch, UpdateCheck, i18nUtils) { @@ -105,45 +105,8 @@ angular.module('emission.intro', ['emission.splash.startprefs', }); } - $scope.loginExisting = function() { - $scope.data = {}; - const tokenPopup = $ionicPopup.show({ - template: '', - title: 'Enter the existing token that you have', - scope: $scope, - buttons: [ - { - text: 'OK', - type: 'button-positive', - onTap: function(e) { - if (!$scope.data.existing_token) { - //don't allow the user to close unless he enters a username - - e.preventDefault(); - } else { - return $scope.data.existing_token; - } - } - },{ - text: 'Cancel', - type: 'button-stable', - onTap: function(e) { - return null; - } - } - ] - }); - tokenPopup.then(function(token) { - if (token != null) { - $scope.login(token); - } - }).catch(function(err) { - $scope.alertError(err); - }); - }; - - $scope.login = function(token) { - window.cordova.plugins.BEMJWTAuth.setPromptedAuthToken(token).then(function(userEmail) { + $scope.login = function() { + window.cordova.plugins.BEMJWTAuth.signIn().then(function(userEmail) { // ionicToast.show(message, position, stick, time); // $scope.next(); ionicToast.show(userEmail, 'middle', false, 2500); @@ -151,18 +114,18 @@ angular.module('emission.intro', ['emission.splash.startprefs', $scope.alertError("Invalid login "+userEmail); } else { CommHelper.registerUser(function(successResult) { - ionicToast.show(userEmail, 'middle', false, 2500); - $scope.next(); - // $scope.finish(); + UpdateCheck.getChannel().then(function(retVal) { + CommHelper.updateUser({ + client: retVal + }); + }); + $scope.next(); }, function(errorResult) { - // ionicToast.show(userEmail, 'middle', false, 2500); $scope.alertError('User registration error', errorResult); - // $scope.finish(); }); } }, function(error) { $scope.alertError('Sign in error', error); - // $scope.finish(); }); }; diff --git a/www/js/metrics.js b/www/js/metrics.js index 35233ecd4..19d10f254 100644 --- a/www/js/metrics.js +++ b/www/js/metrics.js @@ -92,13 +92,13 @@ angular.module('emission.main.metrics',['nvd3', /* $scope.onCurrentTrip = function() { - // window.cordova.plugins.BEMDataCollection.getState().then(function(result) { - // Logger.log("Current trip state" + JSON.stringify(result)); - // if(JSON.stringify(result) == "\"STATE_ONGOING_TRIP\""|| - // JSON.stringify(result) == "\"local.state.ongoing_trip\"") { - // $state.go("root.main.current"); - // } - // }); + window.cordova.plugins.BEMDataCollection.getState().then(function(result) { + Logger.log("Current trip state" + JSON.stringify(result)); + if(JSON.stringify(result) == "\"STATE_ONGOING_TRIP\""|| + JSON.stringify(result) == "\"local.state.ongoing_trip\"") { + $state.go("root.main.current"); + } + }); }; */ @@ -112,9 +112,9 @@ angular.module('emission.main.metrics',['nvd3', // If we want to share this function (see the pun?) between the control screen and the dashboard, we need to put it into a service/factory. // But it is not clear to me why it needs to be in the profile screen... var prepopulateMessage = { - message: 'Have fun, support research and get active. Your privacy is protected. \nDownload the emTripLog app:', // not supported on some apps (Facebook, Instagram) - subject: 'Help Sydney become more bikeable and walkable', // fi. for email - url: 'https://www.taharashidi.com/travel-survey' + message: 'Have fun, support research and get active. Your privacy is protected. \nDownload the emission app:', // not supported on some apps (Facebook, Instagram) + subject: 'Help Berkeley become more bikeable and walkable', // fi. for email + url: 'https://bic2cal.eecs.berkeley.edu/#download' } $scope.share = function() { diff --git a/www/js/survey/enketo/service.js b/www/js/survey/enketo/service.js index 450619b6d..186c64ae7 100644 --- a/www/js/survey/enketo/service.js +++ b/www/js/survey/enketo/service.js @@ -104,7 +104,7 @@ angular.module('emission.survey.enketo.service', [ /** * _restoreAnswer restore the most recent answer for the survey * @param {EnketoAnswer[]} answers survey answers - * @returns {Promise} answer string promise + * @returns {string} answer string */ function _restoreAnswer() { if (_state.opts.trip) { diff --git a/www/json/emailConfig.json.sample b/www/json/emailConfig.json.sample index 2a8aadee1..b1e28e63b 100644 --- a/www/json/emailConfig.json.sample +++ b/www/json/emailConfig.json.sample @@ -1,3 +1,3 @@ { - "address": "a.siripanich@unsw.edu.au" + "address": "shankari@eecs.berkeley.edu" } \ No newline at end of file diff --git a/www/json/enketoSurveyConfig.json b/www/json/enketoSurveyConfig.json deleted file mode 100644 index b45e74fef..000000000 --- a/www/json/enketoSurveyConfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "TripConfirmSurvey": { - "formPath": "json/trip-end-survey-multiple-select.json", - "version": 1.2, - "compatibleWith": 1, - "dataKey": "manual/trip_user_input" - }, - "UserProfileSurvey": { - "formPath": "json/user-profile.json", - "version": 1, - "compatibleWith": 1, - "dataKey": "manual/demographic_survey" - } -} diff --git a/www/json/enketoSurveyConfig.json.sample b/www/json/enketoSurveyConfig.json.sample index e67bf707e..b45e74fef 100644 --- a/www/json/enketoSurveyConfig.json.sample +++ b/www/json/enketoSurveyConfig.json.sample @@ -2,11 +2,13 @@ "TripConfirmSurvey": { "formPath": "json/trip-end-survey-multiple-select.json", "version": 1.2, - "compatibleWith": 1 + "compatibleWith": 1, + "dataKey": "manual/trip_user_input" }, "UserProfileSurvey": { "formPath": "json/user-profile.json", "version": 1, - "compatibleWith": 1 + "compatibleWith": 1, + "dataKey": "manual/demographic_survey" } } diff --git a/www/json/trip_confirm_options.json.sample b/www/json/trip_confirm_options.json.sample index 7f1e83d83..5dbdd44d5 100644 --- a/www/json/trip_confirm_options.json.sample +++ b/www/json/trip_confirm_options.json.sample @@ -1,28 +1,28 @@ { "MODE" : [ - {"text":"Vehicle Driver", "value":"driver", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.22031}, - {"text":"Vehicle Passenger","value":"passenger", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.11015}, - {"text":"Walk","value":"walk", "met_equivalent": "WALKING", "co2PerMeter": 0}, - {"text":"Train","value":"train", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.12256}, + {"text":"Walk", "value":"walk", "met_equivalent": "WALKING", "co2PerMeter": 0}, + {"text":"Bike","value":"bike", "met_equivalent": "BICYCLING", "co2PerMeter": 0}, + {"text":"Drove Alone","value":"drove_alone", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.22031}, + {"text":"Shared Ride","value":"shared_ride", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.11015}, + {"text":"Taxi/Uber/Lyft","value":"taxi", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.30741}, {"text":"Bus","value":"bus", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.20727}, - {"text":"Tram","value":"tram", "met_equivalent": "UNKNOWN", "co2PerMeter": 0}, - {"text":"Ferry","value":"ferry", "met_equivalent": "UNKNOWN", "co2PerMeter": 0}, - {"text":"Taxi & Uber","value":"taxi", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.30741}, - {"text":"Bicycle","value":"bike", "met_equivalent": "BICYCLING", "co2PerMeter": 0}, - {"text":"Motorcycle","value":"motorbike", "met_equivalent": "UNKNOWN", "co2PerMeter": 0}, - {"text":"Trip not valid","value":"spurious_trip", "met_equivalent": "UNKNOWN", "co2PerMeter": 0}], + {"text":"Train","value":"train", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.12256}, + {"text":"Free Shuttle","value":"free_shuttle", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.20727}, + {"text":"Air","value":"air", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.09975}, + {"text":"Other","value":"other", "met_equivalent": "UNKNOWN", "co2PerMeter": 0}], "PURPOSE" : [ - {"text":"Go Home", "value":"home"}, - {"text":"Work related","value":"work"}, - {"text":"Pick-up/Drop off ๐Ÿ™โ€โ™‚๏ธ","value":"pick_drop_person"}, - {"text":"Buy something","value":"buy_something"}, - {"text":"Education","value":"education"}, - {"text":"Social/Dine out","value":"social"}, - {"text":"Recreation/Exercise","value":"exercise"}, - {"text":"Personal/Medical","value":"personal_med"}, - {"text":"Accompany", "value":"accompany_someone"}, - {"text":"Pick-up/Deliver ๐Ÿ“ฆ", "value":"pick_drop_thing"}, + {"text":"Home", "value":"home"}, + {"text":"To Work","value":"work"}, + {"text":"At Work","value":"at_work"}, + {"text":"School","value":"school"}, {"text":"Transit transfer", "value":"transit_transfer"}, - {"text":"Other","value":"other"}, - {"text":"Trip not valid","value":"spurious_trip"}] + {"text":"Shopping","value":"shopping"}, + {"text":"Meal","value":"meal"}, + {"text":"Pick-up/Drop off","value":"pick_drop"}, + {"text":"Personal/Medical","value":"personal_med"}, + {"text":"Access Recreation","value":"access_recreation"}, + {"text":"Recreation/Exercise","value":"exercise"}, + {"text":"Entertainment/Social","value":"entertainment"}, + {"text":"Religious", "value":"religious"}, + {"text":"Other","value":"other"}] } diff --git a/www/templates/control/main-control.html b/www/templates/control/main-control.html index bd47809c8..5d840f91c 100644 --- a/www/templates/control/main-control.html +++ b/www/templates/control/main-control.html @@ -5,12 +5,6 @@
-
-
End Survey
-
- -
-
{{'.view-privacy'}}
@@ -28,7 +22,7 @@
{{'.app-status'}}
- - - +
{{'.force-sync'}}
diff --git a/www/templates/intro/consent-text.html b/www/templates/intro/consent-text.html index 023297219..d23736d9a 100644 --- a/www/templates/intro/consent-text.html +++ b/www/templates/intro/consent-text.html @@ -1,94 +1,96 @@
-

ONLINE PARTICIPANT INFORMATION STATEMENT -
Collecting personal travel behaviour data with location-aware mobile -application technologies

-
(๐Ÿ‘‡ scroll down to give consent)
+

E-Mission: Data driven carbon emission reduction

-

What is the research study about?

- -You are invited to participate in this research study. The aim of this research study is to collect information about the personal travel behaviour of residents in all metropolitan areas across Australia. Information about people's day-to-day travel behaviour is critical to predict future travel demand and infrastructure needs. This information is even more important during a rare event such as the current virus pandemic. Having this data will allow transport services to be better planned for the most vulnerable people in our society, when the next pandemic comes. - -

Who is conducting this research?

-The study is being carried out by Assoc Prof Taha H. Rashidi and Dr Amarin Siripanich at the Research Centre for Integrated Transport Innovation (RCITI), UNSW Sydney, Australia. This research is also being funded by RCITI. - -

Inclusion criteria

-Before you decide to participate, we need to ensure that you meet the inclusion criteria of this research study. You can participate if the following criteria apply to you: - -
    -
  • - You are eighteen years old or older.
    • -
  • - You reside in a metropolitan area of Australia.
    • -
  • - You own a smartphone running Android (compatibility varies with device) or Apple iOS 9 (or newer).
    • -
- -

Do I have to take part in this research study?

- -Participation in any research study is voluntary. If you do not want to take part, you do not have to. If you decide that you want to take part in the research study, you will be asked: - -
    -
  • - To read the information carefully.
    • -
  • - To participate in a four-days-long data collection with emTriplog, a location-aware travel survey mobile application.
    • -
- -

What does participation in this research require, and are there any risks involved?

-If you decide to take part in the research study, we will ask you to first complete a questionnaire. The questionnaire includes questions about your sociodemographic characteristics, your attitude towards data privacy, and your expectation of this travel survey. emTripLog is a location-aware mobile application, which automatically senses and securely stores information about your travel behaviour. emTripLog operates unobtrusively in the background and relies on your smartphone's sensors (GPS and accelerometer) to record your movements. emTripLog also requests additional information about your travel behaviour in the form of short questionnaires that are usually presented at the end of a trip. You will be asked to keep emTripLog active for four days. You will be required to always carry your smartphone on you during the study period and to assure that your smartphone's battery is always sufficiently charged. At the end of the four-days-long study period, you will need to go the โ€˜Profileโ€™ tab within the emTripLog app and answer a closing closing questionnaire by clicking on the โ€˜End Surveyโ€™ icon and will be asked to uninstall emTripLog. - -
- -The duration of this research study is four days. Participation in this research study is expected to require the following amounts of your personal time: -
+

Introduction and Purpose

+This app is part of a travel behavior research platform developed at the +University of California, Berkeley. The platform development is being led by K. Shankari under the +supervision of Prof. David +Culler. Our goal is to collect information from users about travel behavior +across all modes, and use the aggregate information for better transportation +infrastructure planning. + +

What we collect

+We automatically track your location, accelerometer, device-generated activity +recognition, and battery usage. We also allow you to optionally enter your +experiences and feedback during travel through the app. Since our code is +open source, you can inspect the data that we collect in the background at +https://github.com/e-mission/e-mission-data-collection.git, +explore the prompts for optional sentiment reporting at https://github.com/e-mission/e-mission-phone.git, +and see the analysis that we perform at https://github.com/e-mission/e-mission-server.git + +

How we associate it with you

+You log in to the app using a valid gmail address. We map the gmail address to +a unique UUID and associate all collected data with the UUID. In general, the +mapping between the email address and the UUID will only be made available to +the lead researcher for the platform (Shankari). If you are not comfortable +sharing your real gmail adress, you can create a fake one to use for this +platform. The only reason we use an email address is so that we can ensure that +your data is only available to somebody logged in as you, and remains available +even if you switch phones. + +

Who gets to see it

+Individually identified, real-time data is only available to the lead +researcher for the study (Shankari). The data may be shared for aggregate +analysis under two scenarios as described below. It will not be used for +marketing or advertising purposes.
    -
  • - 10 minutes to complete the opening questionnaire;
    • -
  • - 5 minutes to install the emTripLog app;
    • -
  • - Less than 1 minute to fill in questions typically prompted after completion of a trip.
    • -
  • - Less than 10 minutes to complete the closing questionnaire.
    • +
  • Aggregate views of the collected data (both automatic and optional) that +do not show individual trajectories (e.g. heatmaps) will be made publicly +available through the platform website and on the phone app. You can explore +this data on the "aggregate" tab of this app before consenting to data +collection. +
  • Time-delayed subsets of individual trajectory data, associated with their +UUIDs but not email addresses, may by shared with collaborators, or released as +research datasets to the community from time to time. If this is done, the time +delay for sharing with collaborators will be at least one month, and the time +delay for releasing to the community will be at least one year. Both +collaborators and researchers will be asked to agree that they will publish +only aggregate, non personally identifiable results, and will not re-share the +data with others.
-
-Assuming that you complete an average of four trips per day, it is expected that participation in this research study will not consume more than 41 minutes of your time during the entire study period. - -All data collected through emTripLog are encrypted and securely transferred to a data server located in on the UNSW campus in Kensington, NSW. emTripLog is designed to minimise data volume usage when transferring data between your device and the server. If both WiFi and cellular network signals are available. emTripLog first uses WiFi to transmit and receive data. If WiFi is unavailable, emTripLog relies on your mobile data plan, whenever a cellular signal is available. You will not be reimbursed for any expenses related to the data usage of emTripLog. Even though emTripLog has been designed to minimise energy consumption, the continued use of location services in the background can dramatically decrease your smartphone's battery life. - -We do not exepct that participation in this research study to cause any harm or discomfort. However, should you experience any feelings of distress during your participation in this study, you can let the research team know and they will provide you with assistance. - -

What are the possible benefits to participation?

- -It is hoped that the insights of this research study can inform strategic policy- making processes in the domain of transport and infrastructure planning. - -

What will happen to information about me?

- -By clicking the 'I accept' button on the emTripLog application you are providing your permission for the research team to collect and use information about you for the research study. Your data will be kept indefinitely for future research purposes. We will store information about you electronically in a non-identifiable format at secure server on the grounds of the UNSW campus in Sydney, Australia. Your information will be used to develop behavioural models of travel demand. The results of these models will only be presented in aggregate form and individual data will not be identifiable. The information for this research study may be made available to other research projects in de-identified form only. Researchers at UNSW are required to store their aggregated data in the UNSW data repository, this is a system called ResData. Once the aggregated data is deposited into this repository it will be retained in this system permanently. It will however be retained in a format where your identity will not be known. - -

How and when will I find out what the results of the research study are?

-The research team intends to publish and report the results of the research study in a variety of ways including presentations at academic conferences and academic journal papers. Information will be published in aggregate form such that individual responses cannot be identified. - -

What if I want to withdraw from the research study?

-If you do consent to participate, you may withdraw at any time. You can do this by closing the questionnaire or uninstalling the emTripLog mobile application from your phone. If you withdraw from the research we will destroy any information that has already been collected. However, once the data collection is complete, we will not be able to withdraw your responses as the data collection is anonymous. - -

What should I do if I have further questions about my involvement in the research study?

-The person you may need to contact will depend on the nature of your query. If you require further information regarding this study or if you have any problems which may be related to your involvement in the study, you can contact the following members of the research team: - -
-Research team contact:
-Name: Assoc Prof Taha H. Rashidi 
-Position: Associate Professor 
-Telephone: (+61 2) 9385 5063 
-Email: rashidi@unsw.edu.au
-
- -

What if I have a complaint or any concerns about the research study?

-If you have a complaint regarding any aspect of the study or the way it is being conducted, please contact the UNSW Human Ethics Coordinator: - -
-Complaints contact:
-Position: Human Research Ethics Coordinator 
-Telephone: (+61 2) 9385 6222
-Email: humanethics@unsw.edu.au
-HC reference no.: HC180687
-
- -

How emTripLog works

-We automatically track your location, accelerometer, device-generated activity -recognition, and battery usage. We also allow you to optionally enter your -experiences and feedback during travel through the app. +

Benefits and Compensation

+You will not be directly compensated for contributing your data to this +platform. +

+However, we will use this information to provide you with a personalized travel +profile that can be compared with the travel profiles of our other users, and +with state and federal goals for daily exercise and GHG emission reduction. In +addition, we will display aggregate travel patterns and aggregate crowdsourced +safe/unsafe zones that you can use while making travel choices. You will have a +chance to see the aggregate data generated before choosing to provide your own. + +

Studies lead by other researchers

+If this platform is being used to collect data for a study conducted by another +researcher, for example, from a Transportation Engineering Department, then you +will be asked to assent to a separate document outlining the data association, +retention and sharing policies for that study, in addition to the policies +above. We will make all data, including the mapping between the email +address and the UUID, directly available to the lead researcher for the main +study. This will allow them to associate the automatically gathered information +with demographic data, and any pre and post surveys that they conduct as part +of their study. The other researcher may also choose to compensate you for your +time, as described in the protocol document for that study. + +

Your rights

+Participation in research is completely voluntary. You have the +right to decline to participate or to withdraw at any point in this study +without penalty or loss of benefits to which you are otherwise entitled. + +

Questions

+If you have any questions about this research, please feel free to contact us. +For the quickest response, you can send email to the entire team at e-mission@lists.eecs.berkeley.edu. +If you want to contact only the lead researcher or the PI, you can use their +profiles above. + +If you have any questions about your rights or treatment as a research +participant using this platform, please contact the University of California at +Berkeley's Committee for Protection of Human Subjects at 510-642-7461, or +e-mail subjects@berkeley.edu.
diff --git a/www/templates/intro/intro.html b/www/templates/intro/intro.html index 0204ed0be..aae1b81b9 100644 --- a/www/templates/intro/intro.html +++ b/www/templates/intro/intro.html @@ -1,8 +1,8 @@ - + diff --git a/www/templates/intro/login.html b/www/templates/intro/login.html index f2bd22948..409173bc0 100644 --- a/www/templates/intro/login.html +++ b/www/templates/intro/login.html @@ -1,19 +1,15 @@ -
-

Login via anonymous token 🔑

-

- Use the token given to you in Step 3 of the guided instruction OR via email to login: -

- -
- -
- Should you require any assistance please do not hesitate to contact us: -

-
    -
  • ๐Ÿ“ง Email us at a.siripanich@unsw.edu.au
    • -
  • โ˜Ž Call or text 0423-588-117 any day between 09.00-18.00.
    • -
-
- - \ No newline at end of file +
+

Login via google

+ +
+Currently, we only support logging in via google, since they support techniques +such as two factor authentication for greater security. Participants at UC +Berkeley can choose to login using either their CalNet ID or a personal gmail +account. +
+ +
+ + + diff --git a/www/templates/intro/summary.html b/www/templates/intro/summary.html index fd7070831..2dbd1f0a7 100644 --- a/www/templates/intro/summary.html +++ b/www/templates/intro/summary.html @@ -1,7 +1,7 @@
-

RCITI UNSW

+

E-Mission: Data driven carbon emission reduction

diff --git a/www/templates/main.html b/www/templates/main.html index 287992dcc..f12ca6aed 100644 --- a/www/templates/main.html +++ b/www/templates/main.html @@ -21,19 +21,19 @@ --> - + - - --> + - +