From 69b42e5bab73a5bfc3e0d4ddc660877b0bc08c05 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 04 11월 2021 10:39:01 +0900
Subject: [PATCH] 사용자 등급 추가 오류 수정
---
src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js | 148 ++++++++++++++-----------------------------------
1 files changed, 43 insertions(+), 105 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
index afca607..1045f3c 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
@@ -8,93 +8,59 @@
'angular'
],
function (app, angular) {
- app.controller('workspaceLevelAddController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$uibModalInstance', '$state', 'Workspace', '$filter', 'parameter', '$timeout',
- function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $uibModalInstance, Payment, $filter, parameter, $timeout) {
+ app.controller('workspaceLevelAddController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$uibModalInstance', 'UserWorkspace', 'Workspace', '$filter', 'parameter',
+ function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $uibModalInstance, UserWorkspace, Workspace, $filter, parameter) {
$scope.fn = {
- //add : add, // �벑湲� 異붽�
cancel : cancel, // �뙘�뾽 李� �떕湲�
+ formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
- formSubmit : formSubmit
+ modifyUserPermission : modifyUserPermission // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
};
$scope.vm = {
form : {
- /*workspaceId : parameter.workspaceId,
- usdKrw : parameter.usdKrw,
- maxUser : parameter.maxUser,
- buyUser : "",
- type : "MONTH",
- cardNumber1 : "",
- cardNumber2 : "",
- cardNumber3 : "",
- cardNumber4 : "",
- expireMonth : "",
- expireYear : "",
- expireYearTmp : "",
- birth : "",
- cardPwd : "",
- paymentAmountTemp : "", // �겢�씪�씠�뼵�듃�뿉�꽌 �궗�슜�옄 �닔瑜� 蹂�寃쏀븷 �븣 蹂댁뿬以� 寃곗젣 湲덉븸 - 湲덉븸�� �꽌踰꾩뿉�꽌 �떎�떆 怨꾩궛�븳�떎.
- confirm : false // �빟愿� �룞�쓽*/
- },
- viewAgreeTerm : false
+ levelName : "",
+ permWorkspaceSetting : false,
+ permProjectSetting : false,
+ permIssueSetting : false,
+ permApi : false,
+ permNotice : false,
+ permFAQ : false,
+ permQnA : false,
+ permGuide : false
+ }
};
- // �궗�슜�옄 媛�寃� 蹂닿린
- /*$scope.$watch("vm.form.buyUser", function (newValue) {
-
- if ($rootScope.isDefined(newValue)) {
- var totalAmount = (BILLING_AMOUNT * $scope.vm.form.usdKrw * newValue);
- var discount = 0;
-
- if (newValue > 99) {
- var sale = newValue * 0.01;
- discount = (totalAmount * (sale/100));
- }
-
- $scope.vm.form.paymentAmountTemp = Math.floor(totalAmount - discount);
+ // �뤌 泥댄겕
+ function formCheck(formInvalid) {
+ if (formInvalid) {
+ return true;
}
- else {
- $scope.vm.form.paymentAmountTemp = 0;
- }
- });*/
+
+ return false;
+ }
// �뤌 �쟾�넚
- /*function formSubmit() {
+ function formSubmit(condition) {
$rootScope.spinner = true;
- $scope.vm.form.expireYear = "20" + $scope.vm.form.expireYearTmp;
- var content = angular.copy($scope.vm.form);
+ UserWorkspace.levelAdd($resourceProvider.getContent(condition,
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
- // �븫�샇�솕 �떆媛꾨룞�븞 �봽濡쒓렇�옒�뒪諛� 紐살삱由щ뒗 �쁽�긽 �닔�젙
- $timeout(function () {
- content.cardNumber1 = $rootScope.encryption($scope.vm.form.cardNumber1);
- content.cardNumber2 = $rootScope.encryption($scope.vm.form.cardNumber2);
- content.cardNumber3 = $rootScope.encryption($scope.vm.form.cardNumber3);
- content.cardNumber4 = $rootScope.encryption($scope.vm.form.cardNumber4);
- content.expireMonth = $rootScope.encryption($scope.vm.form.expireMonth);
- content.expireYear = $rootScope.encryption($scope.vm.form.expireYear);
- content.cardPwd = $rootScope.encryption($scope.vm.form.cardPwd);
- content.birth = $rootScope.encryption($scope.vm.form.birth);
+ if (result.data.message.status === "success") {
+ $scope.fn.cancel();
+ // 紐⑸줉 �솕硫� 媛깆떊
+ $rootScope.$broadcast("getUserLevelList", {});
+ }
+ else {
+ SweetAlert.error($filter("translate")("managementWorkspace.failedLevelRegistration"), result.data.message.message);
+ }
- Payment.immediateAddUser($resourceProvider.getContent(
- content,
- $resourceProvider.getPageContent(0, 10))).then(function (result) {
- if (result.data.message.status === "success") {
- $scope.fn.cancel();
- SweetAlert.success($filter("translate")("managementWorkspace.paymentCompleted"), result.data.message.message); // "異붽� 寃곗젣 �꽦怨�"
- // 寃곗젣 諛� �뾽臾� 怨듦컙 �젙蹂� �솕硫� 媛깆떊
- $rootScope.$broadcast("findMyWorkspace", {});
- $rootScope.$broadcast("getPaymentDetail", {});
- }
- else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedToRegularPaymentChange"), result.data.message.message); // "異붽� 寃곗젣 �떎�뙣"
- }
+ $rootScope.spinner = false;
+ });
- $rootScope.spinner = false;
- });
- }, 100);
- }*/
+ }
// �뙘�뾽 李� �떕湲�
function cancel() {
@@ -103,44 +69,16 @@
$(document).unbind("keydown"); // �떒異뺥궎 �씠踰ㅽ듃 �젣嫄�
}
- // �궗�슜�옄 �닔 蹂�寃�
- /*function changeBuyUser(changeType) {
- if (changeType === "PLUS") {
- if ($scope.vm.form.buyUser < 999) {
- $scope.vm.form.buyUser++;
+ function modifyUserPermission(userPermission ) {
+ UserWorkspace.levelModify($resourceProvider.getContent(userPermission,
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
+ if (result.data.message.status === "success") {
}
- }
- else {
- if ($scope.vm.form.buyUser > 1) {
- $scope.vm.form.buyUser--;
+ else {
+ SweetAlert.error($filter("translate")("managementWorkspace.failedToParticipationStatusChange"), result.data.message.message); // "李몄뿬 �긽�깭 蹂�寃� �떎�뙣"
}
- }
- }*/
-
- // �뤌 泥댄겕
- /*function formCheck() {
- if (!$scope.vm.form.confirm) {
- return true;
- }
-
- if (!$rootScope.isDefined($scope.vm.form.cardNumber1) || !$rootScope.isDefined($scope.vm.form.cardNumber2) || !$rootScope.isDefined($scope.vm.form.cardNumber3)
- || !$rootScope.isDefined($scope.vm.form.cardNumber4) || !$rootScope.isDefined($scope.vm.form.expireMonth) || !$rootScope.isDefined($scope.vm.form.expireYearTmp)
- || !$rootScope.isDefined($scope.vm.form.birth) || !$rootScope.isDefined($scope.vm.form.cardPwd) || !$rootScope.isDefined($scope.vm.form.type)) {
- return true;
- }
-
- if ($scope.vm.form.cardNumber1.length !== 4 || $scope.vm.form.cardNumber2.length !== 4 || $scope.vm.form.cardNumber3.length !== 4 || $scope.vm.form.cardNumber4.length !== 4
- || $scope.vm.form.expireMonth.length !== 2 || $scope.vm.form.expireYearTmp.length !== 2 || $scope.vm.form.birth.length < 6 || $scope.vm.form.cardPwd.length !== 2) {
- return true;
- }
-
- // �궗�슜�옄 �닔�뒗 1紐� �씠�긽�씠�뼱�빞 �븳�떎.
- if ($scope.vm.form.buyUser < 1) {
- return true;
- }
-
- return false;
- }*/
+ });
+ }
}
]);
--
Gitblit v1.8.0