Skip to content

OBPIH-5813 Items statuses before fulfilment - Approvals statuses (fixes after QA) #4591

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

Merged
awalkowiak merged 3 commits into from
Apr 23, 2024
Merged

OBPIH-5813 Items statuses before fulfilment - Approvals statuses (fixes after QA) #4591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abbc791
OBPIH-5813 Add red color when items are cancelled
alannadolny Apr 23, 2024
c7027f3
OBPIH-5813 Add created status to the list of pending requisition stat…
alannadolny Apr 23, 2024
7602a68
OBPIH-5813 Add test for created status
alannadolny Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion grails-app/domain/org/pih/warehouse/requisition/RequisitionItem.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ class RequisitionItem implements Comparable<RequisitionItem>, Serializable {
}

Boolean isParentRequisitionPending() {
return requisition.status in [RequisitionStatus.PENDING, RequisitionStatus.PENDING_APPROVAL]
return requisition.status in [RequisitionStatus.CREATED, RequisitionStatus.PENDING, RequisitionStatus.PENDING_APPROVAL]
}

Boolean isParentRequisitionRejected() {
Expand All @@ -539,6 +539,10 @@ class RequisitionItem implements Comparable<RequisitionItem>, Serializable {
return calculatePercentageCompleted() >= 100
}

boolean isRejected() {
return requisition.status == RequisitionStatus.REJECTED
}

def isQuantityIssued() {
return isApproved() && !requisition?.isPending()
}
Expand Down
2 changes: 1 addition & 1 deletion grails-app/views/requisition/_showRequisitionItem.gsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</td>
</g:if>
<td class="middle">
<div class="tag ${requisitionItem.isCanceled() || requisitionItem.isCanceledDuringPick() ? 'tag-danger' :
<div class="tag ${requisitionItem.isCanceled() || requisitionItem.isCanceledDuringPick() || requisitionItem.isRejected() ? 'tag-danger' :
requisitionItem.isSubstituted() || requisitionItem.isReduced() ? 'tag-warning' : 'tag-alert'}">
<g:if test="${requisitionItem.isCanceled() || requisitionItem.isCanceledDuringPick()}">
<g:message code="enum.RequisitionItemStatus.CANCELED"/>
Expand Down
1 change: 1 addition & 0 deletions src/test/groovy/unit/org/pih/warehouse/requisition/RequisitionItemSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class RequisitionItemSpec extends Specification implements DomainUnitTest<Requis
requisitionStatus || requisitionItemStatus
RequisitionStatus.PENDING_APPROVAL || RequisitionItemStatus.PENDING
RequisitionStatus.PENDING || RequisitionItemStatus.PENDING
RequisitionStatus.CREATED || RequisitionItemStatus.PENDING
RequisitionStatus.REJECTED || RequisitionItemStatus.CANCELED
}

Expand Down