From bb4374510f77e501ce5de4f4b255acffbd8c2632 Mon Sep 17 00:00:00 2001
From: seshukm <seshu.kumar.m@huawei.com>
Date: Fri, 3 Mar 2017 12:33:18 +0530
Subject: Province Mgr defect fixing

GSO-241

Change-Id: I4505aa430daf2df46c4857ad9723472c2235657c
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
---
 provincemgr/src/main/webapp/provincemgr/index.html        | 11 ++++-------
 provincemgr/src/main/webapp/provincemgr/js/app.js         | 15 ++++++++++++---
 provincemgr/src/main/webapp/provincemgr/js/rest.js        |  2 +-
 .../src/main/webapp/provincemgr/templates/management.html | 12 +++++-------
 4 files changed, 22 insertions(+), 18 deletions(-)

(limited to 'provincemgr')

diff --git a/provincemgr/src/main/webapp/provincemgr/index.html b/provincemgr/src/main/webapp/provincemgr/index.html
index 8e4d9b03..f53edcca 100644
--- 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 1af3d538..b8979dd9 100644
--- 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"])
 
         $scope.closeModal = function() {
             console.log("Closing Modal...");
-            $('#managementDialog').modal('hide');
+            $('#uniModal').modal('hide');
+            console.log("@@@@@@@@@@@@@@@@@@");
+            $state.reload();
         }
 
         $scope.showAddModal = function() {
@@ -207,8 +209,15 @@ var app = angular.module("ProvinceManagementApp", ["ui.router", "ngTable"])
                         "text": "OK", "action": "deleteConfirmation("+id+")"
                     }]
             }};
-            var html = Mustache.to_html(dialog_tpl, error.err_data);
-            $($compile(html)($scope)).modal({backdrop: "static"});
+            angular.forEach($scope.checkboxes.items, function(value) {
+                if(value) {
+                    checkbox = true;
+                }
+            });
+            if (checkbox || (typeof id !== "undefined")) {
+                var html = Mustache.to_html(dialog_tpl, error.err_data);
+                $($compile(html)($scope)).modal({backdrop: "static"});
+            }
         }
 
         $scope.deleteConfirmation = function(id) {
diff --git a/provincemgr/src/main/webapp/provincemgr/js/rest.js b/provincemgr/src/main/webapp/provincemgr/js/rest.js
index 1192c848..6432ca16 100644
--- a/provincemgr/src/main/webapp/provincemgr/js/rest.js
+++ b/provincemgr/src/main/webapp/provincemgr/js/rest.js
@@ -18,7 +18,7 @@
 
 
 app.factory("provinceDataService", function($http,DataService, $log){
-    var uri = 'http://192.168.9.13:18008';
+    var uri ;//'http://192.168.9.13:18008';
     return {
         getAllProvinceData : function() {
             /*return $http({
diff --git a/provincemgr/src/main/webapp/provincemgr/templates/management.html b/provincemgr/src/main/webapp/provincemgr/templates/management.html
index 819c1534..934eff09 100644
--- 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>-->
 
 
-    <!-- Modal
-    <div id="myModal" class="modal fade" role="dialog">
+     <!--Modal-->
+    <!--<div id="managementDialog" class="modal fade" role="dialog">
         <div class="modal-dialog">
 
             &lt;!&ndash; Modal content&ndash;&gt;
@@ -67,7 +67,7 @@
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
                     <h5 class="modal-title titlestyle">Modal Header</h5>
                 </div>
-                <form name="provinceForm" method="post">&lt;!&ndash; ng-submit="saveData(province.id)"&ndash;&gt;
+                <form name="provinceForm" method="post">
                     <div class="modal-body">
 
                         <div class="form-group row">
@@ -83,7 +83,7 @@
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label for="port" class="col-xs-4 col-form-label labelstyle">Port</label>
+                            <label class="col-xs-4 col-form-label labelstyle">Port</label>
                             <div class="col-xs-8 port" >
                                 &lt;!&ndash;<input class="form-control" ng-model="province.port" type="number" value="" placeholder="Port" id="port"  required>&ndash;&gt;
 
@@ -95,9 +95,7 @@
                     </div>
 
                     <div id="footerBtns" class="modal-footer">
-                        &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;
-                        &lt;!&ndash;<input type="submit" class="btn btn-default" value="Submit"/>&ndash;&gt;
-                        &lt;!&ndash;<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>&ndash;&gt;
+
                     </div>
                 </form>
             </div>
-- 
cgit 1.2.3-korg