Merge pull request #685 from ksprabin/EMCRI-944

EMCRI-944
bcgov · Oct 31, 2024 · 3b49905 · 3b49905
2 parents 29d1386 + a2a7a54
commit 3b49905
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/...les/forms/dfa-claim-main-forms/dfa-invoice-dashboard/dfa-invoice-dashboard.component.html b/...les/forms/dfa-claim-main-forms/dfa-invoice-dashboard/dfa-invoice-dashboard.component.html
@@ -131,7 +131,7 @@
 
     <!-- Vendor Name -->
     <ng-container matColumnDef="vendorName">
-      <th mat-header-cell *matHeaderCellDef style="width:25%">
+      <th mat-header-cell *matHeaderCellDef style="width:20%">
         <b>Vendor Name</b>
       </th>
       <td *matCellDef="let element" mat-cell>
@@ -151,7 +151,7 @@
 
       <!-- Total Claim Column -->
       <ng-container matColumnDef="totalBeingClaimed" *ngIf="vieworedit !== 'viewOnly' && vieworedit !== 'view'">
-      <th mat-header-cell *matHeaderCellDef style="width:15%">
+      <th mat-header-cell *matHeaderCellDef style="width:18%">
         <b>Total being Claimed</b>
       </th>
       <td *matCellDef="let element" mat-cell>
@@ -161,7 +161,7 @@
 
       <!-- Invoice Amount -->
       <ng-container matColumnDef="invoiceAmount" *ngIf="vieworedit == 'viewOnly' || vieworedit == 'view'">
-      <th mat-header-cell *matHeaderCellDef style="width:12%">
+      <th mat-header-cell *matHeaderCellDef style="width:18%">
         <b>Invoice Amount</b>
       </th>
       <td *matCellDef="let element" mat-cell>
@@ -171,7 +171,7 @@
 
       <!-- EMCR Approved Amount -->
       <ng-container matColumnDef="emcrApprovedAmount" *ngIf="vieworedit == 'viewOnly' || vieworedit == 'view'">
-      <th mat-header-cell *matHeaderCellDef style="width:16%">
+      <th mat-header-cell *matHeaderCellDef style="width:17%">
         <b>EMCR Approved Amount</b>
       </th>
       <td *matCellDef="let element" mat-cell>
@@ -181,7 +181,7 @@
 
       <!-- EMCR Comments -->
       <ng-container matColumnDef="emcrComments" *ngIf="vieworedit == 'viewOnly' || vieworedit == 'view'">
-      <th mat-header-cell *matHeaderCellDef style="width:12%">
+      <th mat-header-cell *matHeaderCellDef style="width:10%">
         <b>EMCR Comments</b>
       </th>
       <td *matCellDef="let element" mat-cell>

diff --git a/...dules/forms/dfa-claim-main-forms/dfa-invoice-dashboard/dfa-invoice-dashboard.component.ts b/...dules/forms/dfa-claim-main-forms/dfa-invoice-dashboard/dfa-invoice-dashboard.component.ts
@@ -548,7 +548,7 @@ export default class DFAInvoiceDashboardComponent implements OnInit, OnDestroy {
           invoiceId: this.dfaClaimMainDataService.getInvoiceId()
         },
         height: '665px',
-        width: '1000px',
+        width: '1200px',
         disableClose: true
       })
       .afterClosed()

diff --git a/.../embc-dfa/src/app/sharedModules/forms/dfa-claim-main-forms/invoice/invoice.component.html b/.../embc-dfa/src/app/sharedModules/forms/dfa-claim-main-forms/invoice/invoice.component.html
@@ -24,7 +24,7 @@
       </button>-->
       <ng-container>
         <div class="row">
-          <div class="col-md-7">
+          <div class="col-md-6">
             <div class="row" *ngIf="isReadOnly === true">
               <div class="col-md-6">
                 <p  style="font-size: 15px">
@@ -268,7 +268,7 @@
 
           </div>
 
-          <div class="col-md-5" >
+          <div class="col-md-6" >
             <div class="invoice-box">
               <div class="row">
                 <div class="col-md-12 costCurrency">
@@ -295,13 +295,13 @@
               </div>
 
               <div class="row pst-box">
-                <div class="col-md-7 aln-txt">
+                <div class="col-md-4 aln-txt">
                   <p  style="font-size: 15px">
                     PST
                   </p>
 
                 </div>
-                <div class="col-md-5 inputCurrency">
+                <div class="col-md-8 inputCurrency">
                   $&nbsp;<mat-form-field class="monetary-input-small" appearance="outline" style="height: 30px !important">
                     <input
                       #PST
@@ -313,12 +313,12 @@
                       maxlength="100"/>
                   </mat-form-field>
                 </div>
-                <div class="col-md-7 aln-txt">
+                <div class="col-md-4 aln-txt">
                   <p  style="font-size: 15px">
                     Gross GST
                   </p>
                 </div>
-                <div class="col-md-5 inputCurrency">
+                <div class="col-md-8 inputCurrency">
                   $&nbsp;<mat-form-field class="monetary-input-small" appearance="outline" style="height: 30px !important">
                     <input
                             #grossGST
@@ -363,12 +363,12 @@
   .pst | number : '1.2-2' }}
                   </p>
                 </div>
-                <div class="col-md-7 aln-txt">
+                <div class="col-md-4 aln-txt">
                   <p  style="font-size: 15px">
                     Eligible GST
                   </p>
                 </div>
-                <div class="col-md-5 inputCurrency">
+                <div class="col-md-8 inputCurrency">
                   $&nbsp;<mat-form-field class="monetary-input-small" appearance="outline" style="height: 30px !important">
                     <input
                       (focusin)="setHelpText(6, tooltip)"

diff --git a/...app/sharedModules/forms/dfa-claim-main-forms/recovery-claim/recovery-claim.component.scss b/...app/sharedModules/forms/dfa-claim-main-forms/recovery-claim/recovery-claim.component.scss
@@ -55,7 +55,7 @@ mat-form-field {
 
 .currencyText {
     position: relative;
-    left: -50px;
+    /*left: -50px;*/
     padding-left: 20px;
     border-left: 1px solid black;
 }