From 23eb90bb1966d755db23025489fc56a75dac6d2a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 04 11월 2021 18:55:10 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js |   75 ++++++++++++++++++++++++++++++++++---
 1 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
index bf562b0..51cd538 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
@@ -46,6 +46,7 @@
                     selectedPageRowCount : String(10)
                 };
 
+                $scope.vm.levels = [];
                 $scope.vm.tableConfigs = [];
                 $scope.vm.responseData = {
                     data : []
@@ -53,11 +54,34 @@
 
                 //  �뀒�씠釉� �씠踰ㅽ듃
                 $scope.vm.tableEvent = {
-                    modifyUserWorkspace : modifyUserWorkspace   //  �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+                    modifyUserWorkspace : modifyUserWorkspace,   //  �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+                    modifyLevel : modifyLevel,   //  �궗�슜�옄 �벑湲됰챸 蹂�寃�
+                    //modifyDepartment : modifyDepartment //  遺��꽌 蹂�寃�
                 };
 
-                //  寃곗젣 �긽�꽭 �젙蹂�
+                //  �궗�슜�옄 �벑湲� �닔�젙
+                function modifyLevel(id) {
+                    $uibModal.open({
+                        templateUrl : 'views/workspace/workspaceLevelModify.html',
+                        size : "md",
+                        controller : 'levelModifyController',
+                        backdrop : 'static',
+                        resolve : {
+                            parameter : function () {
+                                return {
+                                    id : id,
+                                    //levelName : [$scope.vm.form.]
+                                };
+                            }
+                        }
+                    });
+                }
+
+                //  �긽�꽭 �젙蹂�
                 $scope.$on("getUserWorkspaceList", function () {
+                    $scope.fn.getLevels();
+                    $scope.fn.getDepartments();
+                    $scope.fn.makeTableConfigs();
                     $scope.fn.getUserWorkspaceList(0);
                 });
 
@@ -82,7 +106,8 @@
                     $scope.vm.search.name = "";
                     $scope.vm.search.account = "";
                     $scope.vm.search.statuses = [];
-                    $scope.vm.search.level = [];
+                    $scope.vm.search.levels = [];
+                    $scope.vm.search.departments = [];
                     $scope.fn.getUserWorkspaceList(0);
                 }
 
@@ -156,6 +181,24 @@
 
                             return statuses;
                         })(),
+                        levels : (function () {
+                            var levels = [];
+
+                            angular.forEach($scope.vm.search.levels, function (level) {
+                                levels.push(level.fieldKey);
+                            });
+
+                            return levels;
+                        })(),
+                        departments : (function () {
+                            var departments = [];
+
+                            angular.forEach($scope.vm.search.departments, function (department) {
+                                departments.push(department.fieldKey);
+                            });
+
+                            return departments;
+                        })(),
                     };
 
                     UserWorkspace.find($resourceProvider.getContent(conditions,
@@ -164,6 +207,14 @@
                         if (result.data.message.status === "success") {
                             $scope.vm.page.selectedPage = currentPage + 1;
                             $scope.vm.responseData = result.data;
+
+                            var idx = 0;
+                            angular.forEach($scope.vm.responseData.data, function (data) {
+                                data.levelId = 3; /*$scope.vm.levels[idx].id;*/
+                                data.levels = [];
+                                data.levels = $scope.vm.levels.slice();
+                                idx++;
+                            });
                         }
                         else {
                             SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣"
@@ -174,12 +225,19 @@
                 //  �벑湲� 紐⑸줉
                 function getLevels() {
                     var deferred = $q.defer();
+                    $scope.vm.levels = [];
 
                     UserWorkspace.levelFind($resourceProvider.getContent({},
                         $resourceProvider.getPageContent(0, 1000))).then(function (result) {
 
                         if (result.data.message.status === "success") {
                             $scope.vm.search.levels = result.data.data;
+                            angular.forEach(result.data.data, function (level) {
+                                $scope.vm.levels.push({
+                                    fieldKey : level.id,
+                                    fieldValue : level.levelName
+                                });
+                            });
                         }
                         else {
                             SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message, "error"); // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣
@@ -191,7 +249,7 @@
                     return deferred.promise;
                 }
 
-                //  遺��꽌 紐⑸줉
+                // 遺��꽌 紐⑸줉
                 function getDepartments() {
                     var deferred = $q.defer();
 
@@ -200,6 +258,12 @@
 
                         if (result.data.message.status === "success") {
                             $scope.vm.search.departments = result.data.data;
+                            angular.forEach(result.data.data, function (department) {
+                                $scope.vm.departments.push({
+                                    fieldKey : department.id,
+                                    fieldValue : department.departmentName
+                                });
+                            });
                         }
                         else {
                             SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message, "error"); // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣
@@ -210,9 +274,6 @@
 
                     return deferred.promise;
                 }
-
-                // $scope.fn.makeTableConfigs();
-                // $scope.fn.getUserWorkspaceList();
             }
         ]);
     }

--
Gitblit v1.8.0