small visual review fixes

intershop · Dec 16, 2020 · beb81c7 · beb81c7 · github-actions · Dec 16, 2020
1 parent 9ddf65b
commit beb81c7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/projects/organization-management/src/app/components/user-budget/user-budget.component.html b/projects/organization-management/src/app/components/user-budget/user-budget.component.html
@@ -14,6 +14,10 @@
       <dt class="col-7">{{ 'account.budget.type.' + budget.budgetPeriod + '.label' | translate }}</dt>
       <dd class="col-5 column-price font-weight-bold text-right">{{ budget.budget | ishPrice }}</dd>
     </dl>
+    <dl class="row dl-horizontal dl-separator">
+      <dt class="col-7">{{ 'account.budget.already_spent.label' | translate }}</dt>
+      <dd class="col-5 column-price font-weight-bold text-right">{{ usedBudget | ishPrice }}</dd>
+    </dl>
     <div [ngbPopover]="BudgetPopover" placement="top" data-testing-id="user-budget-popover">
       <div class="progress" [ngClass]="progressBarClass">
         <div

diff --git a/...ects/organization-management/src/app/components/user-budget/user-budget.component.spec.ts b/...ects/organization-management/src/app/components/user-budget/user-budget.component.spec.ts
@@ -71,6 +71,10 @@ describe('User Budget Component', () => {
           <dt class="col-7">account.budget.type.monthly.label</dt>
           <dd class="col-5 column-price font-weight-bold text-right">USD 5000</dd>
         </dl>
+        <dl class="row dl-horizontal dl-separator">
+          <dt class="col-7">account.budget.already_spent.label</dt>
+          <dd class="col-5 column-price font-weight-bold text-right">USD 2500</dd>
+        </dl>
         <div data-testing-id="user-budget-popover" placement="top" ng-reflect-placement="top">
           <div class="progress">
             <div class="progress-bar" role="progressbar" style="width: 50%">

diff --git a/...t/src/app/components/requisition-buyer-approval/requisition-buyer-approval.component.html b/...t/src/app/components/requisition-buyer-approval/requisition-buyer-approval.component.html
@@ -42,7 +42,9 @@
         </dl>
         <dl *ngIf="requisition.userBudget?.spentBudget" class="row dl-horizontal dl-separator">
           <dt class="col-6">{{ 'account.budget.already_spent.label' | translate }}</dt>
-          <dd class="col-6">{{ requisition.userBudget.spentBudget | ishPrice }} ({{ spentPercentage | percent }})</dd>
+          <dd class="col-6" [ngClass]="{ 'text-danger': spentPercentage > 1 }">
+            {{ requisition.userBudget.spentBudget | ishPrice }} ({{ spentPercentage | percent }})
+          </dd>
         </dl>
         <dl
           *ngIf="requisition.approval.statusCode !== 'APPROVED'; else leftBudgetDisplay"