From 1b77476dcfb2fc267f3d48cd91b9caeae59283d8 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 03 11월 2021 11:13:36 +0900
Subject: [PATCH] - 사용자 등급관리 프론트 수정
---
src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js | 4 +-
src/main/java/kr/wisestone/owl/constant/Constants.java | 1
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 65 +++++++++++++++++++++++++++++++-
3 files changed, 65 insertions(+), 5 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/constant/Constants.java b/src/main/java/kr/wisestone/owl/constant/Constants.java
index 3342dd0..da9550e 100644
--- a/src/main/java/kr/wisestone/owl/constant/Constants.java
+++ b/src/main/java/kr/wisestone/owl/constant/Constants.java
@@ -13,5 +13,4 @@
public static final String SESSION_ACCOUNT = "account";
public static final String EXCEL = "excel";
public static final String SESSION_EXPIRE_REDIRECT_URL = "/#/login";
- public static final String ADMIN_MANAGER = "admin";
}
diff --git a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
index 7cd2fb2..ccf534a 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
@@ -42,10 +42,10 @@
}
// �뤌 �쟾�넚
- function formSubmit(condistion) {
+ function formSubmit(condition) {
$rootScope.spinner = true;
- UserWorkspace.levelAdd($resourceProvider.getContent(condistion,
+ UserWorkspace.levelAdd($resourceProvider.getContent(condition,
$resourceProvider.getPageContent(0, 0))).then(function (result) {
if (result.data.message.status === "success") {
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index 12fae15..fb39d05 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -9,8 +9,8 @@
],
function (app, angular) {
app.controller('workspaceUserLevelController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$q', '$state', '$tableProvider', 'Payment', 'Workspace',
- 'UserWorkspace', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $q, $state, $tableProvider, Payment, Workspace, UserWorkspace, $filter) {
+ 'UserWorkspace', '$filter','$timeout',
+ function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $q, $state, $tableProvider, Payment, Workspace, UserWorkspace, $filter, $timeout) {
/* $scope.fn �긽�냽 以� */
@@ -19,6 +19,8 @@
$scope.fn.initSearch = initSearch; // 寃��깋 議곌굔 珥덇린�솕
$scope.fn.levelAdd = levelAdd; // �벑湲� 異붽�
$scope.fn.removes = removes; // �궗�슜�옄 �벑湲� �궘�젣
+ $scope.fn.getPageList = getPageList; // 紐⑸줉 議고쉶
+ $scope.fn.listView = listView; // 紐⑸줉 �솕硫댁쑝濡� 蹂�寃�
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
@@ -46,6 +48,65 @@
$scope.fn.getUserLevelList(0);
});
+ // �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
+ function getPageList(selectedPage, detail = false) {
+ if (selectedPage < 0) {
+ selectedPage = 0;
+ }
+ // �쁽�옱 �럹�씠吏� �젙蹂�
+ var currentPage = 0;
+
+ // 荑좏궎�뿉 �꽑�깮�븳 �럹�씠吏� �젙蹂닿� �뾾�쑝硫� 湲곕낯 �럹�씠吏� �젙蹂� 0 �쓣 ���옣
+ if (angular.isUndefined(selectedPage) || selectedPage === "") {
+ currentPage = $scope.vm.page.selectedPage;
+ }
+ else {
+ currentPage = selectedPage;
+ }
+
+
+ // 寃��깋 議곌굔�쓣 ���옣�븳�떎.
+ //$scope.fn.makeVmSearchObject();
+
+
+ // �쁽�옱 �꽑�깮�맂 �봽濡쒖젥�듃瑜� 寃��깋 湲곕낯�쑝濡� 異붽�
+ if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
+ var find = findProjectSearch($rootScope.workProject.id);
+ if (!find) {
+ $scope.vm.projects.push($rootScope.workProject);
+ }
+ }
+
+ // �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎.
+ var conditions = $scope.fn.makeSearchConditions();
+
+ Issue.find($resourceProvider.getContent(conditions,
+ $resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $scope.vm.page.selectedPage = currentPage + 1;
+ $scope.vm.responseData = result.data;
+ if (detail) {
+ changeDetailView(result.data.data[0].id);
+ }
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // �씠�뒋 議고쉶 �떎�뙣
+ }
+ });
+ }
+
+ // 紐⑸줉 �솕硫댁쑝濡� 蹂�寃쏀븳�떎.
+ function listView() {
+ $scope.vm.detailView = false;
+ // �씠�뒋 �뀒�씠釉� �꽕�젙
+ $scope.fn.makeTableConfigs();
+ var temp = angular.copy($scope.vm.responseData.data);
+ $scope.vm.responseData.data = angular.copy(temp);
+ // 留덉�留됱쑝濡� 蹂닿퀬�엳�뜕 �씠�뒋 id瑜� 珥덇린�솕�븳�떎.
+ $rootScope.currentDetailIssueId = null;
+ }
+
// �궗�슜�옄 �벑湲� �궘�젣
function removes() {
var removeIds = [];
--
Gitblit v1.8.0