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

Add new label UI #767

Merged

Conversation

GabrielKS
Copy link
Contributor

See previous PRs for details:

This PR contains those changes, a few earlier changes, and two recent commits that fix minor positioning issues discovered when testing with the CanBikeCO interface alterations and with Android, respectively. This is an alternative to #766.

Screenshot showing how it looks on Android

shankari and others added 19 commits May 25, 2021 17:18
Concretely, ensure that we notify that:
- we track location in the background, even when the app is closed
- we use it to generate a trip log

With this wording, emTripLog was accepted into the store
e-mission/e-mission-docs#611 (comment)
Add the required keywords to the "prominent disclosure"
+ Bump up plugin versions
    - Main changes: https://github.com/e-mission/e-mission-data-collection/releases/tag/v1.6.0
    - Consolidate activity changes, should really be moved to data-collection later
        https://github.com/e-mission/cordova-server-sync/releases/tag/v1.2.5
    - Null check
        https://github.com/e-mission/cordova-jwt-auth/releases/tag/v1.6.4

+ change the default instructions to match the new processes
+ bump up version numbers for the app
…_fix_permissions

Redirect to app settings on newer versions of android and iOS
+ Adds basic client-side processing of label inference data structure
    - Minor restructuring of infinite_scroll_list.js to facilitate this
    - Still need to write full client-side inference algorithm
+ Displays inferred labels in yellow and blank labels in red
+ Moves the "more" button on trip cards to the top right corner
+ Adds a verify button beneath it that turns yellow labels green
+ Fixes a bug that mis-positioned trip start and end icons if labels were blank
+ Like the previous commit, does not affect the Diary page
+ This algorithm takes the list of label tuples and probabilities from
  the server and chooses which yellow labels to show the user, taking
  into account what the user has already begun to enter.
+ Extensively documented in the comments.

Testing done:
Tested various cases using the more extensive server-side placeholder
label inference "algorithm" recently committed.
Add UI features and algorithm to support label inference
Previously, trip.verifiability would not get updated when certain label
changes were made, leading to an improperly styled checkmark.
The buttons now look like the tab selectors on the dashboard and heatmap screens.
+ Add a "To Label" filter that shows trips that the server has marked as ones the user is expected to label
+ Recompute filters when labels are entered so that trips disappear from the "To Label" screen as soon as they are labeled
+ Change the visible filters to "To Label" and "All"; change the default filter to "To Label"
+ Change the "Unlabeled" filter to show all trips for which any labels are red, instead of requiring all labels to be red
We don't build this package, we just include the js directly. So we don't need the Gruntfile. And if we ever start building it again, we will want to upgrade to the most recent version anyway.

This fixes https://github.com/e-mission/e-mission-phone/security/dependabot/www/manual_lib/angularjs-nvd3-directives/package.json/grunt/open
+ Redo the HTML and visual layout of the Label screen header to look better and better match other screens
+ Use pseudo-classes to more elegantly style the label filter tabs
+ Add the unlabeled tab back
+ Rename tabs for visual consistency
+ Set a single tab width, not one per tab
@shankari
Copy link
Contributor

I can't really review the hacks, since they seem to primarily be related to spacing. Screenshot looks good!

@shankari shankari merged commit dee1429 into e-mission:ceo_ebike_project_stage Jul 20, 2021
GabrielKS pushed a commit to GabrielKS/e-mission-phone that referenced this pull request Aug 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants