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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integrate Engelsystem shifts #200

Merged
merged 6 commits into from Dec 17, 2019
Merged

Integrate Engelsystem shifts #200

merged 6 commits into from Dec 17, 2019

Conversation

johnjohndoe
Copy link
Member

@johnjohndoe johnjohndoe commented Dec 11, 2019 •
edited

Description

  • This pull request integrates personal shifts managed by the Engelsystem into the app.
  • Shifts are represented as a separate column/room in the schedule if the user is assigned to at least one shift on that particular conference day (see screenshot).
  • The specification for the feature can be found in issue Show own shifts from Engelsystem聽#181.
  • The feature is enabled for the cccamp2019 product flavor.
  • The Engelsystem URL can be specified in the Settings screen (see screenshots).
  • Further details: Please read the commit messages.

馃悰 Known issues in preview 1

  • The shifts column does not appear on certain days because the room index is mixed up.

馃悰 Known issues in preview 2

  • nothing yet

Successfully tested on

with cccamp2019 flavor

  • 鉁旓笍 LG Nexus 5, Android 6.0.1 (API 23)
  • 鉁旓笍 Google Nexus 9, Android 7.1.1 (API 25)
  • 鉁旓笍 Google Pixel 2, Android 10 (API 29)

Before

  • The Setting screen without an entry for the Engelsystem shifts feature.
    The Setting screen without the setting for the Engelsystem shifts feature

After

  • The Setting screen with an entry for the Engelsystem shifts feature.
    The Setting screen with the setting for the Engelsystem shifts feature

  • The Schedule screen with an "Engelshifts" column and a shift in the details area - shown on a tablet device.
    The Schedule screen with an "Engelshifts" column and a shift in the details area - shown on a tablet device

Resolves #181

@johnjohndoe johnjohndoe added Feature request A request for a new feature. Engelsystem Integration of the https://engelsystem.de labels Dec 11, 2019
@johnjohndoe johnjohndoe self-assigned this Dec 12, 2019
@johnjohndoe johnjohndoe mentioned this pull request Dec 12, 2019
Closed
@johnjohndoe johnjohndoe force-pushed the engelsystem-shifts branch 2 times, most recently from 1e77667 to 068a5d1 Compare December 14, 2019 15:31
@johnjohndoe
Document room index calculation.
e81c8cd
@johnjohndoe
Facilitate testing of AppRepository.
116125f
@johnjohndoe
Prepare for handling different parse results.
07d7874 
+ Add ParseResult interface.
@johnjohndoe
Load shifts from Engelsystem API.
e6cc648 
+ If configured for the product flavor the app will fetch
  shift data from the Engelsystem backend and parse it.
+ The shift data is converted into the data structure which
  is used for schedule data.
+ Any shift which exceeds the time range of the conference
  days as defined by the schedule data is dropped.
+ New shift data replaces data loaded earlier.
+ A separate room/column is shown on a particular day if
  shift data is available.
+ This commit does not implement UI to enter an API URL.
+ Texts of the feature are translated to English and German.
@johnjohndoe
Add preference item to enter Engelsystem URL.
7bb735c
@johnjohndoe
Validate Engelsystem URL entered by the user.
ba2c285
@johnjohndoe johnjohndoe added this to the v.1.41.0 milestone Dec 17, 2019
@johnjohndoe johnjohndoe marked this pull request as ready for review December 17, 2019 17:12
@johnjohndoe johnjohndoe merged commit 2c0cf26 into master Dec 17, 2019
@johnjohndoe johnjohndoe deleted the engelsystem-shifts branch December 17, 2019 17:38
@johnjohndoe johnjohndoe added the App settings Settings screen label Sep 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@johnjohndoe johnjohndoe

Labels
App settings Settings screen Engelsystem Integration of the https://engelsystem.de Feature request A request for a new feature.
Milestone
v.1.41.0
Development

Successfully merging this pull request may close these issues.

Show own shifts from Engelsystem
1 participant
@johnjohndoe