From 1cfb08779ea0e00be69e072a940b3063e049fe6b Mon Sep 17 00:00:00 2001
From: Ofir Sonsino <os0695@att.com>
Date: Wed, 31 Jan 2018 17:19:00 +0200
Subject: org.onap migration

Change-Id: I52f0b2851f2c765752b6d21f49b32136d7d72a3d
Issue-ID: VID-86
Signed-off-by: Ofir Sonsino <os0695@att.com>
---
 .../vid/scripts/view-models/change-management.html | 100 ++++++++++++++-------
 1 file changed, 66 insertions(+), 34 deletions(-)

(limited to 'vid-app-common/src/main/webapp/app/vid/scripts/view-models/change-management.html')

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/change-management.html b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/change-management.html
index 0f42ec874..94a1790db 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/change-management.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/change-management.html
@@ -13,63 +13,95 @@
 
         <input type="search" id="change-management-search" class="search-changes" ng-change="vm.searchChanges()" ng-model-options="{debounce: 300}" ng-model="vm.searchChangesTerm" placeholder="Type to search">
     </div>
+    <span class="refresh-cm">
+        Last updated at:
+        <span class="last-time-updated">{{ vm.lastTimeUpdated }}</span>
+        <i class="icon-sync" data-tests-id="refresh-cm" ng-click="vm.init()"></i>
+    </span>
     <div class="jobs-table">
         <div class="row">
             <div class="col-md-12">
                 <uib-tabset active="activeJustified" justified="true">
                     <uib-tab index="0" heading="Active" id="active-tab">
-                        <table class="table table-bordered" id="active-table">
-                            <thead class="thead-default">
-                                <tr>
-                                    <th class="col-md-5">VNF Name</th>
-                                    <th class="col-md-2">Type</th>
-                                    <th class="col-md-2">Flow</th>
-                                    <th class="col-md-2">Start time</th>
-                                    <th>Status</th>
-                                    <th></th>
-                                </tr>
-                            </thead>
-                            <tbody>
+                        <div class="table-wrapper">
+                        <table class="table table-bordered"  data-tests-id="active-table-cm" id="active-table">
+                            <thead class="thead-default" ng-click="collapseInProgress=!collapseInProgress">
                                 <tr class="table-headline-row">
-                                    <th>
+                                    <th >
+                                        <span ng-class="{'collapse-icon':!collapseInProgress,'expand-icon':collapseInProgress }"></span>
                                         <span id="in-progress-table-head">IN PROGRESS</span>
                                     </th>
                                     <th></th>
                                     <th></th>
                                     <th></th>
                                     <th></th>
-                                    <th></th>
                                 </tr>
-                                <tr ng-repeat="changeManagement in vm.changeManagements | changeManagementsByStatuses:{statuses: ['FAILED', 'INPROGRESS', 'PENDING']}">
+                                <tr ng-show="!collapseInProgress">
+                                    <th class="col-md-5">VNF Name</th>
+                                    <th class="col-md-2">Type</th>
+                                    <th class="col-md-2">Flow</th>
+                                    <th class="col-md-2">Start time</th>
+                                    <th>Status</th>
+                                </tr>
+                            </thead>
+                            <tbody ng-show="!collapseInProgress">
+
+                                <tr  data-tests-id="active-table-cm-row" ng-repeat="changeManagement in vm.changeManagements | changeManagementsByStatuses:{statuses: ['FAILED', 'IN_PROGRESS', 'PENDING']}">
                                     <th scope="row">{{changeManagement.instanceReferences.vnfInstanceName || 'No-Instance-Name'}}</th>
                                     <td>{{changeManagement.requestScope}}</td>
                                     <td>{{changeManagement.requestType}}</td>
                                     <td>{{changeManagement.startTime}}</td>
                                     <td class="centered" ng-if="changeManagement.requestStatus.requestState == 'FAILED'"><span class="icon-x" ng-click="vm.openFailedModal({details: changeManagement.requestStatus.statusMessage, job: changeManagement})"></span></td>
