From 55480603f392704352492b3ba99cd7198f44cc8a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 08 12월 2021 14:54:15 +0900
Subject: [PATCH] * 업체,ISP,호스팅 - url(도메인) 항목 추가 * 이슈상태가 완료인 이슈는 리스트에서 제외
---
src/main/webapp/views/issue/issueAddRelation.html | 129 ++++++++++++++++++++++++++++++++++++------
1 files changed, 110 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/views/issue/issueAddRelation.html b/src/main/webapp/views/issue/issueAddRelation.html
index 825e9b5..5d56570 100644
--- a/src/main/webapp/views/issue/issueAddRelation.html
+++ b/src/main/webapp/views/issue/issueAddRelation.html
@@ -29,17 +29,17 @@
</small>
</div>
-<!-- <div class="form-group mb10 col-sm-4">-->
-<!-- <label class="issue-label"><span class="highlighter-rouge">�뿰愿� �씠�뒋 援щ텇</span></label>-->
-<!-- <select id="relationIssueType"-->
-<!-- name="relationIssueType"-->
-<!-- class="form-control input-sm"-->
-<!-- ng-options="option.name for option in vm.relationIssueTypes track by option.id"-->
-<!-- ng-model="vm.relationIssueType"-->
-<!-- required>-->
-<!-- </select>-->
+ <div class="form-group mb10">
+ <label class="issue-label"><span class="highlighter-rouge">�뿰愿� �씠�뒋 援щ텇</span></label>
+ <select id="relationIssueType"
+ name="relationIssueType"
+ class="form-control input-sm"
+ ng-options="option.name for option in vm.relationIssueTypes track by option.id"
+ ng-model="vm.relationIssueType"
+ required>
+ </select>
-<!-- </div>-->
+ </div>
<div class="row">
<div class="col-lg-4">
@@ -230,7 +230,7 @@
</div>
</div>
- <div class="col-lg-8">
+ <div class="col-lg-12">
<div class="row">
<div class="col-md-12">
<div class="form-group mgb5" ng-show="vm.form.issueCustomFields.length < 1">
@@ -239,7 +239,7 @@
</div>
</div>
- <div class="col-md-6" ng-repeat="issueCustomField in vm.form.issueCustomFields">
+ <div class="col-md-4" ng-repeat="issueCustomField in vm.form.issueCustomFields">
<div class="form-group mgb5">
<label class="issue-label">{{issueCustomField.customFieldVo.name}}</label>
@@ -247,62 +247,99 @@
<!-- 湲곕낯 �엯�젰 -->
<div ng-switch-when="INPUT">
<input type="text" class="form-control input-sm"
+ name="input"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
- ng-required="issueCustomField.fieldOption == '01'">
+ ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
+ <small class="help-block form-text text-danger"
+ ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
+ ng-if="issueAddRelationForm.input.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄�젙�쓽�븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<div ng-switch-when="NUMBER">
<input type="text" class="form-control input-sm"
+ name="number"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
- ng-required="issueCustomField.fieldOption == '01'">
+ ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
+ <small class="help-block form-text text-danger"
+ ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
+ ng-if="issueAddRelationForm.number.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<div ng-switch-when="DATETIME">
<input type="text" class="form-control input-sm"
+ name="dateTime"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
- ng-required="issueCustomField.fieldOption == '01'">
+ ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
+ <small class="help-block form-text text-danger"
+ ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
+ ng-if="issueAddRelationForm.dateTime.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<div ng-switch-when="IP_ADDRESS">
<input type="text" class="form-control input-sm"
+ name="ipAddress"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
- ng-required="issueCustomField.fieldOption == '01'">
+ ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
+ <small class="help-block form-text text-danger"
+ ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
+ ng-if="issueAddRelationForm.ipAddress.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<div ng-switch-when="SITE">
<input type="text" class="form-control input-sm"
+ name="site"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
- ng-required="issueCustomField.fieldOption == '01'">
+ ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
+ <small class="help-block form-text text-danger"
+ ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
+ ng-if="issueAddRelationForm.site.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<div ng-switch-when="TEL">
<input type="text" class="form-control input-sm"
+ name="tel"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
- ng-required="issueCustomField.fieldOption == '01'">
+ ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
+ <small class="help-block form-text text-danger"
+ ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
+ ng-if="issueAddRelationForm.tel.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<!-- �떒�씪 ���젆�듃 -->
<div ng-switch-when="SINGLE_SELECT">
<select class="form-control input-sm issue-select-label"
- ng-required="issueCustomField.fieldOption == '01'"
+ name="singleSelect"
+ ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'"
ng-model="issueCustomField.useValues">
<option value="" value="" translate="common.choose">�꽑�깮�븯�꽭�슂.</option>
<option ng-repeat="customFieldValueVo in issueCustomField.customFieldVo.customFieldValueVos"
@@ -311,16 +348,28 @@
{{customFieldValueVo.value}}
</option>
</select>
+ <small class="help-block form-text text-danger"
+ ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
+ ng-if="issueAddRelationForm.singleSelect.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<!-- 硫��떚 ���젆�듃 -->
<div ng-switch-when="MULTI_SELECT">
<ng-dropdown-multiselect class="multiSelect cursor"
+ name="multiSelect"
+ ng-required="issueCustomField.customFieldVo.requiredData == 'Y'"
data-input-name=""
modal-form-auto-scroll
selected-model="issueCustomField.useValues"
extra-settings="{ 'idProp' : 'value', 'externalIdProp' : 'value', 'displayProp' : 'value', 'stringTypeOption' : 'true', stopRemoveBodyEvent : true }"
options="issueCustomField.customFieldVo.customFieldValueVos"></ng-dropdown-multiselect>
+ <small class="help-block form-text text-danger"
+ ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
+ ng-if="issueAddRelationForm.multiSelect.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
</div>
</div>
@@ -402,6 +451,20 @@
<div ng-show="issueAddRelationForm.companyEmail.$error.pattern" class="help-block form-text text-danger"
translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="companyFieldUrlAddForm" class="issue-label"><span translate="companyField.url">url</span></label>
+ <input id="companyFieldUrlAddForm"
+ name="companyUrl"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-maxlength="200"
+ ng-model="vm.companyUrl"
+ maxlength="200">
</div>
</div>
<div class="col-lg-4">
@@ -512,6 +575,20 @@
</div>
<div class="col-lg-4">
<div class="form-group mgb5">
+ <label for="ispFieldUrlAddForm" class="issue-label"><span translate="companyField.url">url</span></label>
+ <input id="ispFieldUrlAddForm"
+ name="ispUrl"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-maxlength="200"
+ ng-model="vm.ispUrl"
+ maxlength="200">
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
<label for="ispFieldDescAddForm" class="issue-label"><span translate="ispField.memo">鍮꾧퀬</span></label>
<input id="ispFieldDescAddForm"
name="ispMemo"
@@ -618,6 +695,20 @@
</div>
<div class="col-lg-4">
<div class="form-group mgb5">
+ <label for="hostingFieldUrlAddForm" class="issue-label"><span translate="companyField.url">url</span></label>
+ <input id="hostingFieldUrlAddForm"
+ name="hostingUrl"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-maxlength="200"
+ ng-model="vm.hostingUrl"
+ maxlength="200">
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
<label for="hostingFieldDescAdd" class="issue-label"><span translate="hostingField.memo">鍮꾧퀬</span></label>
<input id="hostingFieldDescAdd"
name="hostingMemo"
--
Gitblit v1.8.0