Integration of Client pages to Main GUI

IssueId : CLIENT-189

Change-Id: I22b5706272b0f6f368ca95c6f8f0f2115dcf7f3a
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
index 5155738..053ee41 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
@@ -238,7 +238,8 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
             }, { counts:[5, 10, 15], dataset: $scope.tableData});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                angular.forEach($scope.tableData, function(item) {\r
+                               $scope.checkboxes.items = [];\r
+                angular.forEach($scope.tableParams.data, function(item) {\r
                     if (angular.isDefined(item.id)) {\r
                         $scope.checkboxes.items[item.id] = value;\r
                     }\r
@@ -648,7 +649,8 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
             $scope.checkboxes = { 'checked': false, items: {} };\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                angular.forEach($scope.overlayData, function(item) {\r
+                               $scope.checkboxes.items = [];\r
+                angular.forEach($scope.tableParams.data, function(item) {\r
                     if (angular.isDefined(item.id)) {\r
                         $scope.checkboxes.items[item.id] = value;\r
                     }\r
@@ -693,7 +695,8 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
             $scope.checkboxes = { 'checked': false, items: {} };\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                angular.forEach($scope.underlayVPN.underlayData, function(item) {\r
+                                         $scope.checkboxes.items = [];\r
+                angular.forEach($scope.tableParams.data, function(item) {\r
                     if (angular.isDefined(item.id)) {\r
                         $scope.checkboxes.items[item.id] = value;\r
                     }\r

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/home.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/home.html
index 8030137..4fc8fd7 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/home.html
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/home.html
@@ -43,8 +43,8 @@
             <td title="'Action'">\r
                 <!--<img src="../images/delete.png" ng-click="editData(lcData.id)" style="cursor: pointer"></img>-->\r
                 <!--<span class="pull-right glyphicon glyphicon-edit" ng-click="editData(lcData.serviceId)" style="cursor: pointer;margin: 0 5px"></span>-->\r
-                <span class="pull-right glyphicon glyphicon-trash" ng-click="deleteIndividualData(lcData.serviceId)" style="cursor: pointer;margin: 0 5px"></span>\r
-                <span class="pull-right glyphicon glyphicon-circle-arrow-right" ng-click="scaleData(lcData.serviceId)" style="cursor: pointer;margin: 0 5px"></span>\r
+                <span  ng-click="scaleData(lcData.serviceId)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>\r
+                               <span  ng-click="deleteIndividualData(lcData.serviceId)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>\r
             </td>\r
         </tr>\r
     </table>\r

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/overlayVPN.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/overlayVPN.html
index 5f484f1..1671983 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/overlayVPN.html
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/overlayVPN.html
@@ -53,7 +53,7 @@
         </td>\r
         <td title="'Action'">\r
             <!--<span class="pull-right glyphicon glyphicon-edit" ng-click="editData(overlayData.id)" style="cursor: pointer;margin: 0 5px"></span>-->\r
-            <span class="pull-right glyphicon glyphicon-trash" ng-click="deleteIndividualData(overlayData.id)" style="cursor: pointer;margin: 0 5px"></span>\r
+           <span  ng-click="deleteIndividualData(overlayData.id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>\r
         </td>\r
     </tr>\r
 </table>\r

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/underlayVPN.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/underlayVPN.html
index 385db8c..5cd4126 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/underlayVPN.html
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/underlayVPN.html
@@ -41,7 +41,7 @@
         </td>\r
         <td title="'Action'">\r
             <!--<span class="pull-right glyphicon glyphicon-edit" ng-click="editData(underlayData.id)" style="cursor: pointer;margin: 0 5px"></span>-->\r
-            <span class="pull-right glyphicon glyphicon-trash" ng-click="deleteIndividualData(underlayData.id)" style="cursor: pointer;margin: 0 5px"></span>\r
+        <span ng-click="deleteIndividualData(underlayData.id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>\r
         </td>\r
     </tr>\r
 </table>\r

diff --git a/provincemgr/src/main/webapp/provincemgr/index.html b/provincemgr/src/main/webapp/provincemgr/index.html
index f53edcc..6f9b899 100644 (file)
--- a/provincemgr/src/main/webapp/provincemgr/index.html
+++ b/provincemgr/src/main/webapp/provincemgr/index.html
@@ -23,23 +23,24 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Province Management</title>
-    <link href="thirdparty/css/bootstrap.min.css" rel="stylesheet"/>
-    <link href="thirdparty/css/font-awesome.min.css" rel="stylesheet">
-    <link href="thirdparty/css/zTreeStyle.css" rel="stylesheet"/>
-    <link href="thirdparty/css/magic-check.css" rel="stylesheet"/>
-    <link href="thirdparty/css/ng-table.min.css" rel="stylesheet"/>
-    <link href="framework/css/open-ostyle.css" rel="stylesheet"/>
-    <script src="thirdparty/js/angular.min.js"></script>
-    <script src="thirdparty/js/angular-ui-router.min.js"></script>
-    <script src="thirdparty/js/ng-table.min.js"></script>
-    <script src="thirdparty/js/jquery_1.12.4.min.js"></script>
-    <script src="thirdparty/js/jquery-ui.js"></script>
-    <script type="text/javascript" src="thirdparty/js/bootstrap.min.js"></script>
-    <script src="js/app.js"></script>
-    <script src="js/rest.js"></script>
-    <script src="framework/js/DataService.js"></script>
-    <script src="thirdparty/js/mustache.js"></script>
-    <script src="thirdparty/js/jquery.ztree.core-3.5.js"></script>
+    <link href="/openoui/thirdparty/css/bootstrap.min.css" rel="stylesheet"/>
+    <link href="/openoui/thirdparty/css/font-awesome.min.css" rel="stylesheet">
+    <link href="/openoui/thirdparty/css/zTreeStyle.css" rel="stylesheet"/>
+    <link href="/openoui/thirdparty/css/magic-check.css" rel="stylesheet"/>
+    <link href="/openoui/thirdparty/css/ng-table.min.css" rel="stylesheet"/>
+    <link href="/openoui/framework/css/open-ostyle.css" rel="stylesheet"/>
+
+    <script src="/openoui/thirdparty/js/angular.min.js"></script>
+    <script src="/openoui/thirdparty/js/angular-ui-router.min.js"></script>
+    <script src="/openoui/thirdparty/js/ng-table.min.js"></script>
+    <script src="/openoui/thirdparty/js/jquery_1.12.4.min.js"></script>
+    <script src="/openoui/thirdparty/js/jquery-ui.js"></script>
+    <script type="text/javascript" src="/openoui/thirdparty/js/bootstrap.min.js"></script>
+    <script src="/openoui/provincemgr/js/app.js"></script>
+    <script src="/openoui/provincemgr/js/rest.js"></script>
+       <script type="text/javascript" src="/openoui/provincemgr/js/DataService.js"></script>
+    <script src="/openoui/thirdparty/js/mustache.js"></script>
+    <script src="/openoui/thirdparty/js/jquery.ztree.core-3.5.js"></script>
 
 </head>
 

diff --git a/provincemgr/src/main/webapp/provincemgr/js/app.js b/provincemgr/src/main/webapp/provincemgr/js/app.js
index b8979dd..7a97217 100644 (file)
--- a/provincemgr/src/main/webapp/provincemgr/js/app.js
+++ b/provincemgr/src/main/webapp/provincemgr/js/app.js
@@ -6,7 +6,7 @@
  you may not use this file except in compliance with the License.\r
  You may obtain a copy of the License at\r
 \r
-      http://www.apache.org/licenses/LICENSE-2.0\r
+ http://www.apache.org/licenses/LICENSE-2.0\r
 \r
  Unless required by applicable law or agreed to in writing, software\r
  distributed under the License is distributed on an "AS IS" BASIS,\r
@@ -33,7 +33,7 @@ var app = angular.module("ProvinceManagementApp", ["ui.router", "ngTable"])
 \r
 \r
     .controller("managementCtrl", function($scope, $log, provinceDataService, $state, $compile, NgTableParams){\r
-        $scope.message = "Management";\r
+        $scope.title = "Management";\r
 \r
         $scope.init = function() {\r
             provinceDataService.getAllProvinceData()\r
@@ -43,6 +43,7 @@ var app = angular.module("ProvinceManagementApp", ["ui.router", "ngTable"])
                     loadButtons();\r
                     $log.info(data.provinceData);\r
                 }, function(reason){\r
+                                       loadButtons();\r
                     $scope.message = "Error is :" + JSON.stringify(reason);\r
                 });\r
 \r
@@ -284,20 +285,20 @@ var app = angular.module("ProvinceManagementApp", ["ui.router", "ngTable"])
 \r
 var modelTemplate = "";\r
 function loadTemplate() {\r
-    $.get('framework/template.html', function (template) {\r
+    $.get('/openoui/resmgr/templates/template.html', function (template) {\r
         modelTemplate += template;\r
     });\r
-    $.get('framework/templateContainer.html', function (template) {\r
+    $.get('/openoui/resmgr/templates/templateContainer.html', function (template) {\r
         modelTemplate += template;\r
     });\r
-    $.get('framework/templateWidget.html', function (template) {\r
+    $.get('/openoui/resmgr/templates/templateWidget.html', function (template) {\r
         //console.log("Template is : "+template);\r
         modelTemplate += template;\r
     });\r
-    $.get('framework/templateNotification.html', function (template) {\r
+    $.get('/openoui/resmgr/templates/templateNotification.html', function (template) {\r
         modelTemplate += template;\r
     });\r
-    $.get('framework/templateFunctional.html', function (template) {\r
+    $.get('/openoui/resmgr/templates/templateFunctional.html', function (template) {\r
         modelTemplate += template;\r
     });\r
 }
\ No newline at end of file

diff --git a/provincemgr/src/main/webapp/provincemgr/js/rest.js b/provincemgr/src/main/webapp/provincemgr/js/rest.js
index 6432ca1..b2c994c 100644 (file)
--- a/provincemgr/src/main/webapp/provincemgr/js/rest.js
+++ b/provincemgr/src/main/webapp/provincemgr/js/rest.js
@@ -18,7 +18,8 @@
 \r
 \r
 app.factory("provinceDataService", function($http,DataService, $log){\r
-    var uri ;//'http://192.168.9.13:18008';\r
+    /* var uri = 'http://192.168.9.13:18008'; */\r
+    var uri ;\r
     return {\r
         getAllProvinceData : function() {\r
             /*return $http({\r

diff --git a/provincemgr/src/main/webapp/provincemgr/templates/management.html b/provincemgr/src/main/webapp/provincemgr/templates/management.html
index 934eff0..ccbd45e 100644 (file)
--- a/provincemgr/src/main/webapp/provincemgr/templates/management.html
+++ b/provincemgr/src/main/webapp/provincemgr/templates/management.html
@@ -17,7 +17,7 @@
 -->\r
 <div class="homecontent center">\r
 <div class="col-md-12 col-sm-12 col-lg-12">\r
-    <h4>{{message}}</h4>\r
+    <h4>{{title}}</h4>\r
     <br><br>\r
     <div id="provinceAction" ng-init="init()">\r
 \r
@@ -43,8 +43,8 @@
                 {{provinceData.desc}}\r
             </td>\r
             <td title="'Action'">\r
-                <span  ng-click="editData(provinceData.id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>\r
-                <span  ng-click="deleteData(provinceData.id)" style="cursor: pointer;margin: 0 5px"><img src="framework/images/delete.png" height="15" align="middle"/></span>\r
+                <span  ng-click="editData(provinceData.id)" style="cursor: pointer;margin: 0 5px"> <img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>\r
+                <span  ng-click="deleteData(provinceData.id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>\r
             </td>\r
         </tr>\r
     </table>\r

diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
index be7b5ee..b86393f 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/js/app.js
+++ b/resmgr/src/main/webapp/resmgr/js/app.js
@@ -147,6 +147,10 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             };\r
 \r
             $('#myModal #type').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
+                       \r
+                       var dropdownResponse=[{"serviceTemplateId":"tenant_site","templateName":"portType1"},{"serviceTemplateId":"tenant_site2","templateName":"portType2"}];\r
+                       var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
+            document.getElementById("portdropdown").innerHTML = dropdownInfo;\r
 \r
             var portType = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.logicalType"}};\r
             $('#myModal #logicalType').append($compile(Mustache.to_html(text, portType.ErrMsg))($scope));\r
@@ -164,6 +168,11 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             };\r
 \r
             $('#myModal #Edgepoint').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
+                       \r
+                       var dropdownResponse=[{"serviceTemplateId":"tenant_site","templateName":"Edgepoint1"},{"serviceTemplateId":"tenant_site2","templateName":"Edgepoint2"}];\r
+                       var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
+            document.getElementById("portEdropdown").innerHTML = dropdownInfo;\r
+                       \r
 \r
             var portEdgepoint = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.isEdgePoint"}};\r
             $('#myModal #isEdgePoint').append($compile(Mustache.to_html(text, portEdgepoint.ErrMsg))($scope));\r
@@ -186,7 +195,8 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             }, { counts:[5, 10, 20, 50], dataset: $scope.data});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                angular.forEach($scope.data, function(item) {\r
+                                $scope.checkboxes.items = [];\r
+                angular.forEach($scope.portTableParams.data, function(item) {\r
                     if (angular.isDefined(item.id)) {\r
                         $scope.checkboxes.items[item.id] = value;\r
                     }\r
@@ -194,6 +204,18 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             });\r
 \r
         }\r
+               \r
+               function translateToDropdownInfo(dropdowndata) {\r
+            var options = '<option value="select">--select--</option>';\r
+            var i;\r
+            for (i = 0; i < dropdowndata.length; i += 1) {\r
+                var option = '<option value="' + dropdowndata[i].serviceTemplateId + '">' + dropdowndata[i].templateName\r
+                    + '</option>';\r
+                options = options + option;\r
+            }\r
+\r
+            return options;\r
+        } \r
 \r
         $scope.validatetextboxName = function (value){\r
             if($scope.port.name) {\r
@@ -303,7 +325,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 "msg": "Do you really wanted to Delete?.",\r
                 "buttons": [\r
                     {\r
-                        "text": "OK", "action": "deleteConfirmation("+id+")"\r
+                        "text": "OK", "action": "deleteConfirmation('"+[id]+"')"\r
                     }]\r
             }};\r
             angular.forEach($scope.checkboxes.items, function(value) {\r
@@ -321,7 +343,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             console.log("data in port data is ::");\r
             $log.info($scope.data.portData);\r
             var deleteArr = [];\r
-            if (typeof id !== "undefined"){\r
+            if (id){\r
 \r
                 deleteArr.push(id);\r
             }\r
@@ -355,6 +377,8 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                     if (data.id == id) {\r
                         console.log("Found : " + data.id);\r
                         $scope.port = data;\r
+                                               $('#portdropdown').val(data.logicalType);\r
+                                               $('#portEdropdown').val(data.isEdgePoint);\r
                         $("#myModal").modal();\r
                         dataFound = true;\r
                     }\r
@@ -401,7 +425,8 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             }, { counts:[5, 10, 20, 50], dataset: $scope.data});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                angular.forEach($scope.data, function(item) {\r
+                                $scope.checkboxes.items = [];\r
+                angular.forEach($scope.siteTableParams.data, function(item) {\r
                     console.log(item.id);\r
                     if (angular.isDefined(item.id)) {\r
                         $scope.checkboxes.items[item.id] = value;\r
@@ -437,6 +462,10 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             };\r
 \r
             $('#myModal #type').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
+                       \r
+                       var dropdownResponse=[{"serviceTemplateId":"tenant_site","templateName":"tenant_site"},{"serviceTemplateId":"tenant_site2","templateName":"tenant_site2"}];\r
+                       var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
+            document.getElementById("sitedropdown").innerHTML = dropdownInfo;\r
 \r
             var siteType = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"site.type"}};\r
             $('#myModal #type').append($compile(Mustache.to_html(text, siteType.ErrMsg))($scope));\r
@@ -451,6 +480,19 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $('#myModal #location').append($compile(Mustache.to_html(text, siteLocation.ErrMsg))($scope));\r
         }\r
 \r
+               \r
+                function translateToDropdownInfo(dropdowndata) {\r
+            var options = '<option value="select">--select--</option>';\r
+            var i;\r
+            for (i = 0; i < dropdowndata.length; i += 1) {\r
+                var option = '<option value="' + dropdowndata[i].serviceTemplateId + '">' + dropdowndata[i].templateName\r
+                    + '</option>';\r
+                options = options + option;\r
+            }\r
+\r
+            return options;\r
+        } \r
+               \r
         $scope.validatetextboxName = function (value){\r
             if($scope.site.name) {\r
                 $scope.textboxErrName = false;\r
@@ -529,7 +571,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 "msg": "Do you really wanted to Delete?.",\r
                 "buttons": [\r
                     {\r
-                        "text": "Ok", "action": "deleteConfirmation("+id+")"\r
+                        "text": "Ok", "action": "deleteConfirmation('"+[id]+"')"\r
                     }]\r
             }};\r
 \r
@@ -548,7 +590,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             console.log("data in site data is :");\r
             $log.info($scope.data.siteData);\r
             var deleteArr = [];\r
-            if (typeof id !== "undefined"){\r
+            if (id){\r
 \r
                 deleteArr.push(id);\r
             }\r
@@ -583,6 +625,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                         console.log("Found : " + data.name);\r
                         console.log("Found : " + data);\r
                         $scope.site = data;\r
+                                               $('#sitedropdown').val(data.type);\r
                         $("#myModal").modal();\r
                         dataFound = true;\r
                     }\r
@@ -658,7 +701,8 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             }, { counts:[5, 10, 20, 50], dataset: $scope.data.locationData});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                angular.forEach($scope.data.locationData, function(item) {\r
+                                $scope.checkboxes.items = [];\r
+                angular.forEach($scope.neTableParams.data, function(item) {\r
                     if (angular.isDefined(item.Id)) {\r
                         $scope.checkboxes.items[item.Id] = value;\r
                     }\r
@@ -768,7 +812,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 "msg": "Do you really wanted to Delete?.",\r
                 "buttons": [\r
                     {\r
-                        "text": "OK", "action": "deleteConfirmation("+id+")"\r
+                        "text": "OK", "action": "deleteConfirmation('"+[id]+"')"\r
                     }]\r
             }};\r
             angular.forEach($scope.checkboxes.items, function(value) {\r
@@ -786,7 +830,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             console.log("data in location data is :");\r
             $log.info($scope.data.locationData);\r
             var deleteArr = [];\r
-            if (typeof id !== "undefined"){\r
+            if (id){\r
 \r
                 deleteArr.push(id);\r
             }\r
@@ -882,6 +926,10 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             };\r
 \r
             $('#myModal #type').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
+                       \r
+                       var dropdownResponse=[{"serviceTemplateId":"tenant_site","templateName":"TP1"},{"serviceTemplateId":"tenant_site2","templateName":"TP2"}];\r
+                       var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
+            document.getElementById("linkdropdown").innerHTML = dropdownInfo;\r
 \r
             var linkType = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.logicalType"}};\r
             $('#myModal #logicalType').append($compile(Mustache.to_html(text, linkType.ErrMsg))($scope));\r
@@ -913,7 +961,8 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             }, { counts:[5, 10, 20, 50], dataset: $scope.data});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                angular.forEach($scope.data, function(item) {\r
+                                $scope.checkboxes.items = [];\r
+                angular.forEach($scope.linkTableParams.data, function(item) {\r
                     console.log(item.id);\r
                     if (angular.isDefined(item.id)) {\r
                         $scope.checkboxes.items[item.id] = value;\r
@@ -922,6 +971,18 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             });\r
 \r
         }\r
+               \r
+               function translateToDropdownInfo(dropdowndata) {\r
+            var options = '<option value="select">--select--</option>';\r
+            var i;\r
+            for (i = 0; i < dropdowndata.length; i += 1) {\r
+                var option = '<option value="' + dropdowndata[i].serviceTemplateId + '">' + dropdowndata[i].templateName\r
+                    + '</option>';\r
+                options = options + option;\r
+            }\r
+\r
+            return options;\r
+        } \r
 \r
         $scope.validatetextbox = function (value){\r
             if($scope.link.name) {\r
@@ -1014,7 +1075,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 "msg": "Do you really wanted to Delete?.",\r
                 "buttons": [\r
                     {\r
-                        "text": "OK", "action": "deleteConfirmation("+id+")"\r
+                        "text": "OK", "action": "deleteConfirmation('"+[id]+"')"\r
                     }]\r
             }};\r
             angular.forEach($scope.checkboxes.items, function(value) {\r
@@ -1032,7 +1093,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             console.log("data in link data is :");\r
             $log.info($scope.data.linkData);\r
             var deleteArr = [];\r
-            if (typeof id !== "undefined"){\r
+            if (id){\r
 \r
                 deleteArr.push(id);\r
             }\r
@@ -1066,6 +1127,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                     if (data.id == id) {\r
                         console.log("Found : " + data.id);\r
                         $scope.link = data;\r
+                                               $('#linkdropdown').val(data.logicalType);\r
                         $("#myModal").modal();\r
                         dataFound = true;\r
                     }\r
@@ -1133,6 +1195,10 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             };\r
 \r
             $('#myModal #controller').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
+                       \r
+                       var dropdownResponse=[{"serviceTemplateId":"meCtrl","templateName":"mecontroller1"},{"serviceTemplateId":"meCtrl2","templateName":"mecontroller"}];\r
+                       var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
+            document.getElementById("medropdown").innerHTML = dropdownInfo;\r
 \r
             var neController = {"ErrMsg" :     {"errmsg" : "IP Address is required.", "modalVar":"ne.controller"}};\r
             $('#myModal #controller').append($compile(Mustache.to_html(text, neController.ErrMsg))($scope));\r
@@ -1155,7 +1221,8 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             }, { counts:[5, 10, 20, 50], dataset: $scope.data});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                angular.forEach($scope.data, function(item) {\r
+                                $scope.checkboxes.items = [];\r
+                angular.forEach($scope.neTableParams.data, function(item) {\r
                     if (angular.isDefined(item.id)) {\r
                         $scope.checkboxes.items[item.id] = value;\r
                     }\r
@@ -1163,6 +1230,18 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             });\r
 \r
         }\r
+               \r
+               function translateToDropdownInfo(dropdowndata) {\r
+            var options = '<option value="select">--select--</option>';\r
+            var i;\r
+            for (i = 0; i < dropdowndata.length; i += 1) {\r
+                var option = '<option value="' + dropdowndata[i].serviceTemplateId + '">' + dropdowndata[i].templateName\r
+                    + '</option>';\r
+                options = options + option;\r
+            }\r
+\r
+            return options;\r
+        } \r
 \r
 \r
         $scope.validatetextboxName = function (value){\r
@@ -1248,7 +1327,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 "msg": "Do you really wanted to Delete?.",\r
                 "buttons": [\r
                     {\r
-                        "text": "OK", "action": "deleteConfirmation("+id+")"\r
+                        "text": "OK", "action": "deleteConfirmation('"+[id]+"')"\r
                     }]\r
             }};\r
             angular.forEach($scope.checkboxes.items, function(value) {\r
@@ -1266,7 +1345,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             console.log("data in ne data is :");\r
             $log.info($scope.data.neData);\r
             var deleteArr = [];\r
-            if (typeof id !== "undefined") {\r
+            if (id) {\r
 \r
                 deleteArr.push(id);\r
             }\r
@@ -1299,6 +1378,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                     if (data.id == id) {\r
                         console.log("Found : " + data.id);\r
                         $scope.ne = data;\r
+                                               $('#medropdown').val(data.controller);\r
                         $("#myModal").modal();\r
                         dataFound = true;\r
                     }\r
@@ -1402,7 +1482,10 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             }, { counts:[5, 10, 20, 50], dataset: $scope.data.datacenterData});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                angular.forEach($scope.data.datacenterData, function(item) {\r
+                                 $scope.checkboxes.items = [];\r
+\r
+                angular.forEach($scope.neTableParams.data, function(item) {\r
+                                       \r
                     if (angular.isDefined(item.Id)) {\r
                         $scope.checkboxes.items[item.Id] = value;\r
                     }\r
@@ -1492,7 +1575,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 "msg": "Do you really wanted to Delete?.",\r
                 "buttons": [\r
                     {\r
-                        "text": "OK", "action": "deleteConfirmation("+id+")"\r
+                        "text": "OK", "action": "deleteConfirmation('"+[id]+"')"\r
                     }]\r
             }};\r
             angular.forEach($scope.checkboxes.items, function(value) {\r
@@ -1510,7 +1593,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             console.log("data in datacenter data is :");\r
             $log.info($scope.data.datacenter);\r
             var deleteArr = [];\r
-            if (typeof id !== "undefined"){\r
+            if (id){\r
 \r
                 deleteArr.push(id);\r
             }\r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
index e28abfc..f026935 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
@@ -94,6 +94,7 @@
                     <div class="form-group row">\r
                         <label class="col-xs-4 col-form-label">Type</label>\r
                         <div id="logicalType" class="col-xs-8" >\r
+                                                <select id="linkdropdown" class="form-control inputfield" ng-model="siteData.optSelect" ng-options="item.templateName for item in optionsValue"></select>\r
                         </div>\r
                     </div>\r
                     <div class="form-group row">\r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
index 45f5da3..a1422f0 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
@@ -104,6 +104,7 @@
                     <div class="form-group row">\r
                         <label class="col-xs-4 col-form-label">Controller</label>\r
                         <div id="controller" class="col-xs-8" >\r
+                                               <select id="medropdown" class="form-control inputfield" ng-model="meData.optSelect" ng-options="item.templateName for item in optionsValue"></select>\r
                         </div>\r
                     </div>\r
                     <div class="form-group row">\r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
index 09cf3a6..d3e6322 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
@@ -100,6 +100,7 @@
                 <div class="form-group row">\r
                     <label class="col-xs-4 col-form-label">Type</label>\r
                     <div id="logicalType" class="col-xs-8" >\r
+                                        <select id="portdropdown" class="form-control inputfield" ng-model="siteData.optSelect" ng-options="item.templateName for item in optionsValue"></select>\r
                     </div>\r
                 </div>\r
                 <div class="form-group row">\r
@@ -110,6 +111,7 @@
                 <div class="form-group row">\r
                     <label class="col-xs-4 col-form-label">Edge Point</label>\r
                     <div id="isEdgePoint" class="col-xs-8" >\r
+                                       <select id="portEdropdown" class="form-control inputfield" ng-model="siteData.optSelect" ng-options="item.templateName for item in optionsValue"></select>\r
                     </div>\r
                 </div>\r
                 <div class="form-group row">\r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
index fb25066..8625843 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
@@ -80,8 +80,9 @@
                         </div>\r
                     </div>\r
                     <div class="form-group row">\r
-                        <label class="col-xs-4 col-form-label">Tenant name</label>\r
+                        <label class="col-xs-4 col-form-label">Type</label>\r
                         <div id="tenantID" class="col-xs-8" >\r
+                                                <select id="sitedropdown" class="form-control inputfield" ng-model="siteData.optSelect" ng-options="item.templateName for item in optionsValue"></select>\r
                         </div>\r
                     </div>\r
                     <div class="form-group row">\r