From ab7e04765622b7ef31bb891a91e89abcf203c31d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 09 12월 2021 14:35:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/issue/issueAdd.html | 130 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 119 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index e42f21f..57e7322 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -39,7 +39,7 @@
source="fn.getProjectList(vm.projectName, vm.form.projects, vm.autoCompletePage.project.page, fn.getProjectListCallBack)"
page="vm.autoCompletePage.project.page"
total-page="vm.autoCompletePage.project.totalPage"
- input-disabled="false"
+ input-disabled="vm.form.projects != null ? vm.form.projects.length > 0 : false"
translation-texts="{ empty : 'common.emptyProject' }"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -59,7 +59,8 @@
ng-model="vm.form.issueTypeId"
ng-change="fn.getIssueTypeCustomFields()"
ng-style="{ 'color' : fn.getOptionColor(vm.issueTypes, vm.form.issueTypeId) }"
- required>
+ required
+ disabled>
<option value="" translate="common.selectTarget" ng-style="{ 'color' : '#353535' }"><span
translate="common.selectTarget">���긽 �꽑�깮</span>
</option>
@@ -210,6 +211,7 @@
</div>
</div>
</div>
+
<hr>
<div class="row">
<div class="col-lg-4 fontcolor_green">
@@ -217,7 +219,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">
@@ -226,7 +228,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>
@@ -234,62 +236,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="issueAddForm.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="issueAddForm.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="issueAddForm.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="issueAddForm.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="issueAddForm.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="issueAddForm.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"
@@ -298,6 +337,11 @@
{{customFieldValueVo.value}}
</option>
</select>
+ <small class="help-block form-text text-danger"
+ ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
+ ng-if="issueAddForm.singleSelect.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<!-- 硫��떚 ���젆�듃 -->
@@ -308,13 +352,23 @@
selected-model="issueCustomField.useValues"
extra-settings="{ 'idProp' : 'value', 'externalIdProp' : 'value', 'displayProp' : 'value', 'stringTypeOption' : 'true', stopRemoveBodyEvent : true }"
options="issueCustomField.customFieldVo.customFieldValueVos"></ng-dropdown-multiselect>
+ <input class="form-control input-sm issue-select-label"
+ type="hidden" name="multiSelect" ng-model="issueCustomField.useValues[0]"
+ 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="issueAddForm.multiSelect.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
</div>
</div>
</div>
</div>
</div>
+
<hr>
+
<div ng-show="fn.containsPartner('�뾽泥�')" class="row">
<div class="col-lg-8 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="companyField.info">�뾽泥댁젙蹂�</span>
@@ -393,6 +447,20 @@
</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">
+ <div class="form-group mgb5">
<label for="companyFieldDescAddForm" class="issue-label"><span translate="companyField.memo">鍮꾧퀬</span></label>
<input id="companyFieldDescAddForm"
name="companyMemo"
@@ -419,6 +487,17 @@
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="ispField.name">ISP �씠由�</span> </label>
+ <!--<input ng-click="show==false"
+ ng-show="show"
+ ng-hide="!show"
+ name="ispName"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.ispName"
+ ng-maxlength="100"
+ maxlength="100">-->
<js-autocomplete-single data-input-name="ispField"
selected-model="vm.form.issueIspFields"
search="vm.ispName"
@@ -499,6 +578,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"
@@ -527,6 +620,7 @@
<label class="issue-label"> <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span> </label>
<js-autocomplete-single data-input-name="hostingField"
selected-model="vm.form.issueHostingFields"
+ ng-model="vm.hostingName"
search="vm.hostingName"
source="fn.getIssueHostingFieldList(vm.hostingName, vm.form.issueHostingFields, vm.autoCompletePage.hostingField.page, fn.getIssueHostingFieldListCallBack)"
page="vm.autoCompletePage.hostingField.page"
@@ -605,6 +699,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