From c5ce099b314be4b296137415a146c610095ae92e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 11 3월 2022 13:54:09 +0900
Subject: [PATCH] - api로 이슈 추가 시 하위이슈기준이 2개 일 경우 코드 수정 - 업체 추가/수정 시 ip대역대 중복 체크 - 이슈 추가/수정 시 ip대역대 수정불가

---
 src/main/webapp/views/issue/issueAddDown.html |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/views/issue/issueAddDown.html b/src/main/webapp/views/issue/issueAddDown.html
index b54842c..eb54a87 100644
--- a/src/main/webapp/views/issue/issueAddDown.html
+++ b/src/main/webapp/views/issue/issueAddDown.html
@@ -34,7 +34,7 @@
                     <div class="form-group mb10">
                         <label class="issue-label"> <span translate="common.project">�봽濡쒖젥�듃</span> <code
                                 class="highlighter-rouge">*</code></label>
-                        <js-autocomplete-single data-input-name="project"
+                        <!--<js-autocomplete-single data-input-name="project"
                                                 selected-model="vm.form.projects"
                                                 search="vm.projectName"
                                                 source="fn.getProjectList(vm.projectName, vm.form.projects, vm.autoCompletePage.project.page, fn.getProjectListCallBack)"
@@ -42,7 +42,17 @@
                                                 total-page="vm.autoCompletePage.project.totalPage"
                                                 translation-texts="{ empty : 'common.emptyProject' }"
                                                 extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
-                                                type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+                                                type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"
+                                                >
+                        </js-autocomplete-single>-->
+                        <select id="issueAddDownForm6"
+                                name="issueType"
+                                class="form-control input-sm issue-select-label"
+                                ng-model="vm.projectName"
+                                required
+                                disabled>
+                            <option>{{vm.projectName}}</option>
+                        </select>
                     </div>
                 </div>
 
@@ -457,6 +467,45 @@
                         </div>-->
                     </div>
                 </div>
+                <div class="col-lg-2">
+                    <div class="form-group mgb5">
+                        <label for="companyFieldIpStartAddForm" class="issue-label"><span translate="companyField.ipRange">ip ���뿭��</span></label>
+                        <input id="companyFieldIpStartAddForm"
+                               name="ipStart"
+                               type="text"
+                               class="form-control"
+                               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]?)$/"
+                               autocomplete="off"
+                               ng-model="vm.ipStart"
+                               disabled
+                        >
+                        <div ng-if="issueAddDownForm.ipStart.$error.pattern" class="help-block form-text text-danger"
+                             translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+                        </div>
+                    </div>
+                </div>
+                <div class="mt-30 ml--4 mr--4">
+                    <label class="issue-label">~</label>
+                </div>
+                <div class="col-lg-2 mt-1">
+                    <div class="form-group mgb5">
+                        <label for="companyFieldIpEndAddForm"></label>
+                        <input id="companyFieldIpEndAddForm"
+                               name="ipEnd"
+                               type="text"
+                               class="form-control"
+                               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]?)$/"
+                               autocomplete="off"
+                               ng-model="vm.ipEnd"
+                               disabled
+                        >
+                        <div ng-if="issueAddDownForm.ipEnd.$error.pattern" class="help-block form-text text-danger"
+                             translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+                        </div>
+                    </div>
+                </div>
                 <div class="col-lg-4">
                     <div class="form-group mgb5">
                         <label for="companyFieldDescAddForm" class="issue-label"><span translate="companyField.memo">鍮꾧퀬</span></label>

--
Gitblit v1.8.0