From c2a383d60a85980b305c41d7cf00a3ab723be5aa Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Mon, 29 Oct 2018 11:52:40 +0800
Subject: [PATCH] =?UTF-8?q?functions=20ui=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/manage.html                       |  4 +-
 src/main/ui/static/citypartner/citypartner.js |  4 +-
 .../templates/citypartner_registers.html      |  2 +-
 .../ui/static/config/sysconfigs/sysconfigs.js |  9 ++-
 .../templates/permission_functions.html       | 81 +++++++++++++++++--
 .../ui/static/menu/templates/main_menu.html   |  4 +-
 .../partner/templates/partners_apply.html     |  4 +-
 7 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index cc64cd928..8f6e7fcae 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -735,8 +735,8 @@ margin-bottom: 10%;"/>
                     </p>
                     <ul class="sidebar-menu" ng-class="{'active':cityPartner}">
                         <li ui-sref-active="active"
-                            ng-if="'org'|withModule">
-                            <a ui-sref="newOrganizations" ui-sref-opts="{reload:true}">
+                            ng-if="'citypartner'|withModule">
+                            <a ui-sref="citypartner_reg" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-tv"></i> <span>合伙人申请</span>
                             </a>
                         </li>
diff --git a/src/main/ui/static/citypartner/citypartner.js b/src/main/ui/static/citypartner/citypartner.js
index fd3504804..6d3372506 100644
--- a/src/main/ui/static/citypartner/citypartner.js
+++ b/src/main/ui/static/citypartner/citypartner.js
@@ -5,8 +5,8 @@ define(['angular'], function (angular) {
     'use strict';
     var app = angular.module('citypartner', ['ui.router']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('partner_apply.citypartner_reg', {
-            url: '/citypartner_registries',
+        $stateProvider.state('citypartner_reg', {
+            url: '/partner/apply/citypartner_registries',
             templateUrl: '/static/citypartner/templates/citypartner_registers.html',
             controller: 'citypartnerRegisterListCtrl'
         })
diff --git a/src/main/ui/static/citypartner/templates/citypartner_registers.html b/src/main/ui/static/citypartner/templates/citypartner_registers.html
index 654e2e58a..447bec37f 100644
--- a/src/main/ui/static/citypartner/templates/citypartner_registers.html
+++ b/src/main/ui/static/citypartner/templates/citypartner_registers.html
@@ -2,7 +2,7 @@
     <h1>City Partners</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-users"></i> Payment
+            <i class="fa fa-users"></i> Framework
         </li>
         <li class="active">
             City Partners
diff --git a/src/main/ui/static/config/sysconfigs/sysconfigs.js b/src/main/ui/static/config/sysconfigs/sysconfigs.js
index 04a216864..bb71c95ce 100644
--- a/src/main/ui/static/config/sysconfigs/sysconfigs.js
+++ b/src/main/ui/static/config/sysconfigs/sysconfigs.js
@@ -253,7 +253,14 @@ define(['angular', 'uiRouter'], function (angular) {
                 }).result.then(function () {
                     $scope.loadFunctions();
                 })
-            }
+            };
+            $scope.tabModuleName = 'no_module';
+            $scope.moduleTab = function(moduleName) {
+                $scope.tabModuleName = moduleName;
+            };
+            $scope.filterModFunctions = function (module) {
+                return module.module_name === $scope.tabModuleName;
+            };
         }]
     );
     app.controller('permissionChooseModuleDialogCtrl', ['$scope', '$http', 'modules', function ($scope, $http, modules) {
diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_functions.html b/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
index e2d256925..20f105af7 100644
--- a/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
+++ b/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
@@ -6,6 +6,73 @@
     </div>
 </div>
 
+<div class="row">
+    <div class="col-sm-3">
+        <a ng-if="modFunctions.no_module.length" ng-class="{active:'no_module'==tabModuleName}" ng-click="moduleTab('no_module')" role="button" class="list-group-item" >Functions With No Modules</a>
+        <a role="button" class="list-group-item" ng-class="{active:mod.module_name==tabModuleName}" ng-click="moduleTab(mod.module_name)" ng-repeat="mod in modFunctions.modules" ng-bind="mod.module_name+' - '+mod.remark"></a>
+    </div>
+    <div class="col-sm-9">
+        <table class="table table-hover">
+            <tbody ng-if="'no_module'==tabModuleName">
+                <tr ng-repeat="func in modFunctions.no_module">
+                    <th ng-bind="func.func_id+(func.remark?'('+func.remark+')':'')" title="{{func.remark}}"></th>
+                    <!--<td ng-bind="func.uri+'['+func.req_methods+']'" title="{{func.remark}}"></td>-->
+                    <!--<td ng-bind="func.name"></td>-->
+                    <td>
+                        <i class="fa fa-user-secret" title="Administrator" ng-class="{'text-green':func.admin,'text-gray':!func.admin}"></i>
+                        <i class="fa fa-eye" title="Compliance" ng-class="{'text-green':func.operator,'text-gray':!func.operator}"></i>
+                        <i class="fa fa-crosshairs" title="BD User" ng-class="{'text-green':func.bd,'text-gray':!func.bd}"></i>
+                        <i class="fa fa-balance-scale" title="Accountant" ng-class="{'text-green':func.finacial,'text-gray':!func.finacial}"></i>
+                        <i class="fa fa-tty" title="Service" ng-class="{'text-green':func.sevant,'text-gray':!func.servant}"></i>
+                        <!--<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':func.accountmanager,'text-gray':!func.accountmanager}"></i>-->
+                        <i class="fa fa-line-chart" title="Director" ng-class="{'text-green':func.director,'text-gray':!func.director}"></i>
+                        <i class="fa fa-map-o" title="Markting" ng-class="{'text-green':func.sitemanager,'text-gray':!func.sitemanager}"></i>
+                        <i class="fa fa-code" title="Developer" ng-class="{'text-green':func.developer,'text-gray':!func.developer}"></i>
+                        <i class="fa fa-male" title="BD Leader" ng-class="{'text-green':func.bdleader,'text-gray':!func.bdleader}"></i>
+                        <i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':func.riskmanager,'text-gray':!func.riskmanager}"></i>
+                        <i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':func.guest,'text-gray':!func.guest}"></i>
+                        <!--<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>-->
+                        <i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':func.salesmanager,'text-gray':!func.salesmanager}"></i>
+                        <!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>-->
+                    </td>
+                    <td>
+                        <a role="button" ng-click="moveFunction(func)" title="Move"><i class="fa fa-arrows"></i></a>
+                        <a role="button" ng-click="editFunctionInfo(func)" title="Edit"><i class="fa fa-edit"></i></a>
+                    </td>
+                </tr>
+            </tbody>
+            <tbody ng-repeat="mod in modFunctions.modules | filter:filterModFunctions" ng-if="'no_module'!=tabModuleName">
+                <tr ng-repeat="func in mod.funcs">
+                    <th ng-bind="func.func_id+(func.remark?'('+func.remark+')':'')" title="{{func.remark}}"></th>
+                    <!--<td ng-bind="func.uri+'['+func.req_methods+']'" title="{{func.remark}}"></td>-->
+                    <!--<td ng-bind="func.name"></td>-->
+                    <td>
+                        <i class="fa fa-user-secret" title="Administrator" ng-class="{'text-green':func.admin,'text-gray':!func.admin}"></i>
+                        <i class="fa fa-eye" title="Compliance" ng-class="{'text-green':func.operator,'text-gray':!func.operator}"></i>
+                        <i class="fa fa-crosshairs" title="BD User" ng-class="{'text-green':func.bd,'text-gray':!func.bd}"></i>
+                        <i class="fa fa-balance-scale" title="Accountant" ng-class="{'text-green':func.finacial,'text-gray':!func.finacial}"></i>
+                        <i class="fa fa-tty" title="Service" ng-class="{'text-green':func.sevant,'text-gray':!func.servant}"></i>
+                        <!--<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':func.accountmanager,'text-gray':!func.accountmanager}"></i>-->
+                        <i class="fa fa-line-chart" title="Director" ng-class="{'text-green':func.director,'text-gray':!func.director}"></i>
+                        <i class="fa fa-map-o" title="Markting" ng-class="{'text-green':func.sitemanager,'text-gray':!func.sitemanager}"></i>
+                        <i class="fa fa-code" title="Developer" ng-class="{'text-green':func.developer,'text-gray':!func.developer}"></i>
+                        <i class="fa fa-male" title="BD Leader" ng-class="{'text-green':func.bdleader,'text-gray':!func.bdleader}"></i>
+                        <i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':func.riskmanager,'text-gray':!func.riskmanager}"></i>
+                        <i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':func.guest,'text-gray':!func.guest}"></i>
+                        <!--<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>-->
+                        <i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':func.salesmanager,'text-gray':!func.salesmanager}"></i>
+                        <!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>-->
+                    </td>
+                    <td>
+                        <a role="button" ng-click="moveFunction(func)" title="Move"><i class="fa fa-arrows"></i></a>
+                        <a role="button" ng-click="editFunctionInfo(func)" title="Edit"><i class="fa fa-edit"></i></a>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
+<!--
 <div class="panel panel-warning" ng-if="modFunctions.no_module.length">
     <div class="panel-heading">Functions With No Modules</div>
     <div class="panel-body table-responsive">
@@ -21,16 +88,16 @@
                     <i class="fa fa-crosshairs" title="BD User" ng-class="{'text-green':func.bd,'text-gray':!func.bd}"></i>
                     <i class="fa fa-balance-scale" title="Accountant" ng-class="{'text-green':func.finacial,'text-gray':!func.finacial}"></i>
                     <i class="fa fa-tty" title="Service" ng-class="{'text-green':func.sevant,'text-gray':!func.servant}"></i>
-                    <!--<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':func.accountmanager,'text-gray':!func.accountmanager}"></i>-->
+                    &lt;!&ndash;<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':func.accountmanager,'text-gray':!func.accountmanager}"></i>&ndash;&gt;
                     <i class="fa fa-line-chart" title="Director" ng-class="{'text-green':func.director,'text-gray':!func.director}"></i>
                     <i class="fa fa-map-o" title="Markting" ng-class="{'text-green':func.sitemanager,'text-gray':!func.sitemanager}"></i>
                     <i class="fa fa-code" title="Developer" ng-class="{'text-green':func.developer,'text-gray':!func.developer}"></i>
                     <i class="fa fa-male" title="BD Leader" ng-class="{'text-green':func.bdleader,'text-gray':!func.bdleader}"></i>
                     <i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':func.riskmanager,'text-gray':!func.riskmanager}"></i>
                     <i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':func.guest,'text-gray':!func.guest}"></i>
-                    <!--<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>-->
+                    &lt;!&ndash;<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>&ndash;&gt;
                     <i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':func.salesmanager,'text-gray':!func.salesmanager}"></i>
-                    <!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>-->
+                    &lt;!&ndash;<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>&ndash;&gt;
                 </td>
                 <td>
                     <a role="button" ng-click="moveFunction(func)" title="Move"><i class="fa fa-arrows"></i></a>
@@ -55,16 +122,16 @@
                     <i class="fa fa-crosshairs" title="BD User" ng-class="{'text-green':func.bd,'text-gray':!func.bd}"></i>
                     <i class="fa fa-balance-scale" title="Accountant" ng-class="{'text-green':func.finacial,'text-gray':!func.finacial}"></i>
                     <i class="fa fa-tty" title="Service" ng-class="{'text-green':func.sevant,'text-gray':!func.servant}"></i>
-                    <!--<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':func.accountmanager,'text-gray':!func.accountmanager}"></i>-->
+                    &lt;!&ndash;<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':func.accountmanager,'text-gray':!func.accountmanager}"></i>&ndash;&gt;
                     <i class="fa fa-line-chart" title="Director" ng-class="{'text-green':func.director,'text-gray':!func.director}"></i>
                     <i class="fa fa-map-o" title="Markting" ng-class="{'text-green':func.sitemanager,'text-gray':!func.sitemanager}"></i>
                     <i class="fa fa-code" title="Developer" ng-class="{'text-green':func.developer,'text-gray':!func.developer}"></i>
                     <i class="fa fa-male" title="BD Leader" ng-class="{'text-green':func.bdleader,'text-gray':!func.bdleader}"></i>
                     <i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':func.riskmanager,'text-gray':!func.riskmanager}"></i>
                     <i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':func.guest,'text-gray':!func.guest}"></i>
-                    <!--<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>-->
+                    &lt;!&ndash;<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>&ndash;&gt;
                     <i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':func.salesmanager,'text-gray':!func.salesmanager}"></i>
-                    <!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>-->
+                    &lt;!&ndash;<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>&ndash;&gt;
                 </td>
                 <td>
                     <a role="button" ng-click="moveFunction(func)" title="Move"><i class="fa fa-arrows"></i></a>
@@ -74,4 +141,4 @@
             </tbody>
         </table>
     </uib-accordion-group>
-</uib-accordion>
\ No newline at end of file
+</uib-accordion>-->
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 7ead3f4da..bad6e7a04 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -316,8 +316,8 @@
                 </div>
             </div>
             <div class="row">
-                <div ng-if="'org'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="newOrganizations" ui-sref-opts="{reload:true}">
+                <div ng-if="'citypartner'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="citypartner_reg" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/partner_application.png"/>
                         <div class="description-text">
diff --git a/src/main/ui/static/payment/partner/templates/partners_apply.html b/src/main/ui/static/payment/partner/templates/partners_apply.html
index 9bb316e93..e05375a16 100644
--- a/src/main/ui/static/payment/partner/templates/partners_apply.html
+++ b/src/main/ui/static/payment/partner/templates/partners_apply.html
@@ -19,9 +19,9 @@
                     <li ui-sref-active="active" ng-if="'simpleApplyApp'|withModule">
                         <a ui-sref="partner_apply.simple_application"> <span>Application & Open</span></a>
                     </li>
-                    <li ui-sref-active-eq="active" ng-if="'citypartner'|withModule">
+                    <!--<li ui-sref-active-eq="active" ng-if="'citypartner'|withModule">
                         <a ui-sref="partner_apply.citypartner_reg"><i class="fa fa-tv"></i> <span>City Partners</span></a>
-                    </li>
+                    </li>-->
                 </ul>
             </div>
         </div>