[Brent] [Waste] Initial small items setup. #4595
Merged
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
Codecov Report
@@ Coverage Diff @@
## master #4595 +/- ##
===========================================
- Coverage 84.93% 69.25% -15.68%
===========================================
Files 336 42 -294
Lines 23778 4951 -18827
Branches 4491 0 -4491
===========================================
- Hits 20196 3429 -16767
+ Misses 2235 1522 -713
+ Partials 1347 0 -1347 |
chrismytton
approved these changes
Sep 7, 2023
| @@ -82,7 +82,8 @@ Display a report. | |||
| sub display :PathPart('') :Chained('id') :Args(0) { | |||
| my ( $self, $c ) = @_; | |||
|
|
|||
| if ($c->stash->{problem}->cobrand_data eq 'waste' && $c->stash->{problem}->category eq 'Bulky collection' ) { | |||
| my $problem = $c->stash->{problem}; | |||
| if ($problem->cobrand_data eq 'waste' && ($problem->category eq 'Bulky collection' || $problem->category eq 'Small items collection')) { | |||
There was a problem hiding this comment.
Part of me thinks we should have a $problem->is_bulky method or similar, but not sure if that's a bit premature, seeing as this check is only done in two places currently.
dracos
force-pushed
the
brent-initial-setup
branch
4 times, most recently
from
ee4e2ac to
92106b3
Compare
dracos
force-pushed
the
brent-initial-setup
branch
3 times, most recently
from
e4e1738 to
f1ce1ae
Compare
dracos
force-pushed
the
master
branch
2 times, most recently
from
8522ff9 to
11e15b2
Compare
dracos
force-pushed
the
brent-initial-setup
branch
from
f1ce1ae to
bd4f69c
Compare
dracos
force-pushed
the
brent-initial-setup
branch
5 times, most recently
from
683a6da to
fade136
Compare
dracos
force-pushed
the
brent-initial-setup
branch
11 times, most recently
from
ab825c8 to
405ba4c
Compare
On page load after clicking back, the form values can be filled in with their previous values by the browser, but this happens later, so switch to the pageshow event to update the autocomplete/messages and check the hidden select - as the autocomplete will have picked up an empty select at the time it was created.
This is so if the page being loaded isn't a bin days one, the heading gets replaced as well.
dracos
force-pushed
the
brent-initial-setup
branch
4 times, most recently
from
490166c to
ad474f9
Compare
Uses the bulky waste controllers and configuration, but renamed to small items with a similar form. Includes various text tweaks requested and no per-item photos. Item list sorted by ID, not name, so we can specify the ordering the admin. Direct picture upload needed as reports are private.
Adds count of how many small electrical items have been selected and how many different 'types' of item have been selected. Add error if more than 4 small electrical or more than 3 types. Added text to clarify the limits allowed.
Changes templates to adapt for Brent and to add small items in relevant places instead of bulky waste.
dracos
force-pushed
the
brent-initial-setup
branch
from
ad474f9 to
95ce157
Compare
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.
Provides an initial small items form, pretty much identical to bulky apart from wording and other small differences (e.g. sort order, photos). Uses the same controller/role/flags as Brent is having small items instead of bulky, and given timescales seemed quite a bit more straightforward than trying to allow both.
Takes a little bit of @MorayMySoc code for saving the items in the report metadata (though only if set), and little bit of @nephila-nacrea code for calling the clear cached slot.
[skip changelog]