-                                    <td class="centered" ng-if="changeManagement.requestStatus.requestState == 'INPROGRESS'"><span class="icon-process" ng-click="vm.openInProgressModal({details: changeManagement.requestStatus.statusMessage, job: changeManagement})"></span></td>
+                                    <td class="centered" ng-if="changeManagement.requestStatus.requestState == 'IN_PROGRESS'"><span class="icon-process" ng-click="vm.openInProgressModal({details: changeManagement.requestStatus.statusMessage, job: changeManagement})"></span></td>
                                     <td class="centered" ng-if="changeManagement.requestStatus.requestState == 'PENDING'"><span class="icon-alert" ng-click="vm.openAlertModal({details: changeManagement.requestStatus.statusMessage, job: changeManagement})"></span></td>
-                                    <td class="centered"><span class="icon-view"></span></td>
                                 </tr>
-                                <tr class="table-headline-row">
-                                    <th>
-                                        <span id="pending-table-head">PENDING</span>
-                                    </th>
-                                    <th></th>
-                                    <th></th>
-                                    <th></th>
-                                    <th></th>
-                                    <th></th>
-                                </tr>
-                                <tr ng-repeat="changeManagement in vm.pendingChangeManagements">
-                                    <th scope="row">{{changeManagement.vnfName}}</th>
-                                    <td>{{changeManagement.scheduleRequest.scheduleName}}</td>
-                                    <td>{{changeManagement.workflow}}</td>
-                                    <td>{{changeManagement.startTime}}</td>
-                                    <td class="centered"><span class="icon-pending" ng-click="vm.openPendingModal({details: 'change management is pending in scheduler and waiting to be deployed'})"></span></td>
-                                    <td class="centered"><span class="icon-view"></span></td>
+                            </tbody>
+                        </table>
+                        </div>
+                        <div class="table-wrapper">
+                        <table class="table table-bordered"  data-tests-id="pending-table-cm" id="pending-table">
+                            <thead ng-click="collapsePending=!collapsePending">
+                            <tr class="table-headline-row">
+                                <th class="col-md-6">
+                                    <span ng-class="{'collapse-icon':!collapsePending,'expand-icon':collapsePending }"></span>
+                                    <span id="pending-table-head">PENDING</span>
+                                </th>
+
+                                <th></th>
+                                <th></th>
+                                <th></th>
+                                <th></th>
+                                <th></th>
+                                <th></th>
+                                <th></th>
+                            </tr>
+                            <tr class="thead-default" ng-show="!collapsePending">
+                                <th class="col-md-2">Schedule ID</th>
+                                <th class="col-md-2">CM ticket</th>
+                                <th class="col-md-1">VNF name</th>
+                                <th class="col-md-1">VNF status</th>
+                                <th class="col-md-2">Workflow</th>
+                                <th class="col-md-2">Start time</th>
+                                <th class="col-md-2">Schedule status</th>
+                                <th class="col-md-1">Status</th>
+                            </tr>
+                            </thead>
+                            <tbody ng-show="!collapsePending">
+
+                                <tr data-tests-id="pending-table-cm-row" ng-repeat="changeManagement in vm.pendingChangeManagements">
+                                    <th scope="row">{{changeManagement.scheduleRequest.scheduleId}}</th>
+                                    <td>{{changeManagement.aotsChangeId}}</td>
+                                    <td>{{changeManagement.vnfName}}</td>
+                                    <td>{{changeManagement.status}}</td>
+                                    <td>{{changeManagement.scheduleRequest.domainData[1].value}}</td>
+                                    <td>{{changeManagement.scheduleRequest.createDateTime }}</td><!--| date:"MM/dd/yyyy HH:mm:ss"-->
+                                    <td>{{changeManagement.scheduleRequest.status}}</td>
+                                    <td class="centered"><span class="cancel-action" ng-class="{'icon-pending':changeManagement.scheduleRequest.status!=='Deleted', 'icon-deleted': changeManagement.scheduleRequest.status=='Deleted'}"
+                                                                ng-click="vm.openPendingModal($event, changeManagement)"></span></td>
                                 </tr>
                             </tbody>
                         </table>
+                        </div>
                     </uib-tab>
                     <uib-tab index="1" heading="Finished" id="finished-tab">
                         <table class="table table-bordered" id="finished-table">
-- 
cgit 1.2.3-korg