From 70e3ad43e441d07d16c7e4e1af0e093befd62c01 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 27 12월 2021 19:36:11 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/issue/issueAdd.html | 105 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 52 deletions(-)
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 836d34b..9c7b98f 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -222,7 +222,7 @@
<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">
+ <div class="form-group mgb5" ng-if="vm.form.issueCustomFields.length < 1">
<label class="issue-label" translate="issue.notIssueTypeCustomFields">�씠�뒋 ���엯�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽
�븘�뱶媛� �뾾�뒿�땲�떎.</label>
</div>
@@ -230,7 +230,7 @@
<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>
+ <label class="issue-label">{{issueCustomField.customFieldVo.name}} <code ng-if="issueCustomField.customFieldVo.requiredData == 'Y'" class="highlighter-rouge">*</code> </label>
<div ng-switch on="issueCustomField.customFieldVo.customFieldType">
<!-- 湲곕낯 �엯�젰 -->
@@ -242,11 +242,11 @@
autocomplete="off"
kr-input
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.inputValue.$error.required"
- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄�젙�쓽�븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
- </small>
+<!-- <small class="help-block form-text text-danger"-->
+<!-- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!-- ng-if="issueAddForm.inputValue.$error.required"-->
+<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄�젙�쓽�븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!-- </small>-->
</div>
<div ng-switch-when="NUMBER">
@@ -259,12 +259,12 @@
ng-pattern="/^[0-9]*$/"
placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
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.numberType.$error.required"
- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
- </small>
- <div ng-show="issueAddForm.numberType.$error.pattern" class="help-block form-text text-danger"
+<!-- <small class="help-block form-text text-danger"-->
+<!-- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!-- ng-if="issueAddForm.numberType.$error.required"-->
+<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!-- </small>-->
+ <div ng-if="issueAddForm.numberType.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
</div>
</div>
@@ -279,11 +279,11 @@
date-range-picker
kr-input
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>
+<!-- <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">
@@ -295,12 +295,12 @@
ng-pattern="/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/"
placeholder="IP 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
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 ng-show="issueAddForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
+<!-- <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 ng-if="issueAddForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
@@ -314,12 +314,12 @@
ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
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 ng-show="issueAddForm.email.$error.pattern" class="help-block form-text text-danger"
+<!-- <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 ng-if="issueAddForm.email.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
@@ -334,12 +334,12 @@
ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
placeholder="�솃�럹�씠吏� 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
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 ng-show="issueAddForm.site.$error.pattern" class="help-block form-text text-danger"
+<!-- <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 ng-if="issueAddForm.site.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http:// �삉�뒗 www 濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
</div>
</div>
@@ -354,12 +354,12 @@
ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
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 ng-show="issueAddForm.tel.$error.pattern" class="help-block form-text text-danger"
+<!-- <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 ng-if="issueAddForm.tel.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
@@ -377,11 +377,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>
+<!-- <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>
<!-- 硫��떚 ���젆�듃 -->
@@ -395,11 +395,11 @@
<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>
+<!-- <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>
@@ -425,6 +425,7 @@
<js-autocomplete-single data-input-name="issueCompanyField"
selected-model="vm.form.issueCompanyFields"
search="vm.companyName"
+ custom-input="true"
source="fn.getIssueCompanyFieldList(vm.companyName, vm.form.issueCompanyFields, vm.autoCompletePage.companyField.page, fn.getIssueCompanyFieldListCallBack)"
page="vm.autoCompletePage.companyField.page"
total-page="vm.autoCompletePage.companyField.totalPage"
--
Gitblit v1.8.0