From 59ebd032f941bc0a891fb4807f463f9194384e87 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 15 11월 2021 17:53:08 +0900
Subject: [PATCH] 이슈 만들기 임시 커밋 [프론트]
---
src/main/webapp/views/issue/issueCompanyFieldDetail.html | 6 +-
src/main/webapp/scripts/app/issue/issueCompanyFieldDetail.controller.js | 63 +++++++++-----------
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 55 +++++++++++++-----
3 files changed, 71 insertions(+), 53 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 887caa8..3345714 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -8,17 +8,18 @@
'angular'
],
function (app, angular) {
- app.controller('issueAddController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', '$injector',
+ app.controller('issueAddController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', '$uibModal', '$injector',
'$controller', '$tableProvider', 'SweetAlert', '$timeout', '$stateParams', '$q', 'Issue', 'User', 'AttachedFile', 'IssueType', 'Priority', 'Severity', 'IssueTypeCustomField', '$filter', '$state',
- function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, $injector, $controller, $tableProvider, SweetAlert, $timeout,
+ function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, $uibModal, $injector, $controller, $tableProvider, SweetAlert, $timeout,
$stateParams, $q, Issue, User, AttachedFile, IssueType, Priority, Severity, IssueTypeCustomField, $filter, $state) {
$scope.fn = {
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
- formCheck : formCheck, // �뤌 泥댄겕
+ // formCheck : formCheck, // �뤌 泥댄겕
getUserListCallBack : getUserListCallBack, // �떞�떦�옄 autocomplete �럹�씠吏�
getProjectListCallBack : getProjectListCallBack, // �봽濡쒖젥�듃 autocomplete �럹�씠吏�
+ getCompanyFieldListCallBack : getCompanyFieldListCallBack, // �봽濡쒖젥�듃 autocomplete �럹�씠吏�
getOptionColor : getOptionColor, // �슦�꽑�닚�쐞, 以묒슂�룄 �깋�긽�쑝濡� Select �깭洹� �쟻�슜
onFileSelect : onFileSelect, // �뙆�씪 泥⑤�
infiniteAddForm : infiniteAddForm, // 怨꾩냽 �깮�꽦
@@ -30,7 +31,8 @@
removeUploadFile : removeUploadFile, // �뾽濡쒕뱶�븯�젮�뒗 �듅�젙 �뙆�씪�쓣 �궘�젣
removeManager : removeManager, // �떞�떦�옄 �궘�젣
setIssueTypeTemplate : setIssueTypeTemplate, // �씠�뒋 �쑀�삎 �뀥�뵆由� �쟻�슜�븯湲�
- startExecute : startExecute // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
+ startExecute : startExecute, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
+ companyImport : companyImport
};
$scope.vm = {
@@ -38,6 +40,7 @@
title : "", // �젣紐�
description : "", // �궡�슜
projects : [], // �봽濡쒖젥�듃
+ companyFields : [],
issueTypeId : "", // �씠�뒋 �쑀�삎 �븘�씠�뵒
priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒
severityId : "", // 以묒슂�룄 �븘�씠�뵒
@@ -49,13 +52,22 @@
},
infiniteAdd : false, // �뿰�냽 �깮�꽦
projectName : "", // �봽濡쒖젥�듃 紐� 寃��깋
+ companyName : "", // �봽濡쒖젥�듃 紐� 寃��깋
userName : "", // �궗�슜�옄 寃��깋
+ companyManager : "", //�떞�떦�옄
+ companyTel : "", //�쟾�솕踰덊샇
+ companyEmail : "", //�씠硫붿씪
+ companyDesc : "", //鍮꾧퀬
autoCompletePage : {
user : {
page : 0,
totalPage : 0
},
project : {
+ page : 0,
+ totalPage : 0
+ },
+ companyField : {
page : 0,
totalPage : 0
}
@@ -92,6 +104,15 @@
$scope.fn.getIssueTypeCustomFields();
}
});
+
+ function companyImport() {
+ $uibModal.open({
+ templateUrl : 'views/issue/issueCompanyFieldDetail.html',
+ size : "mg",
+ controller : 'issueCompanyFieldDetailController',
+ backdrop : 'static',
+ });
+ }
// �꽟癒몃끂�듃 �씠誘몄� �뾽濡쒕뱶
function imageUpload($files) {
@@ -268,19 +289,23 @@
$scope.vm.autoCompletePage.project.totalPage = result.data.page.totalPage;
}
- // �뤌 泥댄겕
- function formCheck(formInvalid) {
- if (formInvalid) {
- return true;
- }
-
- if ($scope.vm.form.projects.length < 1) {
- return true;
- }
-
- return false;
+ function getCompanyFieldListCallBack(result) {
+ $scope.vm.autoCompletePage.project.totalPage = result.data.page.totalPage;
}
+ // �뤌 泥댄겕
+ // function formCheck(formInvalid) {
+ // if (formInvalid) {
+ // return true;
+ // }
+ //
+ // if ($scope.vm.form.projects.length < 1) {
+ // return true;
+ // }
+ //
+ // return false;
+ // }
+
// �뤌 �쟾�넚
function formSubmit() {
$rootScope.spinner = true;
diff --git a/src/main/webapp/scripts/app/issue/issueCompanyFieldDetail.controller.js b/src/main/webapp/scripts/app/issue/issueCompanyFieldDetail.controller.js
index bca5967..e15a22a 100644
--- a/src/main/webapp/scripts/app/issue/issueCompanyFieldDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueCompanyFieldDetail.controller.js
@@ -1,69 +1,66 @@
/**
- * Created by wisestone on 2018-02-19.
+ * Created by wisestone on 2017-12-15.
*/
'use strict';
define([
- 'app'
+ 'app',
+ 'angular'
],
- function (app) {
- app.controller('companyFieldAddController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$uibModalInstance', '$state', 'CompanyField', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $uibModalInstance, $state, CompanyField, $filter) {
+ function (app, angular) {
+ app.controller('issueCompanyFieldDetailController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', '$uibModal', '$injector',
+ '$controller', '$tableProvider', 'SweetAlert', '$timeout', '$stateParams', '$q', 'Issue', 'CompanyField', 'User', 'AttachedFile', 'IssueType', 'Priority', 'Severity', 'IssueTypeCustomField', '$filter', '$state',
+ function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, $uibModal, $injector, $controller, $tableProvider, SweetAlert, $timeout,
+ $stateParams, $q, Issue, CompanyField, User, AttachedFile, IssueType, Priority, Severity, IssueTypeCustomField, $filter, $state) {
$scope.fn = {
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
- formCheck : formCheck, // �뤌 泥댄겕
+ formCheck : formCheck, // �뤌 泥댄겕
};
$scope.vm = {
form : {
- name : "", //�뾽泥대챸
- //companyType : "", //�뾽泥대텇瑜�
- //profitYN : "", //�쁺由�/鍮꾩쁺由�
- //industry : "", //�궛�뾽遺꾨쪟
- //domain : "", //�룄硫붿씤
- manager : "", //�떞�떦�옄
- tel : "", //�쟾�솕踰덊샇
- email : "", //�씠硫붿씪
- memo : "" //鍮꾧퀬
+ companyName : "",
+ companyManager : "",
+ companyTel : "",
+ companyEmail : "",
+ companyDesc : ""
}
};
- // �뤌 泥댄겕
function formCheck(formInvalid) {
if (formInvalid) {
return true;
}
+
return false;
}
// �뤌 �쟾�넚
- function formSubmit(condition) {
+ function formSubmit() {
$rootScope.spinner = true;
var content = {
- name : $rootScope.preventXss($scope.vm.form.name), // �뾽泥대챸
- //companyType : $scope.vm.form.companyType, //�뾽泥대텇瑜�
- //profitYN : $scope.vm.form.profitYN, //�쁺由�/鍮꾩쁺由�
- //industry : $scope.vm.form.industry, //�궛�뾽遺꾨쪟
- //domain : $scope.vm.form.domain, //�룄硫붿씤
- manager : $scope.vm.form.manager, //�떞�떦�옄
- tel : $scope.vm.form.tel, //�쟾�솕踰덊샇
- email : $scope.vm.form.email, //�씠硫붿씪
- memo : $scope.vm.form.memo //鍮꾧퀬
+ companyName : $rootScope.preventXss($scope.vm.form.companyName),
+ companyManager : $rootScope.preventXss($scope.vm.form.companyManager),
+ companyTel : $rootScope.preventXss($scope.vm.form.companyTel),
+ companyEmail : $rootScope.preventXss($scope.vm.form.companyEmail),
+ companyDesc : $rootScope.preventXss($scope.vm.form.companyDesc)
};
- CompanyField.add($resourceProvider.getContent(content,
- $resourceProvider.getPageContent(0, 10))).then(function (result) {
+ CompanyField.modify($resourceProvider.getContent(
+ content,
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
if (result.data.message.status === "success") {
$scope.fn.cancel();
+
// 紐⑸줉 �솕硫� 媛깆떊
$rootScope.$broadcast("getPageList", {});
}
else {
- SweetAlert.error($filter("translate")("companyField.failedCompanyFieldRegistration"), result.data.message.message);
+ SweetAlert.error($filter("translate")("companyField.failedCompanyFieldRegistration"), result.data.message.message); //�뾽泥� �벑濡� �떎�뙣
}
$rootScope.spinner = false;
@@ -77,9 +74,5 @@
$uibModalInstance.dismiss('cancel');
$(document).unbind("keydown"); // �떒異뺥궎 �씠踰ㅽ듃 �젣嫄�
}
-
- }
-
- ]);
- }
-);
\ No newline at end of file
+ }]);
+ });
diff --git a/src/main/webapp/views/issue/issueCompanyFieldDetail.html b/src/main/webapp/views/issue/issueCompanyFieldDetail.html
index 8e78ee0..14b0b96 100644
--- a/src/main/webapp/views/issue/issueCompanyFieldDetail.html
+++ b/src/main/webapp/views/issue/issueCompanyFieldDetail.html
@@ -16,7 +16,7 @@
<js-autocomplete-single data-input-name="companyField"
selected-model="vm.form.companyFields"
search="vm.companyName"
- source="fn.getCompanyFieldList(vm.companyName, vm.form.companyFields, vm.autoCompletePage.companyField.page, fn.getCompanyFieldListCallBack)"
+ source="fn.getCompanyFieldList(vm.companyName, vm.form.companyFields, vm.autoCompletePage.companyField.page,fn.getCompanyFieldListCallBack)"
page="vm.autoCompletePage.companyField.page"
total-page="vm.autoCompletePage.companyField.totalPage"
input-disabled="false"
@@ -27,9 +27,9 @@
<button type="button" class="btn btn-md btn-grey" ng-click="fn.cancel()"><span translate="common.cancel">痍⑥냼</span></button>
<button type="button" class="btn btn-md btn-primary bold"
js-short-cut
- js-short-cut-action="(fn.formCheck(companyFieldModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
+ js-short-cut-action="(fn.formCheck(companyFieldModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit2()"
ng-disabled="fn.formCheck(companyFieldImportForm.$invalid)"
- ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
+ ng-click="fn.formSubmit2()"><span translate="common.save">���옣</span>
</button>
</div>
</form>
--
Gitblit v1.8.0