diff --git a/CHANGELOG.md b/CHANGELOG.md index b5d0dae3..84f66e5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/src/requisition-product-grid/product-grid-cell.directive.js b/src/requisition-product-grid/product-grid-cell.directive.js index 2bba35f9..d555d64c 100644 --- a/src/requisition-product-grid/product-grid-cell.directive.js +++ b/src/requisition-product-grid/product-grid-cell.directive.js @@ -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; } } diff --git a/src/requisition-product-grid/product-grid-cell.directive.spec.js b/src/requisition-product-grid/product-grid-cell.directive.spec.js index 12eb36ef..00d72a2b 100644 --- a/src/requisition-product-grid/product-grid-cell.directive.spec.js +++ b/src/requisition-product-grid/product-grid-cell.directive.spec.js @@ -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() {