Move 0.8.23 into 0.9.0 feature branch #4357
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
…rmissions (#4279) * OBPIH-5799 Add request approver role * OBPIH-5799 Add changelog for request approver * OBPIH-5800 Rename ROLE_APPROVER to ROLE_PURCHASE_APPROVER * OBPIH-5800 Add changelog for renaming approver to purchase approver * OBPIH-5799 Fix after review * OBPIH-5799 Fix method name in tests * OBPIH-5799 Rename request approver to requisiton approver
…4280) * OBPIH-5801 Add fields for request approval workflow for Requisition table/domain * OBPIH-5801 Include new fields in data binding of requisition and add those fields also to StockMovement Dto * OBPIH-5801 Add new requisition statuses for the request approval workflow * OBPIH-5801 Add events, requiresApproval fields to Requisition domain * OBPIH-5801 Add event codes for request approval workflow * OBPIH-5801 Revert changes in data binding of requisition, added for testing purposes * OBPIH-5801 Add a few unit tests to test fields added for Requisition domain for request approval workflow * OBPIH-5801 Revert unnecessary changes provided in the StockMovement dto * OBPIH-5801 Add designatedApprovers field to Requisition domain * OBPIH-5801 Change order of request approval statuses in RequisitionStatus enum * OBPIH-5801 Fixes after review to Requisition domain * OBPIH-5801 Add approvers list to StockMovement dto * OBPIH-5801 Rename event codes related to request approval and add translations for them * OBPIH-5801 Fix unit test related to renaming the boolean to approvalRequired * OBPIH-5801 Remove unused Event import in stock movement service
* OBPIH-5820 Add email view * OBPIH-5820 Add messages translations * OBPIH-5820 Fix redirect to request list * OBPIH-5820 Fix after review
…kflow (#4286) * OBPIH-5802 Add UserApiController Add ability to search users by RoleType * OBPIH-5802 Add supportedActivities property on origin and destination of stockMovement response * OBPIH-5802 Approver field on Create Request form - add const for roleTypes - conditionaly render approver multiselect if fulfiling location supports APPROVE_REQUEST - if only one approver is available then preselct this value by default * OBPIH-5802 Set initial values for approvers on existing request * OBPIH-5802 Remove UserAPIController and use userOptions endpoint instead - fix userOptions endpoint to match other option endpoint names - move roleType parameter to other findUsers service method = transform userOptions on backend to label, value, id * OBPIH-5802 Add subtext to approver select component * OBPIH-5802 Rollback usersOption list endpoint changes * OBPIH-5802 Add approvers list on stockMovement
* OBPIH-5802 Fix select tooltip showing up on empty multiselect * OBPIH-5802 Fetch user list of approvers based on desnation location
…rkflow (#4288) * OBPIH-5803 Add approvalRequired transient to Location domain * OBPIH-5803 Change fetchMode of Requisition events to avoid LazyInitializationException in a published event * OBPIH-5803 Add request approval statuses to enums and add translations for them * OBPIH-5803 Include status transition in RequisitionStatusTransitionEvent * OBPIH-5803 Add publishing a status transition event while submitting a request * OBPIH-5803 Add transition status method in RequisitionService * OBPIH-5803 Change displayed status on SM view page to look for stockMovement status, not shipment status * OBPIH-5803 Add createdBy field for Event domain * OBPIH-5803 Add rejectedBy field to Requisition * OBPIH-5803 Display correct submit button depending on request approval activity and remove confirm submit modal * OBPIH-5803 Remove unnecessary oldStatus property from RequisitionStatusTransitionEvent * OBPIH-5803 Include new requisition statuses in the sortOrder formula * OBPIH-5803 Add default EventTypes for request approval workflow * OBPIH-5803 Fix assigning createdBy to an Event * OBPIH-5803 Fixes after review
* OBPIH-5818 Add row for approvers * OBPIH-5818 Fix displaying approvers in a row * OBPIH-5818 Change warehouse.message to g.message * OBPIH-5818 Add conditional showing approvers row * OBPIH-5818 Add tooltip * OBPIH-5818 Remove isEmpty from checking if there are approvers added
* OBPIH-5819 Add row for Date Approved or Date rejected in SM view page * OBPIH-5819 Add rejected status code
#4295) * OBPIH-5803 Display stockMovement status in the sm summary instead of shipment status * OBPIH-5803 Adjust status of returns to be stockMovement.status not to differ from the status in the summary
…d individual links for approvers to request list (#4289) * OBPIH-5803 Change fetchMode of Requisition events to avoid LazyInitializationException in a published event * OBPIH-5821 Move send notification logic to notificationService and add individual links for approvers to request list * OBPIH-5821 remove eager fetch on requisition events * OBPIH-5821 If there are not assigned approvers then notify all of them * OBPIH-5821 Separate and move methods to notificationService * OBPIH-5821 After review fixes - remove newState field from RequisitionStatusTransitionEvent - use requisition.state instead of previously used event.newState - reorder trigger status change and publish notification - rename variables from approvers to recipients --------- Co-authored-by: kchelstowski <[email protected]>
* OBPIH-5819 Add nullsafe operators to stockMovement.requisition on stock movement view page * OBPIH-5819 Remove ellipsis in approvers row
…4293) * OBPIH-5803 Change fetchMode of Requisition events to avoid LazyInitializationException in a published event * OBPIH-5803 Include status transition in RequisitionStatusTransitionEvent * OBPIH-5803 Add createdBy field for Event domain * OBPIH-5803 Fix assigning createdBy to an Event * OBPIH-5803 Fixes after review * OBPIH-5806 Render approve and reject buttons on request show page * OBPIH-5806 Implement approve and reject status changes logic * OBPIH-5806 Fix messages after updaing request status * OBPIH-5806 Render approve and reject buttons only on request with origin which supports approvals and for users that have roletype request approver * OBPIH-5806 Fix after rebase * OBPIH-5806 Render only reject, approve and rollback buttons to approver * OBPIH-5806 Rafactor requets state transition function remove catching excetion on updateStatus and let generic error handler catch it * OBPIH-5806 use requisition.status instead of status * OBPIH-5806 Fixes after review - refactor method names - refactor triggerRequisitionStatusTransition to use switch case instead of if * OBPIH-5806 Rename AuthTagLib method and add comment on status transition --------- Co-authored-by: kchelstowski <[email protected]>
…ages (#4290) * OBPIH-5854 Add waiting for approval and approved statuses * OBPIH-5854 Add translations for new statuses * OBPIH-5854 Add fetching all available statuses and change sending dropdown options * OBPIH-5854 Make status colum wider and add fetching statuses when changing location * OBPIH-5854 Fixes after review * OBPIH-5854 Change comment in RequisitionStatus * OBPIH-5854 Fixes after review * OBPIH-5854 Remove fetching all statuses and add handling them on frontend * OBPIH-5854 Remove variant from mapping status codes * OBPIH-5854 Fix rejected status * OBPIH-5854 Fixes after review * OBPIH-5854 Rename static method in RequisitionStatus * OBPIH-5854 Change mapping status label in OutboundStockMovementListItem * OBPIH-5854 Change isElectronicType to sourceType * OBPIH-5854 Change naming of list methods in RequisitionStatus
* OBPIH-5822 Added notificatin to requestor on request status change
* OBPIH-5822 Add recent comment to the status update mail notification
* OBPIH-5822 use find{true} instead of find() to get first element of a list
* OBPIH-5822 Change requisition id to identifier of success message on approve/reject request
…ist without supporting requests approval (#4304)
…s lists pages (#4305) * OBPIH-5814 Return and display aprovers in a list of requests * OBPIH-5814 Add approver multiselect filter on request list page * OBPIH-5814 Filter by approvers * OBPIH-5814 Use existing label for Approvers * OBPIH-5814 Requested changes after review - refetch approvers list on location change - change variable names - filter out null users when resolving approver ids on backend * OBPIH-5814 Generate a distinct paginated list of stockMovements * OBPIH-5814 Remove a duplicated approvers fetch
…ages (fix after QA) (#4311) * OBPIH-5854 Remove statuses that are not on the filtering options * OBPIH-5854 Add comments for filtering stock movements
…low (#4302) * OBPIH-5805 Add util for checking if request can be edited * OBPIH-5805 Add new requisition statuses to enum in frontend part * OBPIH-5805 use canEditFunction in verifying requests, displaying edit button and in dropdown on stock movements list * OBPIH-5805 Fix after review * OBPIH-5805 Move some logic to function for editting without request approval * OBPIH-5805 Change naming from isRequestApprovalSupported to isApprovalRequired and change function name for editing request without required approval * OBPIH-5805 Remove one function and change ifs order
…ne have been selected (#4314)
* OBPIH-5811 Add getting request status label * OBPIH-5811 Change max width of status column * OBPIH-5811 Move function for getting label to service * OBPIH-5811 Refactor getting status label * OBPIH-5811 Change approach in displaying statuses in requestor dasboard * OBPIH-5811 Move mapping statuses to service and rename the function * OBPIH-5811 Move function for displaying status to StockMovement domain
* OBPIH-5864 change maxFractionDigits to 2 in value consumed in consumption report * OBPIH-5864 Change max fraction digits in csv file
* OBPIH-5873 Make status transition synchronous and pass status as an argument * OBPIH-5873 Fix passing status
… REQUESTED on reagular outbound (#4317) * OBPIH-5806 Update with PENDING_APPROVAL status on approval submit and REQUESTED on reagular outbound * OBPIH-5806 check if origin requires approval on PENDING_APPROVAL status * OBPIH-5806 Send propper status update based on fulfiling location supported activity on submit request * OBPIH-5806 Use constant status values for RequisitionStatus
…ages (#4319) * OBPIH-5816 Return isUserRequestApprover from config endpoint * OBPIH-5816 Add approval actions in the request list * OBPIH-5816 Call status update for approved and rejected actions * OBPIH-5816 Fix tests * OBPIH-5816 use notification util function to render notifications * OBPIH-5816 Fix API context test
…er QA) (#4335) * OBPIH-5809 Fix throwing error with missing required argument * OBPIH-5809 Show buttons when stock movement status is higher than approved / rejected * OBPIH-5809 Fixes after review * OBPIH-5809 Fixes after review * OBPIH-5809 Add comments
…als end to end workflow (#4328) * OBPIH-5868 Add optional comment association to Event * OBPIH-5868 Add mandatory comment to event and requisition on request rejection * OBPIH-5868 Refactored addComment template to configure this page as a mandatory comment on request reject by passing a prarameter approvalStatus=REJECTED addComment template renders appropriate fields and labels for reject comment * OBPIH-5868 On request reject reidrect user to request view page instea dof a list page * OBPIH-5868 Added translations for mandatory comment on reject * OBPIH-5868 Fixes after review - change constraint name to fk_event_comment - use comment and status from recent event when sending mail about request status change - move comment logic to transitionRequisitionStatus as an optional parameter - rename variables * OBPIH-5868 Make text area field on comment required
…Approvals end to end workflow (#4332) * OBPIH-5870 Add translations for new modal * OBPIH-5870 Add components for new modal * OBPIH-5870 Add styling for new modal * OBPIH-5870 Use new modal and allow triggering rejection from it * OBPIH-5870 Add saving rejection reason * OBPIH-5870 Fixes after review * OBPIH-5870 Fixes after review * OBPIH-5870 Add PICKING status to let users fulfill request
* WIP: Initial implementation of webhook event publisher * WIP: Added shipment details to webhook payload; added auth headers to webhook request; enable webhooks globally or by location * WIP: Initial implementation of webhook event publisher * WIP: Added shipment details to webhook payload; added auth headers to webhook request; enable webhooks globally or by location * OBPIH-5891 Cannot invoke method format on null object * OBS-1515 Fixed API client service bug; removed unnecessary dependency injections
…ions statuses were added on Request approval feature (#4347)
* OBPIH-5838 Disabling notifications WIP * OBPIH-5838 Option to disable approval notifications * OBPIH-5838 Add activity code translations * OBPIH-5838 Option to disable approval notifications * Improvements after review
* OBPIH-5910 Add grouped items by product and UoM to PO template * OBS-1587 Add variable for today's date on PO template * Minor improvements after review
… update link filters (#4349) include PEWNDING_APPROVAL and APPROVED to PendingList of RequsitionStatus
* New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Dutch) * New translations messages.properties (Spanish) * Update source file messages.properties * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * Update source file messages.properties * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * Update source file messages.properties * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * Update source file messages.properties * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * Update source file messages.properties * New translations messages.properties (French) * Update source file messages.properties * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * Update source file messages.properties * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * Update source file messages.properties * Update source file messages.properties * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * Update source file messages.properties * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * Update source file messages.properties * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * Update source file messages.properties * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * Update source file messages.properties * Update source file messages.properties * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * Update source file messages.properties * Update source file messages.properties * New translations messages.properties (Spanish) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (German) * New translations messages.properties (Finnish) * New translations messages.properties (Italian) * New translations messages.properties (Dutch) * New translations messages.properties (Portuguese) * New translations messages.properties (Chinese Simplified) * New translations messages.properties (Swahili) * New translations messages.properties (Haitian Creole) * New translations messages.properties (Kinyarwanda) * New translations messages.properties (Acholi) * New translations messages.properties (French) * New translations messages.properties (Arabic) * New translations messages.properties (Chinese Simplified)
- Moved new Config.groovy configurations to the runtime.groovy - Moved some files to proper directory - Moved RequisitionStatusTransitionEventService to proper package - Replaced transactional = true with [at]Transactional - Replaced old ConfigurationHolder and ApplicationHolder with grails.util.Holders
awalkowiak
requested review from
jmiranda,
drodzewicz,
alannadolny and
kchelstowski
alannadolny
approved these changes
Oct 26, 2023
| @@ -13,21 +13,26 @@ package org.pih.warehouse.inventory | |||
| import grails.converters.JSON | |||
| import grails.core.GrailsApplication | |||
| import grails.plugins.csv.CSVWriter | |||
| import org.apache.commons.lang.NotImplementedException | |||
There was a problem hiding this comment.
Looks like it wasn't removed in one of the PRs, probably redundant
drodzewicz
reviewed
Oct 26, 2023
grails-app/conf/Config.groovy
Outdated
There was a problem hiding this comment.
Whats up withe empty Config.groovy file?
There was a problem hiding this comment.
Should be removed, did not notice it
kchelstowski
approved these changes
Oct 26, 2023
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.
I cherry-picked all the commits from the 0.8.23 to the feature 0.9.0 branch.
I also did some required fixes for the new version:
DO NOT SQUASH THIS PR