Show "Worked, Pending" status #45
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 @@
## main #45 +/- ##
=======================================
Coverage 89.80% 89.80%
=======================================
Files 22 22
Lines 569 569
=======================================
Hits 511 511
Misses 31 31
Partials 27 27 Continue to review full report at Codecov.
|
gregtyler
force-pushed
the
VEGA-866-worked-pending
branch
from
dc8208b
to
dcd29b0
Compare
hawx
reviewed
Jun 15, 2021
| {{ define "status-tag" }} | ||
| <strong class="govuk-tag govuk-tag--{{ statusColour .Status }}"> | ||
| {{ if and (eq .Status "Pending") (.Worked) }} | ||
| Worked, {{ .Status }} |
There was a problem hiding this comment.
it will only ever be "Worked, Pending" so better to be explicit?
There was a problem hiding this comment.
or you could have done this as
{{ if and (eq .Status "Pending") (.Worked) }}Worked, {{ end }{{ .Status }}
There was a problem hiding this comment.
Took the simpler first option
hawx
approved these changes
Jun 15, 2021
gregtyler
added a commit
that referenced
this pull request
Jun 15, 2021
* Add status-tag template * Use status-tag template * Set "Worked, Pending" text explicitly
gregtyler
added a commit
that referenced
this pull request
Jun 15, 2021
* Add `User()` endpoint to sirius package To get user details by ID * Add userPendingCases handler To show a user's pending cases, based on their ID * Link to user's pending cases from team dashboard * Add userPendingCases cypress tests And rename existing file * Add jQuery and expose on `window` `MOJFrontend` requires this to initialise the Multi select component There's [an issue in moj-frontend](ministryofjustice/moj-frontend#134) to remove the jQuery dependency, but it's dependent on unit tests * Restrict userPendingCases to Managers Other users shouldn't be able to see each others' dashboards * Add all caseworker info pages Adds all cases and tasks pages, with inter-linking and tests * Remove unused CSS classes * Expect API user details to include a team * Add back links to team * Re-enable codecov-action They claim to have fixed the issue now * Add `User()` endpoint to sirius package To get user details by ID * Add userPendingCases handler To show a user's pending cases, based on their ID * Link to user's pending cases from team dashboard * Add userPendingCases cypress tests And rename existing file * Add jQuery and expose on `window` `MOJFrontend` requires this to initialise the Multi select component There's [an issue in moj-frontend](ministryofjustice/moj-frontend#134) to remove the jQuery dependency, but it's dependent on unit tests * Restrict userPendingCases to Managers Other users shouldn't be able to see each others' dashboards * Bump cypress from 7.4.0 to 7.5.0 (#35) Bumps [cypress](https://github.com/cypress-io/cypress) from 7.4.0 to 7.5.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/.releaserc.base.js) - [Commits](cypress-io/cypress@v7.4.0...v7.5.0) --- updated-dependencies: - dependency-name: cypress dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VEGA-867 Sort pending cases by workedDate (#44) * Use CanRequestCase on all caseworker pages (#43) Wherever the "Request next cases" button appears, only show it to users with the "Self Allocation User" role * Show "Worked, Pending" status (#45) * Add status-tag template * Use status-tag template * Set "Worked, Pending" text explicitly * Use status-tag template So that we see "Worked, Pending" everywhere Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joshua Hawxwell <m@hawx.me>
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.
When a case is pending—but worked—then the status should be shown as "Worked, Pending" instead of Pending.
This is done through a new template called
status-tagwhich, when passed a case, will show the status with the appropriate colour.Fixes VEGA-866