From f792671ae247a931f34d902e9276202b5016ef9a Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Sun, 7 Jul 2019 19:23:03 +0300
Subject: Merge from ecomp 718fd196 - Modern UI

Issue-ID: VID-378

Change-Id: I2736b98426e324ec3aa233b034229ba84d99839f
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../auditInfoModal/auditInfoModal.component.html   | 105 ++++++++++-----------
 1 file changed, 51 insertions(+), 54 deletions(-)

(limited to 'vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.html')

diff --git a/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.html b/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.html
index 1dad32376..5145784e2 100644
--- a/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.html
+++ b/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.html
@@ -14,76 +14,73 @@
           </div>
         </div>
         <div class="col-md-8 right-panel">
-            <div class="row" *ngIf="showVidStatus"><span class="table-title">VID status</span></div>
-            <div class="row" *ngIf="showVidStatus">
-              <table id="service-instantiation-audit-info-vid"  class="table table-bordered">
-                <thead class="thead-dark">
-                <tr class="row">
-                  <th class="col-md-4" scope="col">Status</th>
-                  <th class="col-md-4" scope="col">Status time</th>
-                  <th class="col-md-4" scope="col">Final</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr class="row" *ngFor="let data of vidInfoData">
-                  <td class="col-md-4" id="vidJobStatus" [attr.data-tests-id]="'vidJobStatus'">
-                    <custom-ellipsis [id]="data?.jobStatus" [value]="data?.jobStatus | capitalizeAndFormat"></custom-ellipsis>
-                  </td>
-                  <td class="col-md-4" id="vidStatusTime">
-                    <custom-ellipsis [id]="data?.vidCreated"
-                                     [value]="data?.createdDate | date:'MMM dd, yyyy HH:mm'"></custom-ellipsis>
-                  </td>
-                  <td class="col-md-4" id="vidFinalStatus">
-                    <custom-ellipsis [id]="data?.final"
-                                     [value]="data?.final ? 'Yes' : 'No'"></custom-ellipsis>
-                  </td>
-                </tr>
-                </tbody>
-              </table>
-              <div class="no-result" *ngIf="!isLoading && vidInfoData?.length == 0">There is no data.</div>
-            </div>
-
-            <div class="row">
-              <div class="col-md-6 leftColumn"><span class="table-title">MSO status</span></div>
-              <div class="col-md-6 rightColumn"><span><a id="glossary_link" target="_blank" href="#" (click)="onNavigate()">Building Block (BB) glossary</a></span></div>
-            </div>
-            <table id="service-instantiation-audit-info-mso" class="table table-bordered">
-              <thead class="thead-dark row">
+          <div class="row" *ngIf="showVidStatus"><span class="table-title">VID status</span></div>
+          <div class="row" *ngIf="showVidStatus">
+            <table id="service-instantiation-audit-info-vid"  class="table table-bordered">
+              <thead class="thead-dark">
               <tr class="row">
-                <th scope="col" class="request-id">Request ID</th>
-                <th *ngIf="isAlaCarte&&isALaCarteFlagOn" id="instanceName" class="col-md-2" scope="col">Instance Name</th>
-                <th class="col-md-2" scope="col">Status</th>
-                <th class="col-md-2" scope="col">Status time</th>
-                <th class="col-md-2" scope="col">Additional info</th>
+                <th class="col-md-4" scope="col">Status</th>
+                <th class="col-md-4" scope="col">Status time</th>
+                <th class="col-md-4" scope="col">Final</th>
               </tr>
               </thead>
               <tbody>
-              <tr class="row" *ngFor="let data of msoInfoData">
-                <td id="msoRequestId" class="request-id">
-                  <custom-ellipsis [id]="data?.requestId" [value]="data?.requestId"></custom-ellipsis>
-                </td>
-                <td *ngIf="isAlaCarte && isALaCarteFlagOn" class="msoInstanceName col-md-2">
-                  <custom-ellipsis [id]="data?.instanceName" [value]="data?.instanceType + ': ' + data?.instanceName"></custom-ellipsis>
-                </td>
-                <td class="col-md-2" id="msoJobStatus">
+              <tr class="row" *ngFor="let data of vidInfoData">
+                <td class="col-md-4" id="vidJobStatus" [attr.data-tests-id]="'vidJobStatus'">
                   <custom-ellipsis [id]="data?.jobStatus" [value]="data?.jobStatus | capitalizeAndFormat"></custom-ellipsis>
                 </td>
