Refactor code and fix some ui issues

[sdnc/oam.git] / configbackuprestore / vnfconfigbackupservice / src / main / webapp / static / views / form-deviceConfig.html

diff --git a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/form-deviceConfig.html b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/form-deviceConfig.html
index 54b39b2..fb5248c 100644 (file)
--- a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/form-deviceConfig.html
+++ b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/form-deviceConfig.html
@@ -129,14 +129,16 @@
 
 
 
-<div id = "Div1" class="VersionMain" ng-show="showResult">
+<div id = "Div1" class="VersionMain" ng-show="showResult" >
    <div class="versionHeading"><img src="static/images/compare.jpg" width=25 height="25" style="margin-left:5px;">&nbsp;&nbsp;Version Comparision Result</div>
-   <div class="columnsVersion">
-      <ul class="price">
+  <table class="tableCompare" >
+  <td style="width:230px;">
+   
+      <ul class="price" style="font-weight:bold;">
          <li class="headerVersion">Attributes</li>
          <div style="background-color:#E1E0DA;">
-            <li class="listHeading">Config Details</li>
-            <li ng-repeat="(key,value) in objCompareModel1.versionDetails">{{key}}</li>
+            <li  class="listHeading">Config Details</li>
+            <li  ng-repeat="(key,value) in objCompareModel1.versionDetails">{{key}}</li>
             <hr class="separator">
             </hr>
          </div>
@@ -195,50 +197,50 @@
             </hr>
          </div>
       </ul>
-   </div>
   
-   <div class="columnsVersion">
+  </td><td>
+   
       <ul class="price">
          <li class="headerVersion" style="background-color:#807C7C">Version {{objCompareModel1.versionDetails.vnfversion}}</li>
          <div style="background-color:#E1E0DA;">
             <li class="listHeading">Config Details</li>
-            <li ng-repeat="(key,value) in objCompareModel1.versionDetails">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.versionDetails">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
           <div style="background-color:#E1E0DA;" >
             <li class="listHeading">VNF ID</li>
-            <li ng-repeat="(key,value) in objCompareModel1.vnfIdInfo">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.vnfIdInfo">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
           <div style="background-color:#E1E0DA;">
             <li class="listHeading">SERVICE STATUS</li>
-            <li ng-repeat="(key,value) in objCompareModel1.serviceStatusInfo">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.serviceStatusInfo">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
           <div style="background-color:#E1E0DA;">
             <li class="listHeading">VNF Topology Identifer</li>
-            <li ng-repeat="(key,value) in objCompareModel1.vnfTopologyIdentifier">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.vnfTopologyIdentifier">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
           <div style="background-color:#E1E0DA;">
             <li class="listHeading">Operation Status</li>
-            <li ng-repeat="(key,value) in objCompareModel1.operationStatus">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.operationStatus">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
           <div style="background-color:#E1E0DA;">
             <li class="listHeading">Request Info</li>
-            <li ng-repeat="(key,value) in objCompareModel1.vnfRequestInfo">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.vnfRequestInfo">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
          <div style="background-color:#E1E0DA;">
             <li class="listHeading">Service Info</li>
-            <li ng-repeat="(key,value) in objCompareModel1.serviceInfo">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.serviceInfo">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
@@ -250,7 +252,7 @@
          </div>
          <div style="background-color:#E1E0DA;">
             <li class="listHeading">Request Information</li>
-            <li ng-repeat="(key,value) in objCompareModel1.requestInfo">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.requestInfo">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
@@ -261,50 +263,50 @@
             </hr>
          </div>
        </ul>
-   </div>
-
-     <div class="columnsVersion">
+  
+</td><td>
+     
          <ul class="price">
          <li class="headerVersion"style="background-color:#807C7C">Version {{objCompareModel2.versionDetails.vnfversion}}</li>
          <div style="background-color:#E1E0DA;">
             <li class="listHeading">Config Details</li>
-            <li ng-repeat="(key,value) in objCompareModel2.versionDetails">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.versionDetails">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
           <div style="background-color:#E1E0DA;">
             <li class="listHeading">VNF ID</li>
-            <li ng-repeat="(key,value) in objCompareModel2.vnfIdInfo">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.vnfIdInfo">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
          <div style="background-color:#E1E0DA;">
             <li class="listHeading">SERVICE STATUS</li>
