From f919af96e5e083ad462a5e71c00ff148ebdb91c6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 20 1월 2022 15:23:28 +0900
Subject: [PATCH] - 오토 컴플릿 항목 선택하면 목록 사라지게 수정 - 업체 메일 발송 시 템플릿 선택 문구 변경 - 연락처 입력 폼 정규식 제거하고 숫자만 입력 가능하게 수정 - 모든 사용자 필드(날짜) 24시간 타입으로 변경
---
src/main/webapp/views/companyField/companyFieldList.html | 2
src/main/webapp/views/ispField/ispFieldList.html | 2
src/main/webapp/views/issue/issueAdd.html | 5 +
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 21 ++-
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 1
src/main/webapp/scripts/app/issue/issueAddDown.controller.js | 31 +++++-
src/main/webapp/views/ispField/ispFieldModify.html | 7
src/main/webapp/scripts/app/issue/issueModify.controller.js | 9 +
src/main/webapp/views/issue/issueAddDown.html | 5 +
src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js | 19 ++-
src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js | 14 +-
src/main/webapp/views/issue/issueAddRelation.html | 5 +
src/main/webapp/scripts/app/ispField/ispFieldList.controller.js | 19 ++-
src/main/webapp/views/issue/issueSendMailPartners.html | 2
src/main/webapp/views/hostingField/hostingFieldAdd.html | 7
src/main/webapp/views/hostingField/hostingFieldList.html | 2
src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js | 17 +++
src/main/webapp/views/ispField/ispFieldAdd.html | 7
src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js | 21 ++++
src/main/webapp/views/companyField/companyFieldModify.html | 6
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 32 +++++-
src/main/webapp/scripts/app/issue/issueAddRelation.controller.js | 31 +++++-
src/main/webapp/i18n/ko/global.json | 1
src/main/webapp/views/hostingField/hostingFieldModify.html | 7
src/main/webapp/views/companyField/companyFieldAdd.html | 12 +
25 files changed, 210 insertions(+), 75 deletions(-)
diff --git a/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js b/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
index 8692998..e73daad 100644
--- a/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
+++ b/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
@@ -227,13 +227,13 @@
function toggleDropdown() {
// �븘�씠�뀥�씠 �꽑�깮�릺�뼱 �엳�쓣 寃쎌슦 紐⑸줉 �젅�씠�뼱�뒗 �몴�떆�맆 �닔 �뾾�떎.
$scope.open = true;
- // if ($scope.selectedModel.length > 0) {
- // $scope.open = false;
- // $scope.options = [];
- // }
- // else {
- // $scope.open = true;
- // }
+ if ($scope.selectedModel != null && $scope.selectedModel.length > 0) {
+ $scope.open = false;
+ $scope.options = [];
+ }
+ else {
+ $scope.open = true;
+ }
// �뙘�뾽 李쎌뿉�꽌 �엯�젰 �븘�뱶�뿉 �룷而ㅼ뒪媛� 媛�硫� �옄�룞 �뒪�겕濡�.
if ($scope.settings.autoResize) {
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index fb03238..d1a7a66 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -288,6 +288,7 @@
"setIssueDownTableDisplay": "�븯�쐞 �씠�뒋 �뀒�씠釉� �몴�떆 �꽕�젙",
"columnName": "而щ읆紐�",
"selectPartners": "�뾽泥� �꽑�깮",
+ "selectTemplate": "�뀥�뵆由� �꽑�깮",
"partners" : "�뾽泥� �씠硫붿씪",
"area": "�꼻�씠",
"displayed": "�몴�떆 �뿬遺�",
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
index 0c14335..fdb2b91 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
@@ -147,6 +147,27 @@
$scope.vm.form.hostingId = result[0].id;
});
+ $scope.$on("companyTypeEvent", function (event, result) {
+ $scope.vm.form.companyTypeId = result[0].id;
+ });
+ $scope.$on("parentSectorEvent", function (event, result) {
+ if ($rootScope.isDefined(result[0])) {
+ $scope.vm.form.parentSectorId = result[0].id;
+ }
+
+ $scope.vm.form.childSector = "";
+ $scope.vm.form.childSectors = [];
+ });
+ $scope.$on("childSectorEvent", function (event, result) {
+ $scope.vm.form.childSectorId = result[0].id;
+ });
+ $scope.$on("regionEvent", function (event, result) {
+ $scope.vm.form.regionId = result[0].id;
+ });
+ $scope.$on("statusEvent", function (event, result) {
+ $scope.vm.form.statusId = result[0].id;
+ });
+
// �뤌 �쟾�넚
function formSubmit(condition) {
$rootScope.spinner = true;
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index be4e4a0..33421f6 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -125,7 +125,7 @@
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.region")
- .setHWidth("bold")
+ .setHWidth("width-80-p bold")
.setDName("regionName")
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
@@ -166,8 +166,8 @@
if (result.data.message.status === "success") {
$scope.vm.page.selectedPage = currentPage + 1;
- // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶
result.data.data.forEach(function (data) {
+ // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽�, 諛곗뿴 �삎�깭 �젣嫄�, 肄ㅻ쭏 湲곗� 以꾨컮轅�
if (data.tel != null && data.tel !== "") {
var tels = data.tel;
if (data.tel.indexOf("[") !== -1){
@@ -177,21 +177,26 @@
for (var i = 0; i < telArr.length; i++) {
let hyphen = telArr[i].trim();
- telArr[i] = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/, "$1-$2-$3");
+ if (hyphen.length < 9) {
+ telArr[i] = hyphen.replace(/^(\d{3,4})(\d{4})$/, "$1-$2");
+ } else {
+ telArr[i] = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/, "$1-$2-$3");
+ }
if (telArr[i] === "") {
telArr.splice(i,1);
}
}
data.tel = telArr.join();
+ data.tel = data.tel.replace(/\,/g,"</br>");
}
- });
-
- // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄�
- result.data.data.forEach(function (data) {
- if (data.email != null && data.email !== "") {
+ // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄� 諛� 肄ㅻ쭏 湲곗��쑝濡� 以꾨컮轅�
+ if ($rootScope.isDefined(data.email)) {
if (data.email.indexOf("[") !== -1){
data.email = data.email.substr(1, data.email.indexOf("]")-1);
}
+ if (data.email.indexOf(",") !== -1) {
+ data.email = data.email.replace(/\,/g,"</br>");
+ }
}
});
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
index 511f7dc..c7e5a77 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
@@ -151,8 +151,25 @@
$scope.vm.form.hostingId = result[0].id;
});
+ $scope.$on("companyTypeEvent", function (event, result) {
+ $scope.vm.form.companyTypeId = result[0].id;
+ });
$scope.$on("parentSectorEvent", function (event, result) {
+ if ($rootScope.isDefined(result[0])) {
+ $scope.vm.form.parentSectorId = result[0].id;
+ }
+
$scope.vm.form.childSector = "";
+ $scope.vm.form.childSectors = [];
+ });
+ $scope.$on("childSectorEvent", function (event, result) {
+ $scope.vm.form.childSectorId = result[0].id;
+ });
+ $scope.$on("regionEvent", function (event, result) {
+ $scope.vm.form.regionId = result[0].id;
+ });
+ $scope.$on("statusEvent", function (event, result) {
+ $scope.vm.form.statusId = result[0].id;
});
// �뤌 �쟾�넚
diff --git a/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js b/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js
index 15d268f..886b2ab 100644
--- a/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js
+++ b/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js
@@ -136,8 +136,8 @@
if (result.data.message.status === "success") {
$scope.vm.page.selectedPage = currentPage + 1;
- // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶
result.data.data.forEach(function (data) {
+ // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽�, 諛곗뿴 �삎�깭 �젣嫄�, 肄ㅻ쭏 湲곗� 以꾨컮轅�
if (data.tel != null && data.tel !== "") {
var tels = data.tel;
if (data.tel.indexOf("[") !== -1){
@@ -147,21 +147,26 @@
for (var i = 0; i < telArr.length; i++) {
let hyphen = telArr[i].trim();
- telArr[i] = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/, "$1-$2-$3");
+ if (hyphen.length < 9) {
+ telArr[i] = hyphen.replace(/^(\d{3,4})(\d{4})$/, "$1-$2");
+ } else {
+ telArr[i] = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/, "$1-$2-$3");
+ }
if (telArr[i] === "") {
telArr.splice(i,1);
}
}
data.tel = telArr.join();
+ data.tel = data.tel.replace(/\,/g,"</br>");
}
- });
-
- // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄�
- result.data.data.forEach(function (data) {
- if (data.email != null && data.email !== "") {
+ // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄� 諛� 肄ㅻ쭏 湲곗��쑝濡� 以꾨컮轅�
+ if ($rootScope.isDefined(data.email)) {
if (data.email.indexOf("[") !== -1){
data.email = data.email.substr(1, data.email.indexOf("]")-1);
}
+ if (data.email.indexOf(",") !== -1) {
+ data.email = data.email.replace(/\,/g,"</br>");
+ }
}
});
diff --git a/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js b/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
index 37a760c..21b6a3e 100644
--- a/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
+++ b/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
@@ -136,8 +136,8 @@
if (result.data.message.status === "success") {
$scope.vm.page.selectedPage = currentPage + 1;
- // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶
result.data.data.forEach(function (data) {
+ // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽�, 諛곗뿴 �삎�깭 �젣嫄�, 肄ㅻ쭏 湲곗� 以꾨컮轅�
if (data.tel != null && data.tel !== "") {
var tels = data.tel;
if (data.tel.indexOf("[") !== -1){
@@ -147,21 +147,26 @@
for (var i = 0; i < telArr.length; i++) {
let hyphen = telArr[i].trim();
- telArr[i] = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/, "$1-$2-$3");
+ if (hyphen.length < 9) {
+ telArr[i] = hyphen.replace(/^(\d{3,4})(\d{4})$/, "$1-$2");
+ } else {
+ telArr[i] = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/, "$1-$2-$3");
+ }
if (telArr[i] === "") {
telArr.splice(i,1);
}
}
data.tel = telArr.join();
+ data.tel = data.tel.replace(/\,/g,"</br>");
}
- });
-
- // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄�
- result.data.data.forEach(function (data) {
- if (data.email != null && data.email !== "") {
+ // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄� 諛� 肄ㅻ쭏 湲곗��쑝濡� 以꾨컮轅�
+ if ($rootScope.isDefined(data.email)) {
if (data.email.indexOf("[") !== -1){
data.email = data.email.substr(1, data.email.indexOf("]")-1);
}
+ if (data.email.indexOf(",") !== -1) {
+ data.email = data.email.replace(/\,/g,"</br>");
+ }
}
});
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 3d3af79..c81b38c 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -546,6 +546,27 @@
$scope.vm.hostingMemo = result[0].memo;
});
+ $scope.$on("companyTypeEvent", function (event, result) {
+ $scope.vm.form.companyTypeId = result[0].id;
+ });
+ $scope.$on("parentSectorEvent", function (event, result) {
+ if ($rootScope.isDefined(result[0])) {
+ $scope.vm.form.parentSectorId = result[0].id;
+ }
+
+ $scope.vm.form.childSector = "";
+ $scope.vm.form.childSectors = [];
+ });
+ $scope.$on("childSectorEvent", function (event, result) {
+ $scope.vm.form.childSectorId = result[0].id;
+ });
+ $scope.$on("regionEvent", function (event, result) {
+ $scope.vm.form.regionId = result[0].id;
+ });
+ $scope.$on("statusEvent", function (event, result) {
+ $scope.vm.form.statusId = result[0].id;
+ });
+
// �뤌 �쟾�넚
function formSubmit() {
$rootScope.spinner = true;
@@ -634,7 +655,6 @@
issueCompanyFields : (function () {
var issueCompanyFields = [];
if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0 ){
- var companyField = $scope.vm.form.issueCompanyFields[0];
issueCompanyFields.push({
companyId : $scope.vm.companyId,
name : $scope.vm.companyName,
@@ -643,11 +663,11 @@
email :$scope.vm.companyEmail,
url :$scope.vm.companyUrl,
memo : $scope.vm.companyMemo,
- companyTypeId : companyField.companyTypeId,
- parentSectorId : companyField.parentSectorId,
- childSectorId : companyField.childSectorId,
- regionId : companyField.regionId,
- statusId : companyField.statusId
+ companyTypeId : $scope.vm.form.companyTypeId,
+ parentSectorId : $scope.vm.form.parentSectorId,
+ childSectorId : $scope.vm.form.childSectorId,
+ regionId : $scope.vm.form.regionId,
+ statusId : $scope.vm.form.statusId
});
}
return issueCompanyFields;
diff --git a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
index 735e06c..c10f9ba 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
@@ -535,6 +535,27 @@
$scope.vm.hostingMemo = result[0].memo;
});
+ $scope.$on("companyTypeEvent", function (event, result) {
+ $scope.vm.form.companyTypeId = result[0].id;
+ });
+ $scope.$on("parentSectorEvent", function (event, result) {
+ if ($rootScope.isDefined(result[0])) {
+ $scope.vm.form.parentSectorId = result[0].id;
+ }
+
+ $scope.vm.form.childSector = "";
+ $scope.vm.form.childSectors = [];
+ });
+ $scope.$on("childSectorEvent", function (event, result) {
+ $scope.vm.form.childSectorId = result[0].id;
+ });
+ $scope.$on("regionEvent", function (event, result) {
+ $scope.vm.form.regionId = result[0].id;
+ });
+ $scope.$on("statusEvent", function (event, result) {
+ $scope.vm.form.statusId = result[0].id;
+ });
+
// �뤌 �쟾�넚
function formSubmit() {
$rootScope.spinner = true;
@@ -693,11 +714,11 @@
email :$scope.vm.companyEmail,
url :$scope.vm.companyUrl,
memo : $scope.vm.companyMemo,
- companyTypeId : companyField.companyTypeId,
- parentSectorId : companyField.parentSectorId,
- childSectorId : companyField.childSectorId,
- regionId : companyField.regionId,
- statusId : companyField.statusId
+ companyTypeId : $scope.vm.form.companyTypeId,
+ parentSectorId : $scope.vm.form.parentSectorId,
+ childSectorId : $scope.vm.form.childSectorId,
+ regionId : $scope.vm.form.regionId,
+ statusId : $scope.vm.form.statusId
});
}
diff --git a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
index c635355..ef407f5 100644
--- a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
@@ -550,6 +550,27 @@
$scope.vm.hostingMemo = result[0].memo;
});
+ $scope.$on("companyTypeEvent", function (event, result) {
+ $scope.vm.form.companyTypeId = result[0].id;
+ });
+ $scope.$on("parentSectorEvent", function (event, result) {
+ if ($rootScope.isDefined(result[0])) {
+ $scope.vm.form.parentSectorId = result[0].id;
+ }
+
+ $scope.vm.form.childSector = "";
+ $scope.vm.form.childSectors = [];
+ });
+ $scope.$on("childSectorEvent", function (event, result) {
+ $scope.vm.form.childSectorId = result[0].id;
+ });
+ $scope.$on("regionEvent", function (event, result) {
+ $scope.vm.form.regionId = result[0].id;
+ });
+ $scope.$on("statusEvent", function (event, result) {
+ $scope.vm.form.statusId = result[0].id;
+ });
+
// �뤌 �쟾�넚
function formSubmit() {
$rootScope.spinner = true;
@@ -708,11 +729,11 @@
email :$scope.vm.companyEmail,
url :$scope.vm.companyUrl,
memo : $scope.vm.companyMemo,
- companyTypeId : companyField.companyTypeId,
- parentSectorId : companyField.parentSectorId,
- childSectorId : companyField.childSectorId,
- regionId : companyField.regionId,
- statusId : companyField.statusId
+ companyTypeId : $scope.vm.form.companyTypeId,
+ parentSectorId : $scope.vm.form.parentSectorId,
+ childSectorId : $scope.vm.form.childSectorId,
+ regionId : $scope.vm.form.regionId,
+ statusId : $scope.vm.form.statusId
});
}
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index b8ee166..d5395d2 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -436,10 +436,15 @@
}
$scope.$on("companyTypeEvent", function (event, result) {
- $scope.vm.form.companyTypeId = result[0].id;
+ $scope.vm.form.companyTypeId = result[0].id;
});
$scope.$on("parentSectorEvent", function (event, result) {
- $scope.vm.form.parentSectorId = result[0].id;
+ if ($rootScope.isDefined(result[0])) {
+ $scope.vm.form.parentSectorId = result[0].id;
+ }
+
+ $scope.vm.form.childSector = "";
+ $scope.vm.form.childSectors = [];
});
$scope.$on("childSectorEvent", function (event, result) {
$scope.vm.form.childSectorId = result[0].id;
diff --git a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
index 1da24db..4e1655e 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -77,6 +77,7 @@
});
} else if ($attrs["rangeType"] === "singleDate") {
$($element).daterangepicker({
+ timePicker24Hour : true,
timePicker: true,
timePickerSeconds : true,
autoUpdateInput: true,
diff --git a/src/main/webapp/views/companyField/companyFieldAdd.html b/src/main/webapp/views/companyField/companyFieldAdd.html
index 032d01a..4a930c8 100644
--- a/src/main/webapp/views/companyField/companyFieldAdd.html
+++ b/src/main/webapp/views/companyField/companyFieldAdd.html
@@ -105,14 +105,12 @@
kr-input
ng-model="vm.form.tels[$index]"
input-regex="[^0-9]"
- maxlength="11"
- minlength="9"
autocomplete="off">
<span class="select3-selection__email__remove" ng-click="fn.removeTelInput($index)">횞</span>
</div>
- <div ng-show="companyFieldAddForm.tel.$error.minlength" class="help-block form-text text-danger"
+ <!--<div ng-show="companyFieldAddForm.tel.$error.minlength" class="help-block form-text text-danger"
translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
- </div>
+ </div>-->
</div>
</div>
<div class="col-lg-2 mt-25" style="margin-left: -15px">
@@ -184,6 +182,7 @@
page="vm.autoCompletePage.companyType.page"
total-page="vm.autoCompletePage.companyType.totalPage"
input-disabled="false"
+ broad-cast="companyTypeEvent"
translation-texts="{ empty : 'common.emptyCompanyType' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -205,6 +204,7 @@
total-page="vm.autoCompletePage.parentSector.totalPage"
input-disabled="false"
translation-texts="{ empty : 'common.emptyParentSector' }"
+ broad-cast="parentSectorEvent"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
</div>
@@ -215,6 +215,7 @@
<js-autocomplete-single data-input-name="childSector"
selected-model="vm.form.childSectors"
ng-model="vm.form.childSector"
+ ng-value="vm.form.childSector"
custom-input="false"
search="vm.form.childSector"
source="fn.getCompanyChildSector(vm.form.parentSectorId, vm.form.parentSectors[0].id, vm.typeCategory.childSector, vm.form.childSector, vm.form.childSectors, vm.autoCompletePage.childSector.page, fn.getChildSectorListCallBack)"
@@ -222,6 +223,7 @@
total-page="vm.autoCompletePage.childSector.totalPage"
input-disabled="false"
translation-texts="{ empty : 'common.emptyChildSector' }"
+ broad-cast="childSectorEvent"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
</div>
@@ -241,6 +243,7 @@
page="vm.autoCompletePage.region.page"
total-page="vm.autoCompletePage.region.totalPage"
input-disabled="false"
+ broad-cast="regionEvent"
translation-texts="{ empty : 'common.emptyRegion' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -260,6 +263,7 @@
page="vm.autoCompletePage.status.page"
total-page="vm.autoCompletePage.status.totalPage"
input-disabled="false"
+ broad-cast="statusEvent"
translation-texts="{ empty : 'common.emptyStatus' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
diff --git a/src/main/webapp/views/companyField/companyFieldList.html b/src/main/webapp/views/companyField/companyFieldList.html
index ef1c543..1e88452 100644
--- a/src/main/webapp/views/companyField/companyFieldList.html
+++ b/src/main/webapp/views/companyField/companyFieldList.html
@@ -87,7 +87,7 @@
</div>
<div class="table-responsive">
- <js-table data="vm.responseData.data" table-configs="vm.tableConfigs" event="tableEvent"></js-table>
+ <js-table style="word-break: break-word" data="vm.responseData.data" table-configs="vm.tableConfigs" event="tableEvent"></js-table>
</div>
<div class="controls-below-table text-center">
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index 4b303b6..3396052 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -103,14 +103,12 @@
kr-input
ng-model="vm.form.tels[$index]"
input-regex="[^0-9]"
- maxlength="11"
- minlength="9"
autocomplete="off">
<span class="select3-selection__email__remove" ng-click="fn.removeTelInput($index)">횞</span>
</div>
- <div ng-show="companyFieldModifyForm.tel.$error.minlength" class="help-block form-text text-danger"
+ <!--<div ng-show="companyFieldModifyForm.tel.$error.minlength" class="help-block form-text text-danger"
translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
- </div>
+ </div>-->
</div>
</div>
<div class="col-lg-2 mt-25" style="margin-left: -15px">
diff --git a/src/main/webapp/views/hostingField/hostingFieldAdd.html b/src/main/webapp/views/hostingField/hostingFieldAdd.html
index 99c340c..96a0a2a 100644
--- a/src/main/webapp/views/hostingField/hostingFieldAdd.html
+++ b/src/main/webapp/views/hostingField/hostingFieldAdd.html
@@ -79,13 +79,12 @@
input-regex="[^0-9]"
autocomplete="off"
ng-model="vm.form.tels[$index]"
- maxlength="11"
- minlength="9">
+ >
<span class="select3-selection__email__remove" ng-click="fn.removeTelInput($index)">횞</span>
</div>
- <div ng-show="hostingFieldAddForm.tel.$error.minlength" class="help-block form-text text-danger"
+ <!--<div ng-show="hostingFieldAddForm.tel.$error.minlength" class="help-block form-text text-danger"
translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
- </div>
+ </div>-->
</div>
</div>
<div class="col-lg-2 mt-25" style="margin-left: -15px">
diff --git a/src/main/webapp/views/hostingField/hostingFieldList.html b/src/main/webapp/views/hostingField/hostingFieldList.html
index d7cb4e6..a8e8893 100644
--- a/src/main/webapp/views/hostingField/hostingFieldList.html
+++ b/src/main/webapp/views/hostingField/hostingFieldList.html
@@ -86,7 +86,7 @@
</div>
<div class="table-responsive">
- <js-table data="vm.responseData.data" table-configs="vm.tableConfigs" event="tableEvent"></js-table>
+ <js-table style="word-break: break-word" data="vm.responseData.data" table-configs="vm.tableConfigs" event="tableEvent"></js-table>
</div>
<div class="controls-below-table text-center">
diff --git a/src/main/webapp/views/hostingField/hostingFieldModify.html b/src/main/webapp/views/hostingField/hostingFieldModify.html
index 1375b43..9b74b0b 100644
--- a/src/main/webapp/views/hostingField/hostingFieldModify.html
+++ b/src/main/webapp/views/hostingField/hostingFieldModify.html
@@ -80,13 +80,12 @@
input-regex="[^0-9]"
autocomplete="off"
ng-model="vm.form.tels[$index]"
- maxlength="11"
- minlength="9">
+ >
<span class="select3-selection__email__remove" ng-click="fn.removeTelInput($index)">횞</span>
</div>
- <div ng-show="hostingFieldModifyForm.tel.$error.minlength" class="help-block form-text text-danger"
+ <!--<div ng-show="hostingFieldModifyForm.tel.$error.minlength" class="help-block form-text text-danger"
translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
- </div>
+ </div>-->
</div>
</div>
<div class="col-lg-2 mt-25" style="margin-left: -15px">
diff --git a/src/main/webapp/views/ispField/ispFieldAdd.html b/src/main/webapp/views/ispField/ispFieldAdd.html
index 6d4aa60..509fc5e 100644
--- a/src/main/webapp/views/ispField/ispFieldAdd.html
+++ b/src/main/webapp/views/ispField/ispFieldAdd.html
@@ -77,13 +77,12 @@
input-regex="[^0-9]"
autocomplete="off"
ng-model="vm.form.tels[$index]"
- maxlength="11"
- minlength="9">
+ >
<span class="select3-selection__email__remove" ng-click="fn.removeTelInput($index)">횞</span>
</div>
- <div ng-show="ispFieldAddForm.tel.$error.minlength" class="help-block form-text text-danger"
+ <!--<div ng-show="ispFieldAddForm.tel.$error.minlength" class="help-block form-text text-danger"
translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
- </div>
+ </div>-->
</div>
</div>
<div class="col-lg-2 mt-25" style="margin-left: -15px">
diff --git a/src/main/webapp/views/ispField/ispFieldList.html b/src/main/webapp/views/ispField/ispFieldList.html
index ac9e275..bb01173 100644
--- a/src/main/webapp/views/ispField/ispFieldList.html
+++ b/src/main/webapp/views/ispField/ispFieldList.html
@@ -86,7 +86,7 @@
</div>
<div class="table-responsive">
- <js-table data="vm.responseData.data" table-configs="vm.tableConfigs" event="tableEvent"></js-table>
+ <js-table style="word-break: break-word" data="vm.responseData.data" table-configs="vm.tableConfigs" event="tableEvent"></js-table>
</div>
<div class="controls-below-table text-center">
diff --git a/src/main/webapp/views/ispField/ispFieldModify.html b/src/main/webapp/views/ispField/ispFieldModify.html
index d00ae90..5f9d2d5 100644
--- a/src/main/webapp/views/ispField/ispFieldModify.html
+++ b/src/main/webapp/views/ispField/ispFieldModify.html
@@ -80,13 +80,12 @@
input-regex="[^0-9]"
autocomplete="off"
ng-model="vm.form.tels[$index]"
- maxlength="11"
- minlength="9">
+ >
<span class="select3-selection__email__remove" ng-click="fn.removeTelInput($index)">횞</span>
</div>
- <div ng-show="ispFieldModifyForm.tel.$error.minlength" class="help-block form-text text-danger"
+ <!--<div ng-show="ispFieldModifyForm.tel.$error.minlength" class="help-block form-text text-danger"
translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
- </div>
+ </div>-->
</div>
</div>
<div class="col-lg-2 mt-25" style="margin-left: -15px">
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 77a16dc..4b5fb35 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -533,6 +533,7 @@
page="vm.autoCompletePage.companyType.page"
total-page="vm.autoCompletePage.companyType.totalPage"
input-disabled="false"
+ broad-cast="companyTypeEvent"
translation-texts="{ empty : 'common.emptyCompanyType' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -552,6 +553,7 @@
page="vm.autoCompletePage.parentSector.page"
total-page="vm.autoCompletePage.parentSector.totalPage"
input-disabled="false"
+ broad-cast="parentSectorEvent"
translation-texts="{ empty : 'common.emptyParentSector' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -571,6 +573,7 @@
page="vm.autoCompletePage.childSector.page"
total-page="vm.autoCompletePage.childSector.totalPage"
input-disabled="false"
+ broad-cast="childSectorEvent"
translation-texts="{ empty : 'common.emptyChildSector' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -590,6 +593,7 @@
page="vm.autoCompletePage.region.page"
total-page="vm.autoCompletePage.region.totalPage"
input-disabled="false"
+ broad-cast="regionEvent"
translation-texts="{ empty : 'common.emptyRegion' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -609,6 +613,7 @@
page="vm.autoCompletePage.status.page"
total-page="vm.autoCompletePage.status.totalPage"
input-disabled="false"
+ broad-cast="statusEvent"
translation-texts="{ empty : 'common.emptyStatus' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
diff --git a/src/main/webapp/views/issue/issueAddDown.html b/src/main/webapp/views/issue/issueAddDown.html
index 8ad7c67..c63e0d2 100644
--- a/src/main/webapp/views/issue/issueAddDown.html
+++ b/src/main/webapp/views/issue/issueAddDown.html
@@ -488,6 +488,7 @@
page="vm.autoCompletePage.companyType.page"
total-page="vm.autoCompletePage.companyType.totalPage"
input-disabled="false"
+ broad-cast="companyTypeEvent"
translation-texts="{ empty : 'common.emptyCompanyType' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -507,6 +508,7 @@
page="vm.autoCompletePage.parentSector.page"
total-page="vm.autoCompletePage.parentSector.totalPage"
input-disabled="false"
+ broad-cast="parentSectorEvent"
translation-texts="{ empty : 'common.emptyParentSector' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -526,6 +528,7 @@
page="vm.autoCompletePage.childSector.page"
total-page="vm.autoCompletePage.childSector.totalPage"
input-disabled="false"
+ broad-cast="childSectorEvent"
translation-texts="{ empty : 'common.emptyChildSector' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -545,6 +548,7 @@
page="vm.autoCompletePage.region.page"
total-page="vm.autoCompletePage.region.totalPage"
input-disabled="false"
+ broad-cast="regionEvent"
translation-texts="{ empty : 'common.emptyRegion' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -564,6 +568,7 @@
page="vm.autoCompletePage.status.page"
total-page="vm.autoCompletePage.status.totalPage"
input-disabled="false"
+ broad-cast="statusEvent"
translation-texts="{ empty : 'common.emptyStatus' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
diff --git a/src/main/webapp/views/issue/issueAddRelation.html b/src/main/webapp/views/issue/issueAddRelation.html
index 9815a6a..6ce14a6 100644
--- a/src/main/webapp/views/issue/issueAddRelation.html
+++ b/src/main/webapp/views/issue/issueAddRelation.html
@@ -498,6 +498,7 @@
page="vm.autoCompletePage.companyType.page"
total-page="vm.autoCompletePage.companyType.totalPage"
input-disabled="false"
+ broad-cast="companyTypeEvent"
translation-texts="{ empty : 'common.emptyCompanyType' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -517,6 +518,7 @@
page="vm.autoCompletePage.parentSector.page"
total-page="vm.autoCompletePage.parentSector.totalPage"
input-disabled="false"
+ broad-cast="parentSectorEvent"
translation-texts="{ empty : 'common.emptyParentSector' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -536,6 +538,7 @@
page="vm.autoCompletePage.childSector.page"
total-page="vm.autoCompletePage.childSector.totalPage"
input-disabled="false"
+ broad-cast="childSectorEvent"
translation-texts="{ empty : 'common.emptyChildSector' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -555,6 +558,7 @@
page="vm.autoCompletePage.region.page"
total-page="vm.autoCompletePage.region.totalPage"
input-disabled="false"
+ broad-cast="regionEvent"
translation-texts="{ empty : 'common.emptyRegion' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -574,6 +578,7 @@
page="vm.autoCompletePage.status.page"
total-page="vm.autoCompletePage.status.totalPage"
input-disabled="false"
+ broad-cast="statusEvent"
translation-texts="{ empty : 'common.emptyStatus' }"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html
index 011f479..a4826c4 100644
--- a/src/main/webapp/views/issue/issueSendMailPartners.html
+++ b/src/main/webapp/views/issue/issueSendMailPartners.html
@@ -40,7 +40,7 @@
<div class="form-group mb10 mt-20">
<label for="emailTemplateForm" class="issue-label">
- <span translate="issue.partners">�뾽泥� �씠硫붿씪</span> <code class="highlighter-rouge">*</code>
+ <span translate="issue.selectTemplate">�뀥�뵆由� �꽑�깮</span> <code class="highlighter-rouge">*</code>
</label>
<select id="emailTemplateForm"
name="emailTemplate"
--
Gitblit v1.8.0