From 16ba8c2f8701d4b3438c1b68f6fe63369820bd5e Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 06 1월 2022 11:42:10 +0900
Subject: [PATCH] 이슈 예약 발생 화면에서 숨김
---
src/main/webapp/views/issue/issueAdd.html | 164 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 109 insertions(+), 55 deletions(-)
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 5f8523f..688a61b 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -127,7 +127,7 @@
<js-autocomplete-multi data-input-name="departments"
selected-model="vm.form.departments"
search="vm.departmentName"
- source="fn.getIssueDepartmentList(vm.departmentName, vm.form.departments)"
+ source="fn.getIssueDepartmentList(vm.form.issueTypeId, vm.departmentName, vm.form.departments)"
input-disabled="false"
translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment'}"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true}"></js-autocomplete-multi>
@@ -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,104 +230,145 @@
<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">
<!-- 湲곕낯 �엯�젰 -->
<div ng-switch-when="INPUT">
<input type="text" class="form-control input-sm"
- name="input"
+ name="item_{{$index}}"
ng-model="issueCustomField.useValues"
maxlength="100"
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.input.$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">
<input type="text" class="form-control input-sm"
- name="number"
+ name="item_{{$index}}"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
+ 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.number.$error.required"
- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
- </small>
+<!-- <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['item_' + $index].$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
+ </div>
</div>
<div ng-switch-when="DATETIME">
- <input type="text" class="form-control input-sm"
- name="dateTime"
+ <input class="form-control input-sm input-readonly"
+ name="item_{{$index}}"
ng-model="issueCustomField.useValues"
- maxlength="100"
- autocomplete="off"
+ placeholder="{{'issue.clickToSelectDate' | translate}}"
+ modal-form-auto-scroll
+ range-type="singleDate"
+ date-range-picker
kr-input
+ autocomplete="off"
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">
<input type="text" class="form-control input-sm"
- name="ipAddress"
+ name="item_{{$index}}"
ng-model="issueCustomField.useValues"
- maxlength="100"
autocomplete="off"
kr-input
+ 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>
+<!-- <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['item_' + $index].$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
+
+ <div ng-switch-when="EMAIL">
+ <input type="email" class="form-control input-sm"
+ name="item_{{$index}}"
+ maxlength="30"
+ ng-model="issueCustomField.useValues"
+ kr-input
+ 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-if="issueAddForm['item_' + $index].$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
<div ng-switch-when="SITE">
<input type="text" class="form-control input-sm"
- name="site"
+ name="item_{{$index}}"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
+ 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>
+<!-- <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['item_' + $index].$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http:// �삉�뒗 www 濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
+ </div>
</div>
<div ng-switch-when="TEL">
<input type="text" class="form-control input-sm"
- name="tel"
+ name="item_{{$index}}"
ng-model="issueCustomField.useValues"
- maxlength="100"
+ maxlength="30"
autocomplete="off"
kr-input
+ 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>
+<!-- <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['item_' + $index].$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
<!-- �떒�씪 ���젆�듃 -->
<div ng-switch-when="SINGLE_SELECT">
<select class="form-control input-sm issue-select-label"
- name="singleSelect"
+ name="item_{{$index}}"
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'"
ng-model="issueCustomField.useValues">
<option value="" value="" translate="common.choose">�꽑�깮�븯�꽭�슂.</option>
@@ -337,11 +378,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>
<!-- 硫��떚 ���젆�듃 -->
@@ -355,11 +396,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>
@@ -385,6 +426,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"
@@ -457,7 +499,11 @@
autocomplete="off"
ng-maxlength="200"
ng-model="vm.companyUrl"
+ ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
maxlength="200">
+ <div ng-show="issueAddForm.companyUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
@@ -585,7 +631,11 @@
autocomplete="off"
ng-maxlength="200"
ng-model="vm.ispUrl"
+ ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
maxlength="200">
+ <div ng-show="issueAddForm.ispUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
@@ -714,7 +764,11 @@
autocomplete="off"
ng-maxlength="200"
ng-model="vm.hostingUrl"
+ ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
maxlength="200">
+ <div ng-show="issueAddForm.hostingUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
--
Gitblit v1.8.0