Skip to content

Pickup options

Anton Ballmaier requested to merge pickup-options into master

TODOs until MR is finished:

  • Use translated text everywhere.
  • Add doc-strings to all function
  • changelog entry
  • Switch from infinite scrolling to "load more" button
  • Hide history older than 4 weeks from other users

What does this MR do?

This MR combines the pickup related sections "Next Pickups" and "Past Pickups" into one concise tabbed section. There is also a newly added function "pickup options", showing the slots one might enter.

The "BOT" view mentioned in the thread linked below is not yet included, but can easily be added to this system. I didn't do it in this MR since it is already quite big.

How confident are you it won't break things if deployed?

90%

Links to related issues

https://beta.foodsharing.de/?page=bezirk&bid=2296&sub=forum&tid=109857

How to test

  1. Checkout branch locally
  2. Login as foodsaver / storemanager / bot
  3. As a foodsaver / storemanager you should see your own history and registered pickups.
  4. As ab bot you should see registered pickups and history of other users in your region.
  5. Try out the different option: Table sorting, linked tooltips, dropdown menu options, ...

Screenshots (if applicable)

Look of the table on your own profile page: Screen_Shot_2022-05-11_at_17.49.24

Sorting by different criteria, here store name: Screen_Shot_2022-05-11_at_17.49.34

Every table has a dropdown menu with more options: Screen_Shot_2022-05-11_at_17.49.45

The second Tab lists all possible pickups. Registered pickups can be included or excluded. Screen_Shot_2022-05-11_at_17.50.39 Screen_Shot_2022-05-11_at_17.50.52

The last tab shows all past pickups. Not all results are fetched initially, but clicking the button at the bottom of the list or the "Weitere laden" option from the menu will load more results and append them to the list. The list itself is scrollable so that it will not expand to much. Screen_Shot_2022-05-11_at_17.51.09

When viewing the table of registered pickups of others as a bot you can remove them from their slots (all at once or separately). This does not include slots in different districts, to allow for easier "unverification" of users. Screen_Shot_2022-05-11_at_17.52.10

Removing users from a slot must be confirmed via modal window: image

Empty tables are replaced by fitting messages: Screen_Shot_2022-05-11_at_17.53.28

The sections are ordered as follows: Screen_Shot_2022-05-11_at_17.53.59

The tooltips of filled slots contain the names of the users who signed into that slot. These names are also linked to the user profiles. Screen_Shot_2022-05-11_at_17.54.11

I changed the look of the "Slot" column to include as many profile pictures as possible and (if applicable) the number of free slots. For small devices the date gets displayed in a shorter format. (Other images were made before these changes, I dont want to remake all of them...) image

Checklist

  • added a test, or explain why one is not needed/possible...
  • no unrelated changes
  • asked someone for a code review
  • set a "for:" label to indicate who will be affected by this change
  • added to the next milestone (see https://gitlab.com/foodsharing-dev/foodsharing/-/milestones, unless it has a "for:Dev" label)
  • added an entry to CHANGELOG.md
  • added a short text that can be used in the release notes
  • Once your MR has been merged, you are responsible to create a testing issue in the Beta Testing forum: https://foodsharing.de/?page=bezirk&bid=734&sub=forum. Please change the MRs label to "state:Beta testing".
    • Consider writing a detailed description in German.
    • Describe in a few sentences, what should be tested from a user perspective.
    • Also mention different settings (e.g. different browsers, roles, ...) how this change can be tested.
    • Be aware, that also non technical people should understand.

Release notes text in German

Die Abschnitte "Nächste Abholtermine" und "Abholungshistorie" der Profilseite wurden zu einem Abschnitt "Abholtermine" zusammengefasst. Hier könnt ihr euch außerdem anzeigen lassen, wann in welchen eurer Betriebe Slots frei sind, für die ihr euch eintragen könnt.

Edited by Anton Ballmaier

Merge request reports