Province Mgr defect fixing

GSO-241

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

diff --git a/provincemgr/src/main/webapp/provincemgr/index.html b/provincemgr/src/main/webapp/provincemgr/index.html
index 8e4d9b0..f53edcc 100644 (file)
--- a/provincemgr/src/main/webapp/provincemgr/index.html
+++ b/provincemgr/src/main/webapp/provincemgr/index.html
@@ -24,19 +24,16 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Province Management</title>
     <link href="thirdparty/css/bootstrap.min.css" rel="stylesheet"/>
-    <!--Pulling Awesome Font -->
-    <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.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 rel="stylesheet"; href="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.css">
+    <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="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.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="https://code.jquery.com/ui/1.12.1/jquery-ui.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>

diff --git a/provincemgr/src/main/webapp/provincemgr/js/app.js b/provincemgr/src/main/webapp/provincemgr/js/app.js
index 1af3d53..b8979dd 100644 (file)
--- a/provincemgr/src/main/webapp/provincemgr/js/app.js
+++ b/provincemgr/src/main/webapp/provincemgr/js/app.js
@@ -135,7 +135,9 @@ var app = angular.module("ProvinceManagementApp", ["ui.router", "ngTable"])
 \r
         $scope.closeModal = function() {\r
             console.log("Closing Modal...");\r
-            $('#managementDialog').modal('hide');\r
+            $('#uniModal').modal('hide');\r
+            console.log("@@@@@@@@@@@@@@@@@@");\r
+            $state.reload();\r
         }\r
 \r
         $scope.showAddModal = function() {\r
@@ -207,8 +209,15 @@ var app = angular.module("ProvinceManagementApp", ["ui.router", "ngTable"])
                         "text": "OK", "action": "deleteConfirmation("+id+")"\r
                     }]\r
             }};\r
-            var html = Mustache.to_html(dialog_tpl, error.err_data);\r
-            $($compile(html)($scope)).modal({backdrop: "static"});\r
+            angular.forEach($scope.checkboxes.items, function(value) {\r
+                if(value) {\r
+                    checkbox = true;\r
+                }\r
+            });\r
+            if (checkbox || (typeof id !== "undefined")) {\r
+                var html = Mustache.to_html(dialog_tpl, error.err_data);\r
+                $($compile(html)($scope)).modal({backdrop: "static"});\r
+            }\r
         }\r
 \r
         $scope.deleteConfirmation = function(id) {\r

diff --git a/provincemgr/src/main/webapp/provincemgr/js/rest.js b/provincemgr/src/main/webapp/provincemgr/js/rest.js
index 1192c84..6432ca1 100644 (file)
--- a/provincemgr/src/main/webapp/provincemgr/js/rest.js
+++ b/provincemgr/src/main/webapp/provincemgr/js/rest.js
@@ -18,7 +18,7 @@
 \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
     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 819c153..934eff0 100644 (file)
--- a/provincemgr/src/main/webapp/provincemgr/templates/management.html
+++ b/provincemgr/src/main/webapp/provincemgr/templates/management.html
@@ -57,8 +57,8 @@
     <!--<div id="myTable"></div>-->\r
 \r
 \r
-    <!-- Modal\r
-    <div id="myModal" class="modal fade" role="dialog">\r
+     <!--Modal-->\r
+    <!--<div id="managementDialog" class="modal fade" role="dialog">\r
         <div class="modal-dialog">\r
 \r
             &lt;!&ndash; Modal content&ndash;&gt;\r
@@ -67,7 +67,7 @@
                     <button type="button" class="close" data-dismiss="modal">&times;</button>\r
                     <h5 class="modal-title titlestyle">Modal Header</h5>\r
                 </div>\r
-                <form name="provinceForm" method="post">&lt;!&ndash; ng-submit="saveData(province.id)"&ndash;&gt;\r
+                <form name="provinceForm" method="post">\r
                     <div class="modal-body">\r
 \r
                         <div class="form-group row">\r
@@ -83,7 +83,7 @@
                             </div>\r
                         </div>\r
                         <div class="form-group row">\r
-                            <label for="port" class="col-xs-4 col-form-label labelstyle">Port</label>\r
+                            <label class="col-xs-4 col-form-label labelstyle">Port</label>\r
                             <div class="col-xs-8 port" >\r
                                 &lt;!&ndash;<input class="form-control" ng-model="province.port" type="number" value="" placeholder="Port" id="port"  required>&ndash;&gt;\r
 \r
@@ -95,9 +95,7 @@
                     </div>\r
 \r
                     <div id="footerBtns" class="modal-footer">\r
-                        &lt;!&ndash;<button type="button" class="btn btn-default" ng-click="addData(province._id)" data-dismiss="modal" ng-disabled="provinceForm.$invalid">OK</button>&ndash;&gt;\r
-                        &lt;!&ndash;<input type="submit" class="btn btn-default" value="Submit"/>&ndash;&gt;\r
-                        &lt;!&ndash;<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>&ndash;&gt;\r
+\r
                     </div>\r
                 </form>\r
             </div>\r