From 4f4fd9ee8b3315bc433b1893dbff008efdb03230 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 22 12월 2021 16:36:06 +0900
Subject: [PATCH] - API 설정 화면에서 프로젝트에서 설정된 이슈유형만 보여주도록 수정

---
 src/main/webapp/views/api/apiSettingOverlap.html |   93 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/src/main/webapp/views/api/apiSettingOverlap.html b/src/main/webapp/views/api/apiSettingOverlap.html
index 6929f53..b87b082 100644
--- a/src/main/webapp/views/api/apiSettingOverlap.html
+++ b/src/main/webapp/views/api/apiSettingOverlap.html
@@ -1,36 +1,77 @@
-
-
-<div class="row">
-    <div class="col-sm-5">
-        <div class="element-wrapper">
-            <label for="issueAddForm4" class="issue-label"> <span
-                    translate="issue.issueType">�씠�뒋 ���엯</span>
+<label for="issueTypeForm" class="issue-label">
+    <span translate="api.upIssueCompleteIssueStatus">�긽�쐞 �씠�뒋 �옄�룞醫낅즺 �씠�뒋 �긽�깭 �꽕�젙</span>
+</label>
+<div class="element-box">
+    <div class="row">
+        <!-- �씠�뒋 �긽�깭 -->
+        <div class="form-group mb10">
+            <label for="issueStatusForm" class="issue-label">
+                <span translate="api.autoCompleteIssueStatus">�씠�뒋 �긽�깭</span>
             </label>
-            <select id="issueAddForm4"
-                    name="issueType"
+            <select id="issueStatusForm"
+                    name="issueStatus"
                     class="form-control input-sm issue-select-label"
-                    ng-model="vm.form.issueTypeId"
-                    ng-change="fn.getIssueTypeCustomFields()"
-                    ng-style="{ 'color' : fn.getOptionColor(vm.issueTypes, vm.form.issueTypeId) }"
+                    ng-style="{ 'color' : fn.getOptionColor(vm.completeIssueStatuses, vm.completeIssueStatusId) }"
+                    ng-model="vm.completeIssueStatusId"
+                    ng-change="fn.onChangeEndIssueStatus()"
                     required>
-                <option ng-style="{ 'color' : '#353535' }" value="">�솃�럹�씠吏� 蹂�議� 媛먯�
-                </option>
-                <option ng-style="{ 'color' : '#353535' }" value="">寃쎌쑀吏� �깘吏�
-                </option>
-                <option ng-repeat="issueType in vm.issueTypes"
-                        ng-style="{ 'color' : issueType.color, 'font-weight': 600 }"
-                        value="{{issueType.id}}">�뿈&nbsp;{{issueType.name}}
+                <option value="none" translate="common.select"></option>
+                <option ng-repeat="issueStatus in vm.completeIssueStatuses"
+                        ng-style="{ 'color' : issueStatus.color, 'font-weight': 600 }"
+                        value="{{issueStatus.id}}"
+                        translate="{{issueStatus.name}}(id:{{issueStatus.id}})">
                 </option>
             </select>
         </div>
     </div>
-
-
+    <div class="row modal-footer buttons-on-right">
+        <div class="">
+            <button type="button" class="btn btn-md btn-secondary bold"
+                    ng-click="fn.resetCompleteIssueStatus()"><span translate="common.reset">珥덇린�솕</span>
+            </button>
+            <button type="button" class="btn btn-md btn-primary bold"
+                    js-short-cut
+                    js-short-cut-action="(fn.formCheck(issueStatusForm.$invalid) || $root.spinner) ? null : fn.formSubmitCompleteIssueStatus()"
+                    ng-click="fn.formSubmitCompleteIssueStatus()"><span translate="common.saved">�깮�꽦</span>
+            </button>
+        </div>
+    </div>
 </div>
 
-<div class="element-box">
-    <p class="btn btn-secondary">
-        <span >寃쎌쑀吏�</span>
-        <span>횞</span>
-    </p>
+<label for="issueTypeForm" class="issue-label">
+    <span translate="api.downIssueOverlapSetting">�븯�쐞 �씠�뒋 泥섎━ 湲곗� �빆紐�</span>
+</label>
+<div class="element-box" style="height: 600px">
+    <form role="form" name="apiSettingOverlapForm">
+        <div class="form-group">
+            <label><span translate="common.customField">�궗�슜�옄 �젙�쓽 �븘�뱶</span> </label>
+            <js-autocomplete-multi data-input-name="customField"
+                                   selected-model="vm.form.customFields"
+                                   search="vm.customFieldName"
+                                   source="fn.getIssueTypeCustomFieldList(vm.customFieldName, vm.form.customFields, vm.projectId, vm.issueTypeId)"
+                                   input-disabled="false"
+                                   translation-texts="{ count : 'common.few', empty : 'common.emptyCustomField' }"
+                                   required
+                                   extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
+
+            <div class="select3-selection__choicediv mt-10">
+                <span class="select3-selection__choice" ng-repeat="customField in vm.form.customFields">
+                    <span>{{customField.name}}</span>
+                    <span class="select3-selection__choice__remove" ng-click="fn.removeCustomField($index)">횞</span>
+                </span>
+            </div>
+        </div>
+
+        <div class="modal-footer buttons-on-right">
+            <button type="button" class="btn btn-md btn-secondary bold"
+                    ng-click="fn.resetOverlap()"><span translate="common.reset">珥덇린�솕</span>
+            </button>
+            <button type="button" class="btn btn-md btn-primary bold"
+                    js-short-cut
+                    js-short-cut-action="(fn.formCheck(apiSettingOverlapForm.$invalid) || $root.spinner) ? null : fn.formSubmitOverlap()"
+                    ng-click="fn.formSubmitOverlap()"><span translate="common.saved">�깮�꽦</span>
+            </button>
+      </div>
+    </form>
 </div>
+

--
Gitblit v1.8.0