Fix missing view licence returns status tags #1110
Merged
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.
https://eaflood.atlassian.net/browse/WATER-4444
We are replacing the legacy view licence page with a new one. That means we needed to recreate the returns tab, though with some improvements to the display.
However, further testing has shown we've missed some of the possible statuses, specifically
void
andreceived
. Plus, we were automatically convertingdue
tooverdue
when this should only be if the due date has passed.This change fixes the logic for the return statuses. While we are at it, we added a new macro for handling the display of the tag to keep things consistent with how we show tags in other areas of the app.
Before
After