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

Fix/1408 more consistent UI timer #2014

Merged
merged 10 commits into from
Jan 7, 2024

Conversation

seyfeb
Copy link
Collaborator

@seyfeb seyfeb commented Dec 19, 2023

Topic and Scope

  • Update timer display
    • Remove H:MM from label
    • Add units
    • Add support for durations with seconds
  • Add possibility to define seconds for time periods in recipe editor
  • Make global i18n n(...) function available in JS

Closes #1408. Closes #1747

Screenshot 2023-12-19 at 14 47 10

Concerns/issues

This currently only supports translations to left-to-right languages, i.e., first hours, then minutes, then seconds.

Formal requirements

There are some formal requirements that should be satisfied. Please mark those by checking the corresponding box.

  • I did check that the app can still be opened and does not throw any browser logs
  • I created tests for newly added PHP code (check this if no PHP changes were made)
  • I updated the OpenAPI specs and added an entry to the API changelog (check if API was not modified)
  • I notified the matrix channel if I introduced an API change

@seyfeb seyfeb added enhancement New feature or request javascript Pull requests that update Javascript code Frontend Issue or PR related to the frontend code labels Dec 19, 2023
Copy link

codecov bot commented Dec 19, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (f2ae69a) 80.07% compared to head (2d921ff) 80.07%.
Report is 3 commits behind head on master.

❗ Current head 2d921ff differs from pull request most recent head 7b55fb0. Consider uploading reports for the commit 7b55fb0 to get more accurate results

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2014   +/-   ##
=======================================
  Coverage   80.07%   80.07%           
=======================================
  Files          92       92           
  Lines        2650     2650           
=======================================
  Hits         2122     2122           
  Misses        528      528           
Flag Coverage Δ
integration 21.43% <ø> (ø)
migration 5.69% <ø> (ø)
unittests 57.09% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link

github-actions bot commented Dec 19, 2023

Test Results

   12 files    572 suites   1m 30s ⏱️
  552 tests   552 ✅ 0 💤 0 ❌
2 208 runs  2 207 ✅ 1 💤 0 ❌

Results for commit 948e229.

♻️ This comment has been updated with latest results.

seyfeb added 8 commits January 7, 2024 17:24
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
…ting

Signed-off-by: Sebastian Fey <info@sebastianfey.de>
…f only minutes are set)

Signed-off-by: Sebastian Fey <info@sebastianfey.de>
…t show 1h0m0s)

Signed-off-by: Sebastian Fey <info@sebastianfey.de>
…itially set.

Signed-off-by: Sebastian Fey <info@sebastianfey.de>
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
@christianlupus christianlupus force-pushed the fix/1408-more-consistent-ui-timer branch from 2d921ff to 948e229 Compare January 7, 2024 16:31
seyfeb and others added 2 commits January 7, 2024 17:44
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
Signed-off-by: Christian Wolf <github@christianwolf.email>
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
Signed-off-by: Christian Wolf <github@christianwolf.email>
@christianlupus christianlupus force-pushed the fix/1408-more-consistent-ui-timer branch from 948e229 to 7b55fb0 Compare January 7, 2024 16:44
Copy link
Collaborator

@christianlupus christianlupus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I have not verified every single line but it seems o work out well.

@christianlupus christianlupus merged commit 116d92f into master Jan 7, 2024
27 checks passed
@christianlupus christianlupus deleted the fix/1408-more-consistent-ui-timer branch January 7, 2024 16:49
@christianlupus christianlupus added the manual-backport-required The backpoort needs to be carried out manually. label Jan 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request Frontend Issue or PR related to the frontend code javascript Pull requests that update Javascript code manual-backport-required The backpoort needs to be carried out manually.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow specifying seconds in timers Make timer UI more consistent
2 participants