diff --git a/src/requisition-batch-approval/_requisition-batch-approval.scss b/src/requisition-batch-approval/_requisition-batch-approval.scss index 26713ada..b2b8bd61 100644 --- a/src/requisition-batch-approval/_requisition-batch-approval.scss +++ b/src/requisition-batch-approval/_requisition-batch-approval.scss @@ -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; } diff --git a/src/requisition-batch-approval/requisition-batch-approval.html b/src/requisition-batch-approval/requisition-batch-approval.html index 776e851f..1e73d0f0 100644 --- a/src/requisition-batch-approval/requisition-batch-approval.html +++ b/src/requisition-batch-approval/requisition-batch-approval.html @@ -8,7 +8,7 @@

{{'requisitionBatchApproval.approveRequisitions' | message}}

-
+
@@ -22,7 +22,7 @@

{{'requisitionBatchApproval.approveRequisitions' | message}}

'is-hidden': !(requisition)}"> {{requisition.facilityName}} - {{requisition.periodName}} - + @@ -35,8 +35,8 @@

{{'requisitionBatchApproval.approveRequisitions' | message}}

ng-class="{'requisition-error': requisition.$error}"> {{'requisitionBatchApproval.cost' | message}} - - + + @@ -57,8 +57,8 @@

{{'requisitionBatchApproval.approveRequisitions' | message}}

- - + + @@ -70,8 +70,8 @@

{{'requisitionBatchApproval.approveRequisitions' | message}}

- - + +
{{'requisitionBatchApproval.totalForAllFacilities' | message}}{{'requisitionBatchApproval.totalForAllFacilities' | message}}
{{'requisitionBatchApproval.code' | message}}{{'requisitionBatchApproval.quantity' | message}}{{'requisitionBatchApproval.cost' | message}}{{'requisitionBatchApproval.quantity' | message}}{{'requisitionBatchApproval.cost' | message}}
{{vm.lineItems[requisition.id][product.productId].totalCost | openlmisCurrency}} {{product.totalQuantity}} {{product.totalCost | openlmisCurrency}} {{product.totalQuantity}} {{product.totalCost | openlmisCurrency}}
{{requisition.$totalCost | openlmisCurrency}} {{vm.totalCost | openlmisCurrency}} {{vm.totalCost | openlmisCurrency}}