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.

Sign up for GitHub

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

Jump to bottom

Bunch of fixes from the NREL branch #737

Open
wants to merge 11 commits into
base: single_tenant_app_snapshot_unmaintained
Choose a base branch
from
Open

Bunch of fixes from the NREL branch #737

wants to merge 11 commits into from

Commits on Feb 18, 2021

  1. Simple changes for the NREL location history project 

    - Launch a survey
- Autogenerate a random token
- Change the text on the login page
- Display the random token for the user to enter
  - Once we have the newer version of emTripLog, we can set this automatically
    @shankari
    shankari committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    5dffc71 View commit details
    Browse the repository at this point in the history

  2. Switch the login to an autogenerated token that is set directly 

    Finally we get to use the new `setPromptedAuthToken` method.

This raises a bunch of new questions:
- if the user switches phones or uninstalls + reinstalls, how do they enter their old token?
- how do they write their old token down
- should we give them a choice between autogenerated and human generated

Fortunately, since this is going to collect data for 2-3 days, none of these
need to be answered right now.
    @shankari
    shankari committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    ce41917 View commit details
    Browse the repository at this point in the history

  3. Add a button to the profile to support the weekly survey 

    This allow users to answer the survey in-app even if they are not able to
respond to the push notification in real time

Testing done:
- Launched the app
- Clicked on the button
- Confirmed that the weekly survey was launched
    @shankari
    shankari committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    2c89412 View commit details
    Browse the repository at this point in the history

  4. Switch the kobotoolbox survey to use prefilled values as well 

    + add a button to launch the survey from the profile so current users can fill it in

Testing done:
- launched survey during onboarding + from the profile screen
- confirmed with Bingrong that the UUID was filled in

This partially fixes
e-mission/e-mission-docs#587

Full fix will involve updating the documentation
    @shankari
    shankari committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    c77aca9 View commit details
    Browse the repository at this point in the history

  5. Use the online form so that it gets submitted immediately

    @shankari
    shankari committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    4a39072 View commit details
    Browse the repository at this point in the history

  6. Switch the trip confirm screen to also go to the diary directly 

    Avoids race conditions and confusion; highlights the diary
We may want to merge this to master based on feedback from the CEO project
    @shankari
    shankari committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    9978e50 View commit details
    Browse the repository at this point in the history

  7. Allow users to enter a prior token in the login screen 

    Can change this based on feedback from initial testers
    @shankari
    shankari committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    985745e View commit details
    Browse the repository at this point in the history

  8. Switch back to the offline version of the surveys

    @shankari
    shankari committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    5a88766 View commit details
    Browse the repository at this point in the history

  9. Improve the matching of user inputs to cleaned trips 

    While matching user inputs on the server, found that user input matching was
broken for some cleaned trips on the phone.
e-mission/e-mission-docs#476 (comment)

Expanded the user input end check to fix.
e-mission/e-mission-docs#476 (comment)

Will merge into master after additional testing on the branch.

+ bump up the allowed delta to 15 minutes since the time threshold default for
the distance filter is 10 minutes.
    @shankari
    shankari committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    21ab3fa View commit details
    Browse the repository at this point in the history

  10. Fix regression in enhanced trip matching 

    The enhanced trip matching (75129db) caused a
regression in which a spurious trip (not a trip) that occurred after the real
trip fit the criteria for a match.

And since it was confirmed after the real trip, as you would expect while going
down the trip list, it was matched preferentially.
e-mission/e-mission-docs#476 (comment)

Fixed by checking the degree over overlap and rejecting too short matches
    @shankari
    shankari committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    6bd731a View commit details
    Browse the repository at this point in the history

  11. Fix the infinite scroll user input matching 

    to be consistent with the refactor in
21ab3fa
and
6bd731a
    @shankari
    shankari committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    d20f2cf View commit details
    Browse the repository at this point in the history