split up orders into three tabs: all, open, closed (63114) #234
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Leave the property of filtering out orders which have 0 hours fo 'all' tab present
svenwey
changed the title
svenwey
requested review from
kronn
and removed request for
kronn and
daniel-illi
|
Some new requirements were introduced, hence this is again wip. |
…wser back button for navigating between tabs (63952)
kronn
requested changes
Mar 6, 2025
Comment on lines
+164
to
+171
| return orders if params[:status_preselection].blank? | ||
| if params[:status_preselection] == 'closed' | ||
| return orders.where(order_statuses: { closed: true }) | ||
| .where(period.where_condition('closed_at')) | ||
| end | ||
| return unless params[:status_preselection] == 'in_progress' | ||
| orders.where(order_statuses: { closed: false }) | ||
|
|
There was a problem hiding this comment.
This needs at least reformatting, let's see... If I reformat, I notice that we are checking the same param over and over, so I switched to a case (pun intended)
Suggested change
| return orders if params[:status_preselection].blank? | |
| if params[:status_preselection] == 'closed' | |
| return orders.where(order_statuses: { closed: true }) | |
| .where(period.where_condition('closed_at')) | |
| end | |
| return unless params[:status_preselection] == 'in_progress' | |
| orders.where(order_statuses: { closed: false }) | |
| case params[:status_preselection] | |
| when nil, "" | |
| orders | |
| when 'closed' | |
| orders.where(order_statuses: { closed: true }) | |
| .where(period.where_condition('closed_at')) | |
| when 'in_progress' | |
| orders.where(order_statuses: { closed: false }) | |
| end |
This also nicely obsoletes the mixture of if and unless which made this an excellent cylon detector.
The first case could be a guard statement as well. My proposal is to keep this all at the same level.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
At the moment, in the 'Laufende' Tab, as it was before, all orders with 0 hours booked onto them are filtered out. I left this as it is (now for the tab 'Alle'), but I don't understand 100% why this was implemented this way. I could also remove it, if this is desired.