From dccda7c93a2a18571fe43c5de1c66eabefc25139 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 17 11월 2021 18:31:06 +0900
Subject: [PATCH] 이슈 수정 진행[프론트]
---
src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js | 2
src/main/webapp/views/issue/issueAdd.html | 1
src/main/webapp/views/issue/issueModify.html | 1
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 18 +--------
src/main/webapp/scripts/app/issue/issueModify.controller.js | 73 ++++++++++++++++++++++++++++++++++++
5 files changed, 78 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js b/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js
index 0d51c9c..e67d2dc 100644
--- a/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js
+++ b/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js
@@ -99,7 +99,7 @@
'<div class="calendar left">' +
'<div class="daterangepicker_input">' +
'<input class="input-mini form-control" type="text" name="daterangepicker_start" value="" />' +
- '<i class="fa fa-calendar glyphicon glyphicon-calendar">' +
+ '<i class="fa fa-calendar glyphicon glyphicon-calendar"></i>' +
'<div class="calendar-time">' +
'<div></div>' +
'<i class="fa fa-clock-o glyphicon glyphicon-time"></i>' +
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 14a3616..a15726b 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -372,22 +372,6 @@
var content = {
title : $rootScope.preventXss($scope.vm.form.title), // �젣紐�
description : $rootScope.preventXss($scope.vm.form.description), // �궡�슜
- //
- // companyManager : $rootScope.preventXss($scope.vm.companyManager), // �궡�슜
- // companyTel : $rootScope.preventXss($scope.vm.companyTel), // �궡�슜
- // companyEmail : $rootScope.preventXss($scope.vm.companyEmail), // �궡�슜
- // companyMemo : $rootScope.preventXss($scope.vm.companyMemo), // �궡�슜
- ispCode : $rootScope.preventXss($scope.vm.ispCode), // �궡�슜
- ispManager : $rootScope.preventXss($scope.vm.ispManager), // �궡�슜
- ispTel : $rootScope.preventXss($scope.vm.ispTel), // �궡�슜
- ispEmail : $rootScope.preventXss($scope.vm.ispEmail), // �궡�슜
- ispMemo : $rootScope.preventXss($scope.vm.ispMemo), // �궡�슜
- hostingCode : $rootScope.preventXss($scope.vm.hostingCode ), // �궡�슜
- hostingManager : $rootScope.preventXss($scope.vm.hostingManager), // �궡�슜
- hostingTel : $rootScope.preventXss($scope.vm.hostingTel), // �궡�슜
- hostingEmail : $rootScope.preventXss($scope.vm.hostingEmail), // �궡�슜
- hostingMemo : $rootScope.preventXss($scope.vm.hostingMemo), // �궡�슜
- //
projectId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
var projectId = "";
@@ -443,6 +427,7 @@
return departmentIds;
})(),
+
attachedFileIds : (function () {
var attachedFileIds = [];
@@ -454,6 +439,7 @@
return attachedFileIds;
})(),
+
startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
detectingDateRange : $scope.vm.form.detectingDateRange,
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 405291f..6023a47 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -450,6 +450,79 @@
return attachedFileIds;
})(),
startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
+
+ companyFields : (function () {
+ var companyFields = [];
+
+ angular.forEach($scope.vm.form.companyFields, function (companyField) {
+ var useValues = [];
+
+ if (angular.isArray(companyField.useValues)) {
+ angular.forEach(companyField.useValues, function (useValue) {
+ useValues.push(useValue.value);
+ });
+ }
+ else {
+ useValues.push(companyField.useValues);
+ }
+
+ // useValues 瑜� 諛곗뿴濡� 蹂��솚�븳�떎.
+ var temp = angular.copy(companyField);
+ temp.useValues = useValues;
+ companyFields.push(temp);
+ });
+
+ return companyFields;
+ })(),
+
+ ispFields : (function () {
+ var ispFields = [];
+
+ angular.forEach($scope.vm.form.ispFields, function (ispField) {
+ var useValues = [];
+
+ if (angular.isArray(ispField.useValues)) {
+ angular.forEach(ispField.useValues, function (useValue) {
+ useValues.push(useValue.value);
+ });
+ }
+ else {
+ useValues.push(ispField.useValues);
+ }
+
+ // useValues 瑜� 諛곗뿴濡� 蹂��솚�븳�떎.
+ var temp = angular.copy(ispField);
+ temp.useValues = useValues;
+ ispFields.push(temp);
+ });
+
+ return ispFields;
+ })(),
+
+ hostingFields : (function () {
+ var hostingFields = [];
+
+ angular.forEach($scope.vm.form.hostingFields, function (hostingField) {
+ var useValues = [];
+
+ if (angular.isArray(hostingField.useValues)) {
+ angular.forEach(hostingField.useValues, function (useValue) {
+ useValues.push(useValue.value);
+ });
+ }
+ else {
+ useValues.push(hostingField.useValues);
+ }
+
+ // useValues 瑜� 諛곗뿴濡� 蹂��솚�븳�떎.
+ var temp = angular.copy(hostingField);
+ temp.useValues = useValues;
+ hostingFields.push(temp);
+ });
+
+ return hostingFields;
+ })(),
+
issueCustomFields : (function () { // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
var issueCustomFields = [];
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 03bcee4..5b46cda 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -210,6 +210,7 @@
</div>
</div>
</div>
+ <hr>
<div class="row">
<div class="col-lg-4 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="common.detectingInfo">�깘吏��젙蹂�</span></label>
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index a577ee0..ec51092 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -210,6 +210,7 @@
</div>
</div>
</div>
+ <hr>
<div class="row">
<div class="col-lg-4 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="common.detectingInfo">�깘吏��젙蹂�</span></label>
--
Gitblit v1.8.0