Skip to content

Allow horizontal scrolling in requisition batch approval view #69

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

Open
kszymankiewicz-sd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow horizontal scrolling in requisition batch approval view #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions src/requisition-batch-approval/_requisition-batch-approval.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,15 @@

#batch-approval-form {
display: flex;
flex-direction: column;
flex-grow: 1;

margin:0px 20px;

> * {
flex: 0 0 auto;
}

> .openlmis-table-pane {
flex-grow: 1;
}
}

.openlmis-toolbar {
position: static;
margin: 0px;
padding: $space-size/2 $space-size;
}
Expand Down
16 changes: 8 additions & 8 deletions src/requisition-batch-approval/requisition-batch-approval.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h2>{{'requisitionBatchApproval.approveRequisitions' | message}}</h2>
</p>
<form id="batch-approval-form" ng-submit="vm.approve()">
<saving-indicator class="requisition-indicator" object="vm.requisitions"/>
<div class="openlmis-table-pane">
<div class="openlmis-table-container">
<table>
<thead>
<tr>
Expand All @@ -22,7 +22,7 @@ <h2>{{'requisitionBatchApproval.approveRequisitions' | message}}</h2>
'is-hidden': !(requisition)}">
{{requisition.facilityName}} - {{requisition.periodName}}
</th>
<th class="col-sticky col-sticky-right" colspan="2">{{'requisitionBatchApproval.totalForAllFacilities' | message}}</th>
<th colspan="2">{{'requisitionBatchApproval.totalForAllFacilities' | message}}</th>
</tr>
<tr>
<th class="col-sticky" >{{'requisitionBatchApproval.code' | message}}</th>
Expand All @@ -35,8 +35,8 @@ <h2>{{'requisitionBatchApproval.approveRequisitions' | message}}</h2>
ng-class="{'requisition-error': requisition.$error}">
{{'requisitionBatchApproval.cost' | message}}
</th>
<th class="col-sticky col-sticky-right" >{{'requisitionBatchApproval.quantity' | message}}</th>
<th class="col-sticky col-sticky-right" >{{'requisitionBatchApproval.cost' | message}}</th>
<th>{{'requisitionBatchApproval.quantity' | message}}</th>
<th>{{'requisitionBatchApproval.cost' | message}}</th>
</tr>
</thead>
<tbody>
Expand All @@ -57,8 +57,8 @@ <h2>{{'requisitionBatchApproval.approveRequisitions' | message}}</h2>
<td class="numeric" ng-repeat-end>
{{vm.lineItems[requisition.id][product.productId].totalCost | openlmisCurrency}}
</td>
<td class="total-cell numeric col-sticky col-sticky-right"> {{product.totalQuantity}} </td>
<td class="total-cell numeric col-sticky col-sticky-right"> {{product.totalCost | openlmisCurrency}} </td>
<td class="total-cell numeric"> {{product.totalQuantity}} </td>
<td class="total-cell numeric"> {{product.totalCost | openlmisCurrency}} </td>
</tr>
</tbody>
<tfoot>
Expand All @@ -70,8 +70,8 @@ <h2>{{'requisitionBatchApproval.approveRequisitions' | message}}</h2>
<th class="numeric" ng-repeat-end>
{{requisition.$totalCost | openlmisCurrency}}
</th>
<th class="col-sticky col-sticky-right"></th>
<th class="col-sticky col-sticky-right numeric"> {{vm.totalCost | openlmisCurrency}}</th>
<th></th>
<th class="numeric"> {{vm.totalCost | openlmisCurrency}}</th>
</tr>
</tfoot>
</table>
Expand Down
Loading