-                <td class="col-md-2" id="msoStatusTime">
+                <td class="col-md-4" id="vidStatusTime">
                   <custom-ellipsis [id]="data?.vidCreated"
-                                   [value]="data?.createdDate  | date:'MMM dd, yyyy HH:mm'"></custom-ellipsis>
+                                   [value]="data?.createdDate | date:'MMM dd, yyyy HH:mm'"></custom-ellipsis>
                 </td>
-                <td class="col-md-2" id="msoAdditionalInfo">
-                  <custom-ellipsis [id]="data?.additionalInfo" [value]="data?.additionalInfo"></custom-ellipsis>
+                <td class="col-md-4" id="vidFinalStatus">
+                  <custom-ellipsis [id]="data?.final"
+                                   [value]="data?.final ? 'Yes' : 'No'"></custom-ellipsis>
                 </td>
               </tr>
               </tbody>
             </table>
-          <div class="no-result" *ngIf="!isLoading && msoInfoData?.length == 0">There is no data.</div>
+            <div class="no-result" *ngIf="!isLoading && vidInfoData?.length == 0">There is no data.</div>
+          </div>
+
+          <div class="row">
+            <div class="col-md-6 leftColumn"><span class="table-title">MSO status</span></div>
+            <div class="col-md-6 rightColumn"><span><a id="glossary_link" target="_blank" href="#" (click)="onNavigate()">Building Block (BB) glossary</a></span></div>
           </div>
+          <table id="service-instantiation-audit-info-mso" class="table table-bordered">
+            <thead class="thead-dark row">
+            <tr class="row">
+              <th scope="col" class="request-id" style="min-width: 275px;max-width: 275px;">Request ID</th>
+              <th scope="col" style="min-width: 100px;max-width: 100px;">Status</th>
+              <th *ngIf="isAlaCarte&&isALaCarteFlagOn" id="instanceName" class="col-md-2" scope="col" style="max-width: 350px;">Instance Name</th>
+
+              <th class="col-md-2" scope="col" style="min-width: 300px;max-width: 300px;">Additional info</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr class="row" *ngFor="let data of msoInfoData">
+              <td id="msoRequestId" class="request-id" style="min-width: 275px;max-width: 275px;">
+                <custom-ellipsis [id]="data?.requestId" [value]="data?.requestId" [attr.data-tests-id]="'requestId'"></custom-ellipsis>
+              </td>
+              <td id="msoJobStatus" style="min-width: 100px;max-width: 100px;">
+                <custom-ellipsis [id]="data?.jobStatus" [value]="data?.jobStatus | capitalizeAndFormat" [attr.data-tests-id]="'jobStatus'"></custom-ellipsis>
+              </td>
+              <td *ngIf="isAlaCarte && isALaCarteFlagOn" class="msoInstanceName col-md-2" style="max-width: 350px;">
+                <custom-ellipsis [id]="data?.instanceName" [value]="data?.instanceType + ': ' + data?.instanceName"></custom-ellipsis>
+              </td>
+
+              <td class="col-md-2" id="msoAdditionalInfo" style="min-width: 300px;max-width: 300px;">
+                <custom-ellipsis [id]="data?.additionalInfo" [value]="data?.additionalInfo" [attr.data-tests-id]="'additionalInfo'"></custom-ellipsis>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+          <div class="no-result" *ngIf="!isLoading && msoInfoData?.length == 0">There is no data.</div>
+        </div>
 
       </div>
       <div class="modal-footer row">
-        <button style= "font-size: 12px" id="cancelButton" type="button" class="btn btn-default cancel" (click)="onCancelClick()">
+        <button style= "font-size: 12px" id="cancelButton" type="button" class="btn btn-default cancel" (click)="onCancelClick()" [attr.data-tests-id]="'close-button'">
           Close
         </button>
       </div>
-- 
cgit 1.2.3-korg