Skip to content

OLMIS-8191: Make remarks editable on approval #72

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
michaldev0 merged 2 commits into from
Jun 2, 2026
Merged

OLMIS-8191: Make remarks editable on approval #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1dfbd1
OLMIS-8191: Make remarks editable on approval
michaldev0 May 26, 2026
b548ede
Merge branch 'master' into OLMIS-8191-remarks-editable
michaldev0 Jun 2, 2026
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Upcoming Version (WIP)
==================
Bug fixes:
* [OLMIS-8191](https://openlmis.atlassian.net/browse/OLMIS-8191): Remarks column editable and size adjustable dynamically.
* [OLMIS-8154](https://openlmis.atlassian.net/browse/OLMIS-8154): Explanation no longer required when requested equals calculated.

7.0.16 / 2026-02-05
Expand Down
4 changes: 3 additions & 1 deletion src/requisition-product-grid/product-grid-cell.directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,11 @@

function isApprovalColumn(requisition, column) {
var approvalColumns = requisition.template.patientsTabEnabled ?
[TEMPLATE_COLUMNS.TOTAL_RECEIVED_QUANTITY, TEMPLATE_COLUMNS.REMARKS] :
[TEMPLATE_COLUMNS.TOTAL_RECEIVED_QUANTITY] :
[TEMPLATE_COLUMNS.APPROVED_QUANTITY];

approvalColumns.push(TEMPLATE_COLUMNS.REMARKS);

return approvalColumns.indexOf(column.name) !== -1;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/requisition-product-grid/product-grid-cell.directive.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ describe('ProductGridCell', function() {

cell = angular.element(this.getCompiledElement().children()[0]);

expect(cell.text()).toEqual('readOnlyFieldValue');
expect(cell.text()).not.toEqual('readOnlyFieldValue');
});

it('should produce editable cell if user can edit and column is editable', function() {
Expand Down
Loading