-            <li ng-repeat="(key,value) in objCompareModel2.serviceStatusInfo">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.serviceStatusInfo">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
          <div style="background-color:#E1E0DA;">
             <li class="listHeading">VNF Topology Identifer</li>
-            <li ng-repeat="(key,value) in objCompareModel2.vnfTopologyIdentifier">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.vnfTopologyIdentifier">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
          <div style="background-color:#E1E0DA;">
             <li class="listHeading">Operation Status</li>
-            <li ng-repeat="(key,value) in objCompareModel2.operationStatus">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.operationStatus">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
          <div style="background-color:#E1E0DA;">
             <li class="listHeading">Request Info</li>
-            <li ng-repeat="(key,value) in objCompareModel2.vnfRequestInfo">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.vnfRequestInfo">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
                <div style="background-color:#E1E0DA;">
             <li class="listHeading">Service Info</li>
-            <li ng-repeat="(key,value) in objCompareModel2.serviceInfo">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.serviceInfo">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
@@ -316,7 +318,7 @@
          </div>
          <div style="background-color:#E1E0DA;">
             <li class="listHeading">Request Information</li>
-            <li ng-repeat="(key,value) in objCompareModel2.requestInfo">{{value}}</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.requestInfo">{{value}}</li>
             <hr class="separator">
             </hr>
          </div>
@@ -327,6 +329,139 @@
             </hr>
          </div>
       </ul>
-   </div>
+   
+</td><td ng-show=version3>
 
+         <ul class="price">
+         <li class="headerVersion"style="background-color:#807C7C">Version {{objCompareModel3.versionDetails.vnfversion}}</li>
+         <div style="background-color:#E1E0DA;">
+            <li class="listHeading">Config Details</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.versionDetails">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+          <div style="background-color:#E1E0DA;">
+            <li class="listHeading">VNF ID</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.vnfIdInfo">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+         <div style="background-color:#E1E0DA;">
+            <li class="listHeading">SERVICE STATUS</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.serviceStatusInfo">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+         <div style="background-color:#E1E0DA;">
+            <li class="listHeading">VNF Topology Identifer</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.vnfTopologyIdentifier">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+         <div style="background-color:#E1E0DA;">
+            <li class="listHeading">Operation Status</li>
+            <li  style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.operationStatus">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+         <div style="background-color:#E1E0DA;">
+            <li class="listHeading">Request Info</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.vnfRequestInfo">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+               <div style="background-color:#E1E0DA;">
+            <li class="listHeading">Service Info</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.serviceInfo">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+               <div style="background-color:#E1E0DA;">
+            <li class="listHeading">Service Request Header</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.requestHeader">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+         <div style="background-color:#E1E0DA;">
+            <li class="listHeading">Request Information</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.requestInfo">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+         <div style="background-color:#E1E0DA;">
+            <li class="listHeading">VNF Topology</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.topologyInfo">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+      </ul>
+  
+</td><td ng-show=version4>
+
+         <ul class="price">
+         <li class="headerVersion"style="background-color:#807C7C">Version {{objCompareModel4.versionDetails.vnfversion}}</li>
+         <div style="background-color:#E1E0DA;">
+            <li class="listHeading">Config Details</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.versionDetails">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+          <div style="background-color:#E1E0DA;">
+            <li class="listHeading">VNF ID</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.vnfIdInfo">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+         <div style="background-color:#E1E0DA;">
+            <li class="listHeading">SERVICE STATUS</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.serviceStatusInfo">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+         <div style="background-color:#E1E0DA;">
+            <li class="listHeading">VNF Topology Identifer</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.vnfTopologyIdentifier">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+         <div style="background-color:#E1E0DA;">
+            <li class="listHeading">Operation Status</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.operationStatus">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+         <div style="background-color:#E1E0DA;">
+            <li class="listHeading">Request Info</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.vnfRequestInfo">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+               <div style="background-color:#E1E0DA;">
+            <li class="listHeading">Service Info</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.serviceInfo">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+               <div style="background-color:#E1E0DA;">
+            <li class="listHeading">Service Request Header</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.requestHeader">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+         <div style="background-color:#E1E0DA;">
+            <li class="listHeading">Request Information</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.requestInfo">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+         <div style="background-color:#E1E0DA;">
+            <li class="listHeading">VNF Topology</li>
+            <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.topologyInfo">{{value}}</li>
+            <hr class="separator">
+            </hr>
+         </div>
+      </ul>
+  
+   </td>
+</table>
 </div>
\ No newline at end of file