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

[50954] Record progress in multiple units #15450

Open
wants to merge 33 commits into
base: dev
Choose a base branch
from
Open

[50954] Record progress in multiple units #15450

wants to merge 33 commits into from
+1,342 −303

Conversation

cbliard
Copy link
Member

@cbliard cbliard commented May 2, 2024

@cbliard cbliard marked this pull request as draft May 2, 2024 13:37
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 2, 2024 13:38 Inactive
@aaron-contreras
Add gitlab_chronic_duration
5994857 
See: https://gitlab.com/gitlab-org/ruby/gems/gitlab-chronic-duration

Really nice gem to handle parsing and outputting durations in multiple
units.
@aaron-contreras aaron-contreras force-pushed the feature/50954-record-progress-in-multiple-units branch from 0dd81ea to 431f846 Compare May 7, 2024 14:23
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 7, 2024 14:24 Inactive
@aaron-contreras aaron-contreras force-pushed the feature/50954-record-progress-in-multiple-units branch from 431f846 to a5065a4 Compare May 7, 2024 16:04
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 7, 2024 16:04 Inactive
@aaron-contreras aaron-contreras force-pushed the feature/50954-record-progress-in-multiple-units branch from a5065a4 to f844feb Compare May 7, 2024 16:48
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 7, 2024 16:49 Inactive
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 8, 2024 20:31 Inactive
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 9, 2024 15:13 Inactive
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 9, 2024 15:24 Inactive
@aaron-contreras
Copy link
Contributor

eslint is complaining about the chronic_duration.js file. This is taken from Gitlab's implementation and is meant to be kept inline with their chronic_duration gem. There's no npm package for chronic_duration.js as it's directly part of the gitlab source code. Would vendoring the file prevent eslint from trying to check it or is there a config to exclude this file from eslint. Probably has been done before in the core repo but unsure of how to handle it @oliverguenther

@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 13, 2024 23:14 Inactive
@aaron-contreras aaron-contreras force-pushed the feature/50954-record-progress-in-multiple-units branch from 2965574 to 58498c9 Compare May 14, 2024 00:07
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 14, 2024 00:08 Inactive
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 14, 2024 12:37 Inactive
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 14, 2024 14:16 Inactive
@aaron-contreras aaron-contreras force-pushed the feature/50954-record-progress-in-multiple-units branch from 0d5a14d to dfb5d30 Compare May 14, 2024 14:32
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 24, 2024 16:33 Inactive
@aaron-contreras aaron-contreras force-pushed the feature/50954-record-progress-in-multiple-units branch from ddafeee to 98b00ab Compare May 24, 2024 16:44
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 24, 2024 16:45 Inactive
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 24, 2024 16:56 Inactive
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 27, 2024 09:46 Inactive
@cbliard
Move toast warning to even more appropriate location
1111687 
Also:
- reword the warning message slightly to remove the "click apply to
  apply" part.
- remove some html_safe calls that are not needed anymore (especially
  since 2f82d73).
@cbliard cbliard force-pushed the feature/50954-record-progress-in-multiple-units branch from 4ed12ac to 1111687 Compare May 27, 2024 09:49
cbliard
cbliard commented May 27, 2024
View reviewed changes
Copy link
Member Author

@cbliard cbliard left a comment

Choose a reason for hiding this comment

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

An additional request from Parimal while discussing this screen during today's frontend meeting

app/views/admin/settings/working_days_and_hours_settings/show.html.erb
Comment on lines -56 to +88

I18n.t('date.day_names').rotate.zip(WeekDay::DAY_RANGE),
direction: :horizontal %>
I18n.t('date.day_names').rotate.zip(WeekDay::DAY_RANGE),
direction: :horizontal %>
Copy link
Member Author

Choose a reason for hiding this comment

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

When clicking "Apply changes", there is this "Change working days" information dialog that always opens itself to warn about changing working days.

image

Parimal would like it to be displayed only if the working days have been actually changed.

Would it be possible?

@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 27, 2024 10:00 Inactive
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 31, 2024 15:32 Inactive
@github-actions github-actions bot temporarily deployed to gh-6899875-pr-15450 May 31, 2024 15:49 Inactive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aaron-contreras aaron-contreras aaron-contreras left review comments

Assignees

@aaron-contreras aaron-contreras

Labels
pullpreview
Milestone
14.2.x
3 participants
@cbliard @aaron-contreras @dombesz