From 55480603f392704352492b3ba99cd7198f44cc8a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 08 12월 2021 14:54:15 +0900
Subject: [PATCH] * 업체,ISP,호스팅 - url(도메인) 항목 추가 * 이슈상태가 완료인 이슈는 리스트에서 제외
---
src/main/webapp/views/issue/issueAdd.html | 42 ++++
src/main/resources/mybatis/query-template/issue-template.xml | 6
src/main/webapp/scripts/app/ispField/ispFieldModify.controller.js | 3
src/main/java/kr/wisestone/owl/web/form/HostingFieldForm.java | 9 +
src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java | 9 +
src/main/resources/mybatis/query-template/HostingField-template.xml | 1
src/main/resources/mybatis/query-template/issueIsp-template.xml | 1
src/main/webapp/views/issue/issueAddRelation.html | 42 ++++
src/main/webapp/views/issue/issueModify.html | 42 ++++
src/main/java/kr/wisestone/owl/domain/IssueHosting.java | 10 +
src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js | 3
src/main/webapp/views/ispField/ispFieldAdd.html | 17 +
src/main/webapp/views/companyField/companyFieldModify.html | 17 +
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 9 +
src/main/resources/mybatis/query-template/IspField-template.xml | 1
src/main/webapp/scripts/app/hostingField/hostingFieldModify.controller.js | 3
src/main/java/kr/wisestone/owl/domain/IssueCompany.java | 12 +
src/main/webapp/scripts/app/issue/issueAddRelation.controller.js | 12 +
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 1
src/main/java/kr/wisestone/owl/vo/IssueHostingVo.java | 9 +
src/main/java/kr/wisestone/owl/web/form/IspFieldForm.java | 9 +
src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java | 3
src/main/webapp/scripts/app/hostingField/hostingFieldAdd.controller.js | 2
src/main/webapp/views/companyField/companyFieldAdd.html | 17 +
src/main/java/kr/wisestone/owl/domain/CompanyField.java | 9 +
src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java | 10 +
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 5
src/main/webapp/views/ispField/ispFieldModify.html | 17 +
src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java | 10 +
src/main/webapp/scripts/app/issue/issueModify.controller.js | 15 +
src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java | 3
src/main/java/kr/wisestone/owl/web/condition/HostingFieldCondition.java | 9 +
src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js | 5
src/main/java/kr/wisestone/owl/web/condition/IspFieldCondition.java | 9 +
src/main/java/kr/wisestone/owl/vo/IspFieldVo.java | 10 +
src/main/webapp/scripts/app/ispField/ispFieldList.controller.js | 5
src/main/java/kr/wisestone/owl/vo/IssueIspVo.java | 9 +
src/main/resources/mybatis/query-template/issueCompany-template.xml | 1
src/main/webapp/views/hostingField/hostingFieldAdd.html | 17 +
src/main/java/kr/wisestone/owl/vo/IssueCompanyVo.java | 9 +
src/main/resources/mybatis/query-template/companyField-template.xml | 1
src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js | 2
src/main/resources/mybatis/query-template/issueHosting-template.xml | 1
src/main/java/kr/wisestone/owl/domain/IspField.java | 10 +
src/main/java/kr/wisestone/owl/domain/HostingField.java | 8
src/main/java/kr/wisestone/owl/domain/IssueIsp.java | 10 +
src/main/java/kr/wisestone/owl/web/form/CompanyFieldForm.java | 9 +
src/main/webapp/i18n/ko/global.json | 1
src/main/webapp/scripts/app/ispField/ispFieldAdd.controller.js | 2
src/main/webapp/views/hostingField/hostingFieldModify.html | 17 +
src/main/webapp/WEB-INF/i18n/code_ko_KR.properties | 3
51 files changed, 483 insertions(+), 4 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/CompanyField.java b/src/main/java/kr/wisestone/owl/domain/CompanyField.java
index 52618f8..53fae93 100644
--- a/src/main/java/kr/wisestone/owl/domain/CompanyField.java
+++ b/src/main/java/kr/wisestone/owl/domain/CompanyField.java
@@ -16,6 +16,7 @@
private String name;
private String manager;
private String tel;
+ private String url;
private String email;
private String memo;
@@ -68,4 +69,12 @@
public void setMemo(String memo) {
this.memo = memo;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/domain/HostingField.java b/src/main/java/kr/wisestone/owl/domain/HostingField.java
index 19117e9..10ffa94 100644
--- a/src/main/java/kr/wisestone/owl/domain/HostingField.java
+++ b/src/main/java/kr/wisestone/owl/domain/HostingField.java
@@ -15,6 +15,7 @@
private String manager;
private String tel;
private String email;
+ private String url;
private String memo;
public HostingField() {}
@@ -75,4 +76,11 @@
this.memo = memo;
}
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/domain/IspField.java b/src/main/java/kr/wisestone/owl/domain/IspField.java
index bbafb02..9aec585 100644
--- a/src/main/java/kr/wisestone/owl/domain/IspField.java
+++ b/src/main/java/kr/wisestone/owl/domain/IspField.java
@@ -15,6 +15,7 @@
private String manager;
private String tel;
private String email;
+ private String url;
private String memo;
public IspField() {}
@@ -75,4 +76,11 @@
this.memo = memo;
}
- }
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+}
diff --git a/src/main/java/kr/wisestone/owl/domain/IssueCompany.java b/src/main/java/kr/wisestone/owl/domain/IssueCompany.java
index 6fd025d..551fe0b 100644
--- a/src/main/java/kr/wisestone/owl/domain/IssueCompany.java
+++ b/src/main/java/kr/wisestone/owl/domain/IssueCompany.java
@@ -17,6 +17,7 @@
private String manager;
private String tel;
private String email;
+ private String url;
private String memo;
@ManyToOne(fetch = FetchType.LAZY)
@@ -29,13 +30,14 @@
public IssueCompany(){}
- public IssueCompany(Issue issue, CompanyField companyField, String name, String manager, String tel, String email, String memo){
+ public IssueCompany(Issue issue, CompanyField companyField, String name, String manager, String tel, String email, String url, String memo){
this.issue = issue;
this.companyField = companyField;
this.name = name;
this.manager = manager;
this.tel = tel;
this.email = email;
+ this.url = url;
this.memo = memo;
}
@@ -102,4 +104,12 @@
public void setCompanyField(CompanyField companyField) {
this.companyField = companyField;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/domain/IssueHosting.java b/src/main/java/kr/wisestone/owl/domain/IssueHosting.java
index 7496bbb..eeebe67 100644
--- a/src/main/java/kr/wisestone/owl/domain/IssueHosting.java
+++ b/src/main/java/kr/wisestone/owl/domain/IssueHosting.java
@@ -18,6 +18,7 @@
private String manager;
private String tel;
private String email;
+ private String url;
private String memo;
@ManyToOne(fetch = FetchType.LAZY)
@@ -38,6 +39,7 @@
this.manager = manager;
this.tel = tel;
this.email = email;
+ this.url = url;
this.memo = memo;
}
@@ -112,4 +114,12 @@
public void setHostingField(HostingField hostingField) {
this.hostingField = hostingField;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/domain/IssueIsp.java b/src/main/java/kr/wisestone/owl/domain/IssueIsp.java
index 26625bc..2da7fad 100644
--- a/src/main/java/kr/wisestone/owl/domain/IssueIsp.java
+++ b/src/main/java/kr/wisestone/owl/domain/IssueIsp.java
@@ -18,6 +18,7 @@
private String manager;
private String tel;
private String email;
+ private String url;
private String memo;
@ManyToOne(fetch = FetchType.LAZY)
@@ -38,6 +39,7 @@
this.manager = manager;
this.tel = tel;
this.email = email;
+ this.url = url;
this.memo = memo;
}
@@ -112,4 +114,12 @@
public void setIspField(IspField ispField) {
this.ispField = ispField;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
index 648bfdb..21e6d45 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -136,6 +136,7 @@
excelInfo.addAttrInfos(new ExportExcelAttrVo("manager", this.messageAccessor.message("companyField.companyManager"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("tel", this.messageAccessor.message("companyField.companyTel"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("email", this.messageAccessor.message("companyField.companyEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("url", this.messageAccessor.message("companyField.companyUrl"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("memo", this.messageAccessor.message("companyField.companyMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.setDatas(companyFieldVos);
diff --git a/src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java
similarity index 96%
rename from src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java
rename to src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java
index a088565..eee1084 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java
@@ -31,7 +31,7 @@
import java.util.Map;
@Service
-public class HostingFieldFieldServiceImpl extends AbstractServiceImpl<HostingField, Long, JpaRepository<HostingField, Long>> implements HostingFieldService {
+public class HostingFieldServiceImpl extends AbstractServiceImpl<HostingField, Long, JpaRepository<HostingField, Long>> implements HostingFieldService {
@Autowired
private HostingFieldRepository hostingFieldRepository;
@@ -138,6 +138,7 @@
excelInfo.addAttrInfos(new ExportExcelAttrVo("manager", this.messageAccessor.message("Hosting.HostingManager"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("tel", this.messageAccessor.message("Hosting.HostingTel"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("email", this.messageAccessor.message("Hosting.HostingEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("url", this.messageAccessor.message("Hosting.HostingUrl"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("memo", this.messageAccessor.message("Hosting.HostingMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.setDatas(hostingFieldVos);
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
similarity index 96%
rename from src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java
rename to src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
index c666d88..d3fb15f 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
@@ -31,7 +31,7 @@
import java.util.Map;
@Service
-public class IspFieldFieldServiceImpl extends AbstractServiceImpl<IspField, Long, JpaRepository<IspField, Long>> implements IspFieldService {
+public class IspFieldServiceImpl extends AbstractServiceImpl<IspField, Long, JpaRepository<IspField, Long>> implements IspFieldService {
@Autowired
private IspFieldRepository ispFieldRepository;
@@ -137,6 +137,7 @@
excelInfo.addAttrInfos(new ExportExcelAttrVo("manager", this.messageAccessor.message("isp.ispManager"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("tel", this.messageAccessor.message("isp.ispTel"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("email", this.messageAccessor.message("isp.ispEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("url", this.messageAccessor.message("isp.ispUrl"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("memo", this.messageAccessor.message("isp.ispMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.setDatas(ispFieldVos);
diff --git a/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java b/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
index 6d2a2cd..6ab7497 100644
--- a/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
@@ -5,6 +5,7 @@
private String manager;
private String tel;
private String email;
+ private String url;
private String memo;
public CompanyFieldVo() {}
@@ -14,6 +15,7 @@
this.manager = manager;
this.tel = tel;
this.email = email;
+ this.url = url;
this.memo = memo;
}
@@ -48,4 +50,12 @@
public void setMemo(String memo) {
this.memo = memo;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java b/src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java
index 4320074..9afd149 100644
--- a/src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java
@@ -7,6 +7,7 @@
private String tel;
private String email;
private String memo;
+ private String url;
private String byName;
public HostingFieldVo() {}
@@ -16,6 +17,7 @@
this.manager = manager;
this.tel = tel;
this.email = email;
+ this.url = url;
this.memo = memo;
}
@@ -66,4 +68,12 @@
public void setByName(String byName) {
this.byName = byName;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/vo/IspFieldVo.java b/src/main/java/kr/wisestone/owl/vo/IspFieldVo.java
index f81b69b..e09d30a 100644
--- a/src/main/java/kr/wisestone/owl/vo/IspFieldVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IspFieldVo.java
@@ -6,6 +6,7 @@
private String manager;
private String tel;
private String email;
+ private String url;
private String memo;
public IspFieldVo() {}
@@ -16,6 +17,7 @@
this.manager = manager;
this.tel = tel;
this.email = email;
+ this.url = url;
this.memo = memo;
}
@@ -58,4 +60,12 @@
public void setMemo(String memo) {
this.memo = memo;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueCompanyVo.java b/src/main/java/kr/wisestone/owl/vo/IssueCompanyVo.java
index 6ea486b..812899d 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueCompanyVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueCompanyVo.java
@@ -8,6 +8,7 @@
private Long companyId;
private String name;
private String manager;
+ private String url;
private String tel;
private String email;
private String memo;
@@ -69,4 +70,12 @@
public void setMemo(String memo) {
this.memo = memo;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueHostingVo.java b/src/main/java/kr/wisestone/owl/vo/IssueHostingVo.java
index 665efb1..1c1aee2 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueHostingVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueHostingVo.java
@@ -9,6 +9,7 @@
private String name;
private String code;
private String manager;
+ private String url;
private String tel;
private String email;
private String memo;
@@ -78,4 +79,12 @@
public void setMemo(String memo) {
this.memo = memo;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueIspVo.java b/src/main/java/kr/wisestone/owl/vo/IssueIspVo.java
index c914da9..5543805 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueIspVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueIspVo.java
@@ -9,6 +9,7 @@
private String name;
private String code;
private String manager;
+ private String url;
private String tel;
private String email;
private String memo;
@@ -79,4 +80,12 @@
public void setMemo(String memo) {
this.memo = memo;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java b/src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java
index 978d0a0..f0b62ab 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java
@@ -10,6 +10,7 @@
private String manager;
private String tel;
private String email;
+ private String url;
private String memo;
private Integer Page;
@@ -82,4 +83,12 @@
public void setPageSize(Integer pageSize) {
PageSize = pageSize;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/web/condition/HostingFieldCondition.java b/src/main/java/kr/wisestone/owl/web/condition/HostingFieldCondition.java
index 39319b4..242f299 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/HostingFieldCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/HostingFieldCondition.java
@@ -11,6 +11,7 @@
private String manager;
private String tel;
private String email;
+ private String url;
private String memo;
private Integer Page;
@@ -92,4 +93,12 @@
public void setPageSize(Integer pageSize) {
PageSize = pageSize;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/web/condition/IspFieldCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IspFieldCondition.java
index 626323f..23f3a47 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IspFieldCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IspFieldCondition.java
@@ -11,6 +11,7 @@
private String manager;
private String tel;
private String email;
+ private String url;
private String memo;
private Integer Page;
@@ -91,4 +92,12 @@
public void setPageSize(Integer pageSize) {
PageSize = pageSize;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/web/form/CompanyFieldForm.java b/src/main/java/kr/wisestone/owl/web/form/CompanyFieldForm.java
index e50f057..4c4f8e3 100644
--- a/src/main/java/kr/wisestone/owl/web/form/CompanyFieldForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/CompanyFieldForm.java
@@ -10,6 +10,7 @@
public class CompanyFieldForm extends UsePartnerForm {
private String manager;
private String tel;
+ private String url;
private String memo;
private List<Long> removeIds = Lists.newArrayList();
@@ -40,6 +41,14 @@
this.tel = tel;
}
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
public String getMemo() {
return memo;
}
diff --git a/src/main/java/kr/wisestone/owl/web/form/HostingFieldForm.java b/src/main/java/kr/wisestone/owl/web/form/HostingFieldForm.java
index 475fef3..099b3f1 100644
--- a/src/main/java/kr/wisestone/owl/web/form/HostingFieldForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/HostingFieldForm.java
@@ -11,6 +11,7 @@
private String code;
private String manager;
private String tel;
+ private String url;
private String memo;
private List<Long> removeIds = Lists.newArrayList();
@@ -64,4 +65,12 @@
public void setRemoveIds(List<Long> removeIds) {
this.removeIds = removeIds;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/web/form/IspFieldForm.java b/src/main/java/kr/wisestone/owl/web/form/IspFieldForm.java
index e270f2a..6d5b3ea 100644
--- a/src/main/java/kr/wisestone/owl/web/form/IspFieldForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/IspFieldForm.java
@@ -11,6 +11,7 @@
private String code;
private String manager;
private String tel;
+ private String url;
private String memo;
private List<Long> removeIds = Lists.newArrayList();
@@ -65,4 +66,12 @@
public void setRemoveIds(List<Long> removeIds) {
this.removeIds = removeIds;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
diff --git a/src/main/resources/mybatis/query-template/HostingField-template.xml b/src/main/resources/mybatis/query-template/HostingField-template.xml
index baf5518..34f29db 100644
--- a/src/main/resources/mybatis/query-template/HostingField-template.xml
+++ b/src/main/resources/mybatis/query-template/HostingField-template.xml
@@ -11,6 +11,7 @@
h.manager as manager,
h.tel as tel,
h.email as email,
+ h.url as url,
h.memo as memo
FROM
hosting_field h
diff --git a/src/main/resources/mybatis/query-template/IspField-template.xml b/src/main/resources/mybatis/query-template/IspField-template.xml
index 98c25b5..11685ce 100644
--- a/src/main/resources/mybatis/query-template/IspField-template.xml
+++ b/src/main/resources/mybatis/query-template/IspField-template.xml
@@ -11,6 +11,7 @@
i.manager as manager,
i.tel as tel,
i.email as email,
+ i.url as url,
i.memo as memo
FROM
isp_field i
diff --git a/src/main/resources/mybatis/query-template/companyField-template.xml b/src/main/resources/mybatis/query-template/companyField-template.xml
index c40ca51..18c73ac 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -10,6 +10,7 @@
cf.manager as manager,
cf.tel as tel,
cf.email as email,
+ cf.url as url,
cf.memo as memo
FROM
company_field cf
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 980a1ed..55d1396 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -192,6 +192,7 @@
</when>
</choose>
AND issue.parent_issue_id IS NULL
+ AND issue_status.issue_status_type != 'CLOSE'
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
@@ -383,6 +384,7 @@
</when>
</choose>
AND issue.parent_issue_id IS NULL
+ AND issue_status.issue_status_type != 'CLOSE'
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
@@ -530,8 +532,10 @@
COUNT(DISTINCT issue.id)
FROM issue issue
LEFT OUTER JOIN issue_department isd ON issue.id = isd.issue_id
+ LEFT OUTER JOIN issue_status iss ON iss.id = issue.issue_status_id
WHERE 1=1
AND issue.parent_issue_id IS NULL
+ AND iss.issue_status_type != 'CLOSE'
<if test="title != null and !title.equals('') ">
AND issue.title like CONCAT('%',#{title},'%')
</if>
@@ -654,8 +658,10 @@
COUNT(DISTINCT issue.id)
FROM issue issue
LEFT OUTER JOIN issue_department isd ON issue.id = isd.issue_id
+ LEFT OUTER JOIN issue_status iss ON iss.id = issue.issue_status_id
WHERE 1=1
AND issue.parent_issue_id IS NULL
+ AND iss.issue_status_type != 'CLOSE'
<if test="title != null and !title.equals('') ">
AND issue.title like CONCAT('%',#{title},'%')
</if>
diff --git a/src/main/resources/mybatis/query-template/issueCompany-template.xml b/src/main/resources/mybatis/query-template/issueCompany-template.xml
index ef4d317..eab1624 100644
--- a/src/main/resources/mybatis/query-template/issueCompany-template.xml
+++ b/src/main/resources/mybatis/query-template/issueCompany-template.xml
@@ -12,6 +12,7 @@
ic.manager as companyManager,
ic.tel as companyTel,
ic.email as companyEmail,
+ ic.url as companyUrl,
ic.memo as companyMemo
FROM issue_company ic
WHERE 1=1
diff --git a/src/main/resources/mybatis/query-template/issueHosting-template.xml b/src/main/resources/mybatis/query-template/issueHosting-template.xml
index f554a09..1311e8f 100644
--- a/src/main/resources/mybatis/query-template/issueHosting-template.xml
+++ b/src/main/resources/mybatis/query-template/issueHosting-template.xml
@@ -13,6 +13,7 @@
ih.manager as hostingManager,
ih.tel as hostingTel,
ih.email as hostingEmail,
+ ih.url as hostingUrl,
ih.memo as hostingMemo
FROM issue_hosting ih
WHERE 1=1
diff --git a/src/main/resources/mybatis/query-template/issueIsp-template.xml b/src/main/resources/mybatis/query-template/issueIsp-template.xml
index 89c4fdf..9c07669 100644
--- a/src/main/resources/mybatis/query-template/issueIsp-template.xml
+++ b/src/main/resources/mybatis/query-template/issueIsp-template.xml
@@ -13,6 +13,7 @@
ii.manager as ispManager,
ii.tel as ispTel,
ii.email as ispEmail,
+ ii.url as ispUrl,
ii.memo as ispMemo
FROM issue_isp ii
WHERE 1=1
diff --git a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
index 198da73..965a5e7 100644
--- a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
@@ -129,16 +129,19 @@
companyField.companyManager=\uB2F4\uB2F9\uC790
companyField.companyTel=\uC804\uD654\uBC88\uD638
companyField.companyEmail=\uC774\uBA54\uC77C
+companyField.companyUrl=url
companyField.companyMemo=\uBE44\uACE0
isp.ispName=ISP \uC774\uB984
isp.ispCode=\uCF54\uB4DC
isp.ispManager=\uB2F4\uB2F9\uC790
isp.ispTel=\uC804\uD654\uBC88\uD638
isp.ispEmail=\uC774\uBA54\uC77C
+isp.ispUrl=url
isp.ispMemo=\uBE44\uACE0
Hosting.HostingName=\uD638\uC2A4\uD305 \uC774\uB984
Hosting.HostingCode=\uCF54\uB4DC
Hosting.HostingManager=\uB2F4\uB2F9\uC790
Hosting.HostingTel=\uC804\uD654\uBC88\uD638
Hosting.HostingEmail=\uC774\uBA54\uC77C
+Hosting.HostingUrl=url
Hosting.HostingMemo=\uBE44\uACE0
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 6c33199..2cc9ea6 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -897,6 +897,7 @@
"profitYN" : "�쁺由�/鍮꾩쁺由�",
"industry" : "�궛�뾽 遺꾨쪟",
"domain" : "�룄硫붿씤",
+ "url" : "url",
"ipAdress" : "ip二쇱냼",
"manager" : "�떞�떦�옄",
"tel" : "�쟾�솕踰덊샇",
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
index bca5967..dbc434f 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
@@ -26,6 +26,7 @@
manager : "", //�떞�떦�옄
tel : "", //�쟾�솕踰덊샇
email : "", //�씠硫붿씪
+ url : "", // url
memo : "" //鍮꾧퀬
}
};
@@ -51,6 +52,7 @@
manager : $scope.vm.form.manager, //�떞�떦�옄
tel : $scope.vm.form.tel, //�쟾�솕踰덊샇
email : $scope.vm.form.email, //�씠硫붿씪
+ url : $scope.vm.form.url, // url
memo : $scope.vm.form.memo //鍮꾧퀬
};
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index 7d0c3a9..d3acb3c 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -92,6 +92,11 @@
.setDName("email")
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("companyField.url")
+ .setHWidth("bold")
+ .setDName("url")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.memo")
.setHWidth("bold")
.setDName("memo")
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
index 9da36d8..c163f32 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
@@ -25,6 +25,7 @@
manager : "", //�떞�떦�옄
tel : "", //�쟾�솕踰덊샇
email : "", //�씠硫붿씪
+ url : "", // url
memo : "" //硫붾え(鍮꾧퀬)
}
};
@@ -51,6 +52,7 @@
manager : $rootScope.preventXss($scope.vm.form.manager),
tel : $rootScope.preventXss($scope.vm.form.tel),
email : $rootScope.preventXss($scope.vm.form.email),
+ url : $rootScope.preventXss($scope.vm.form.url), // url
memo : $rootScope.preventXss($scope.vm.form.memo)
};
@@ -98,6 +100,7 @@
$scope.vm.form.manager = result.data.content.manager;
$scope.vm.form.email = result.data.content.email;
$scope.vm.form.tel = result.data.content.tel;
+ $scope.vm.form.url = result.data.content.url;
$scope.vm.form.memo = result.data.content.memo;
}
}
diff --git a/src/main/webapp/scripts/app/hostingField/hostingFieldAdd.controller.js b/src/main/webapp/scripts/app/hostingField/hostingFieldAdd.controller.js
index 20433a1..f9ed321 100644
--- a/src/main/webapp/scripts/app/hostingField/hostingFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/hostingField/hostingFieldAdd.controller.js
@@ -23,6 +23,7 @@
manager : "", //�떞�떦�옄
tel : "", //�쟾�솕踰덊샇
email : "", //�씠硫붿씪
+ url : "", // url
memo : "" //鍮꾧퀬
}
};
@@ -45,6 +46,7 @@
manager : $scope.vm.form.manager, //�떞�떦�옄
tel : $scope.vm.form.tel, //�쟾�솕踰덊샇
email : $scope.vm.form.email, //�씠硫붿씪
+ url : $scope.vm.form.url, // url
memo : $scope.vm.form.memo //鍮꾧퀬
};
diff --git a/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js b/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js
index e7f15cf..8f1ce26 100644
--- a/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js
+++ b/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js
@@ -90,6 +90,11 @@
.setDName("email")
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("companyField.url")
+ .setHWidth("bold")
+ .setDName("url")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
.setHName("hostingField.memo")
.setHWidth("bold")
.setDName("memo")
diff --git a/src/main/webapp/scripts/app/hostingField/hostingFieldModify.controller.js b/src/main/webapp/scripts/app/hostingField/hostingFieldModify.controller.js
index e7c73ef..36df870 100644
--- a/src/main/webapp/scripts/app/hostingField/hostingFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/hostingField/hostingFieldModify.controller.js
@@ -26,6 +26,7 @@
manager : "", //�떞�떦�옄
tel : "", //�쟾�솕踰덊샇
email : "", //�씠硫붿씪
+ url : "", // url
memo : "" //硫붾え(鍮꾧퀬)
}
};
@@ -49,6 +50,7 @@
manager : $rootScope.preventXss($scope.vm.form.manager),
tel : $rootScope.preventXss($scope.vm.form.tel),
email : $rootScope.preventXss($scope.vm.form.email),
+ url : $rootScope.preventXss($scope.vm.form.url), // url
memo : $rootScope.preventXss($scope.vm.form.memo)
};
@@ -97,6 +99,7 @@
$scope.vm.form.manager = result.data.content.manager;
$scope.vm.form.email = result.data.content.email;
$scope.vm.form.tel = result.data.content.tel;
+ $scope.vm.form.url = result.data.content.url;
$scope.vm.form.memo = result.data.content.memo;
}
}
diff --git a/src/main/webapp/scripts/app/ispField/ispFieldAdd.controller.js b/src/main/webapp/scripts/app/ispField/ispFieldAdd.controller.js
index 2cb2fff..701a6d1 100644
--- a/src/main/webapp/scripts/app/ispField/ispFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/ispField/ispFieldAdd.controller.js
@@ -23,6 +23,7 @@
manager : "", //�떞�떦�옄
tel : "", //�쟾�솕踰덊샇
email : "", //�씠硫붿씪
+ url : "", // url
memo : "" //鍮꾧퀬
}
};
@@ -45,6 +46,7 @@
manager : $scope.vm.form.manager, //�떞�떦�옄
tel : $scope.vm.form.tel, //�쟾�솕踰덊샇
email : $scope.vm.form.email, //�씠硫붿씪
+ url : $scope.vm.form.url, // url
memo : $scope.vm.form.memo //鍮꾧퀬
};
diff --git a/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js b/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
index ce9ad37..d0090cf 100644
--- a/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
+++ b/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
@@ -90,6 +90,11 @@
.setDName("email")
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("companyField.url")
+ .setHWidth("bold")
+ .setDName("url")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
.setHName("ispField.memo")
.setHWidth("bold")
.setDName("memo")
diff --git a/src/main/webapp/scripts/app/ispField/ispFieldModify.controller.js b/src/main/webapp/scripts/app/ispField/ispFieldModify.controller.js
index 84d41e0..f654894 100644
--- a/src/main/webapp/scripts/app/ispField/ispFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/ispField/ispFieldModify.controller.js
@@ -25,6 +25,7 @@
manager : "", //�떞�떦�옄
tel : "", //�쟾�솕踰덊샇
email : "", //�씠硫붿씪
+ url : "", // url
memo : "" //硫붾え(鍮꾧퀬)
}
};
@@ -48,6 +49,7 @@
manager : $rootScope.preventXss($scope.vm.form.manager),
tel : $rootScope.preventXss($scope.vm.form.tel),
email : $rootScope.preventXss($scope.vm.form.email),
+ url : $rootScope.preventXss($scope.vm.form.url), // url
memo : $rootScope.preventXss($scope.vm.form.memo)
};
@@ -96,6 +98,7 @@
$scope.vm.form.manager = result.data.content.manager;
$scope.vm.form.email = result.data.content.email;
$scope.vm.form.tel = result.data.content.tel;
+ $scope.vm.form.url = result.data.content.url;
$scope.vm.form.memo = result.data.content.memo;
}
}
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index f9a4215..18cb24a 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -69,6 +69,7 @@
companyManager : "", // �뾽泥� �떞�떦�옄
companyTel : "", // �뾽泥� �쟾�솕踰덊샇
companyEmail : "", // �뾽泥� �씠硫붿씪
+ companyUrl : "", // �뾽泥� url
companyMemo : "", // �뾽泥� 鍮꾧퀬
ispId : -1, // ISP ID
ispName : "", // ISP 紐�
@@ -76,12 +77,14 @@
ispManager : "", // ISP �떞�떦�옄
ispTel : "", // ISP �쟾�솕踰덊샇
ispEmail : "", // ISP �씠硫붿씪
+ ispUrl : "", // url
ispMemo : "", // ISP 鍮꾧퀬
hostingId : -1, // �샇�뒪�똿 ID
hostingName : "", // �샇�뒪�똿紐� 寃��깋
hostingManager : "", // �샇�뒪�똿 �떞�떦�옄
hostingTel : "", // �샇�뒪�똿 �쟾�솕踰덊샇
hostingEmail : "", // �샇�뒪�똿 �씠硫붿씪
+ hostingUrl : "", // url
hostingMemo :"", // �샇�뒪�똿 鍮꾧퀬
autoCompletePage : {
@@ -390,6 +393,7 @@
$scope.vm.companyManager = result[0].manager;
$scope.vm.companyTel = result[0].tel;
$scope.vm.companyEmail = result[0].email;
+ $scope.vm.companyUrl = result[0].url;
$scope.vm.companyMemo = result[0].memo;
});
@@ -402,6 +406,7 @@
$scope.vm.ispManager = result[0].manager;
$scope.vm.ispTel = result[0].tel;
$scope.vm.ispEmail = result[0].email;
+ $scope.vm.ispUrl = result[0].url;
$scope.vm.ispMemo = result[0].memo;
});
@@ -413,6 +418,7 @@
$scope.vm.hostingManager = result[0].manager;
$scope.vm.hostingTel = result[0].tel;
$scope.vm.hostingEmail = result[0].email;
+ $scope.vm.hostingUrl = result[0].url;
$scope.vm.hostingMemo = result[0].memo;
});
@@ -506,6 +512,7 @@
manager : $scope.vm.companyManager,
tel : $scope.vm.companyTel,
email :$scope.vm.companyEmail,
+ url :$scope.vm.companyUrl,
memo : $scope.vm.companyMemo
});
}
@@ -526,6 +533,7 @@
manager : $scope.vm.ispManager,
tel : $scope.vm.ispTel,
email :$scope.vm.ispEmail,
+ url :$scope.vm.ispUrl,
memo : $scope.vm.ispMemo
};
@@ -548,6 +556,7 @@
manager : $scope.vm.hostingManager,
tel : $scope.vm.hostingTel,
email :$scope.vm.hostingEmail,
+ url :$scope.vm.hostingUrl,
memo : $scope.vm.hostingMemo
};
}
diff --git a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
index e8a2959..fd7d3cd 100644
--- a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
@@ -73,6 +73,7 @@
companyManager : "", // �뾽泥� �떞�떦�옄
companyTel : "", // �뾽泥� �쟾�솕踰덊샇
companyEmail : "", // �뾽泥� �씠硫붿씪
+ companyUrl : "", // �뾽泥� url
companyMemo : "", // �뾽泥� 鍮꾧퀬
ispId : -1, // ISP ID
ispName : "", // ISP 紐�
@@ -80,6 +81,7 @@
ispManager : "", // ISP �떞�떦�옄
ispTel : "", // ISP �쟾�솕踰덊샇
ispEmail : "", // ISP �씠硫붿씪
+ ispUrl : "", // ISP url
ispMemo : "", // ISP 鍮꾧퀬
hostingId : -1, // �샇�뒪�똿 ID
hostingName : "", // �샇�뒪�똿紐� 寃��깋
@@ -87,6 +89,7 @@
hostingTel : "", // �샇�뒪�똿 �쟾�솕踰덊샇
hostingCode : "", // �샇�뒪�똿 肄붾뱶
hostingEmail : "", // �샇�뒪�똿 �씠硫붿씪
+ hostingUrl : "", // �샇�뒪�똿 url
hostingMemo :"", // �샇�뒪�똿 鍮꾧퀬
@@ -397,6 +400,7 @@
$scope.vm.companyManager = result[0].manager;
$scope.vm.companyTel = result[0].tel;
$scope.vm.companyEmail = result[0].email;
+ $scope.vm.companyUrl = result[0].url;
$scope.vm.companyMemo = result[0].memo;
});
@@ -409,6 +413,7 @@
$scope.vm.ispManager = result[0].manager;
$scope.vm.ispTel = result[0].tel;
$scope.vm.ispEmail = result[0].email;
+ $scope.vm.ispUrl = result[0].url;
$scope.vm.ispMemo = result[0].memo;
});
@@ -420,6 +425,7 @@
$scope.vm.hostingManager = result[0].manager;
$scope.vm.hostingTel = result[0].tel;
$scope.vm.hostingEmail = result[0].email;
+ $scope.vm.hostingUrl = result[0].url;
$scope.vm.hostingMemo = result[0].memo;
});
@@ -435,18 +441,21 @@
companyManager : $scope.vm.companyManager,
companyTel : $scope.vm.companyTel,
companyEmail :$scope.vm.companyEmail,
+ companyUrl : $scope.vm.companyUrl,
companyMemo : $scope.vm.companyMemo,
ispName : $scope.vm.ispName,
ispCode : $scope.vm.ispCode,
ispManager : $scope.vm.ispManager,
ispTel : $scope.vm.ispTel,
ispEmail : $scope.vm.ispEmail,
+ ispUrl : $scope.vm.ispUrl,
ispMemo : $scope.vm.ispMemo,
hostingName : $scope.vm.hostingName,
hostingCode : $scope.vm.hostingCode,
hostingManager : $scope.vm.hostingManager,
hostingTel : $scope.vm.hostingTel,
hostingEmail : $scope.vm.hostingEmail,
+ hostingUrl : $scope.vm.hostingUrl,
hostingMemo : $scope.vm.hostingMemo,
projectId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
@@ -537,6 +546,7 @@
manager : $scope.vm.companyManager,
tel : $scope.vm.companyTel,
email :$scope.vm.companyEmail,
+ url :$scope.vm.companyUrl,
memo : $scope.vm.companyMemo
});
}
@@ -557,6 +567,7 @@
manager : $scope.vm.ispManager,
tel : $scope.vm.ispTel,
email :$scope.vm.ispEmail,
+ url :$scope.vm.ispUrl,
memo : $scope.vm.ispMemo
});
@@ -579,6 +590,7 @@
manager : $scope.vm.hostingManager,
tel : $scope.vm.hostingTel,
email :$scope.vm.hostingEmail,
+ url :$scope.vm.hostingUrl,
memo : $scope.vm.hostingMemo
});
}
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 8c15c9c..6c18b0b 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -75,6 +75,7 @@
companyManager : "", // �뾽泥� �떞�떦�옄
companyTel : "", // �뾽泥� �쟾�솕踰덊샇
companyEmail : "", // �뾽泥� �씠硫붿씪
+ companyUrl : "", // �뾽泥� url
companyMemo : "", // �뾽泥� 鍮꾧퀬
ispId : -1,
ispName : "", // ISP 紐�
@@ -82,6 +83,7 @@
ispManager : "", // ISP �떞�떦�옄
ispTel : "", // ISP �쟾�솕踰덊샇
ispEmail : "", // ISP �씠硫붿씪
+ ispUrl : "", // url
ispMemo : "", // ISP 鍮꾧퀬
hostingId : -1,
hostingName : "", // �샇�뒪�똿紐� 寃��깋
@@ -89,6 +91,7 @@
hostingCode : "", // �샇�뒪�똿 肄붾뱶
hostingTel : "", // �샇�뒪�똿 �쟾�솕踰덊샇
hostingEmail : "", // �샇�뒪�똿 �씠硫붿씪
+ hostingUrl : "", // url
hostingMemo : "", // �샇�뒪�똿 鍮꾧퀬
autoCompletePage : {
// user : {
@@ -373,6 +376,7 @@
$scope.vm.companyManager = result[0].manager;
$scope.vm.companyTel = result[0].tel;
$scope.vm.companyEmail = result[0].email;
+ $scope.vm.companyUrl = result[0].url;
$scope.vm.companyMemo = result[0].memo;
});
@@ -385,6 +389,7 @@
$scope.vm.ispManager = result[0].manager;
$scope.vm.ispTel = result[0].tel;
$scope.vm.ispEmail = result[0].email;
+ $scope.vm.ispUrl = result[0].url;
$scope.vm.ispMemo = result[0].memo;
});
@@ -396,6 +401,7 @@
$scope.vm.hostingManager = result[0].manager;
$scope.vm.hostingTel = result[0].tel;
$scope.vm.hostingEmail = result[0].email;
+ $scope.vm.hostingUrl = result[0].url;
$scope.vm.hostingMemo = result[0].memo;
});
@@ -410,18 +416,21 @@
companyManager : $scope.vm.companyManager,
companyTel : $scope.vm.companyTel,
companyEmail :$scope.vm.companyEmail,
+ companyUrl : $scope.vm.companyUrl,
companyMemo : $scope.vm.companyMemo,
ispName : $scope.vm.ispName,
ispCode : $scope.vm.ispCode,
ispManager : $scope.vm.ispManager,
ispTel : $scope.vm.ispTel,
ispEmail : $scope.vm.ispEmail,
+ ispUrl : $scope.vm.ispUrl,
ispMemo : $scope.vm.ispMemo,
hostingName : $scope.vm.hostingName,
hostingCode : $scope.vm.hostingCode,
hostingManager : $scope.vm.hostingManager,
hostingTel : $scope.vm.hostingTel,
hostingEmail : $scope.vm.hostingEmail,
+ hostingUrl : $scope.vm.hostingUrl,
hostingMemo : $scope.vm.hostingMemo,
projectId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
@@ -512,6 +521,7 @@
manager : $scope.vm.companyManager,
tel : $scope.vm.companyTel,
email :$scope.vm.companyEmail,
+ url :$scope.vm.companyUrl,
memo : $scope.vm.companyMemo
});
}
@@ -532,6 +542,7 @@
manager : $scope.vm.ispManager,
tel : $scope.vm.ispTel,
email :$scope.vm.ispEmail,
+ url :$scope.vm.ispUrl,
memo : $scope.vm.ispMemo
});
@@ -554,6 +565,7 @@
manager : $scope.vm.hostingManager,
tel : $scope.vm.hostingTel,
email :$scope.vm.hostingEmail,
+ url :$scope.vm.hostingUrl,
memo : $scope.vm.hostingMemo
});
}
@@ -824,6 +836,7 @@
$scope.vm.companyManager = issueCompanyFieldValue.manager;
$scope.vm.companyTel = issueCompanyFieldValue.tel;
$scope.vm.companyEmail = issueCompanyFieldValue.email;
+ $scope.vm.companyUrl = issueCompanyFieldValue.url;
$scope.vm.companyMemo = issueCompanyFieldValue.memo;
}
if (result.data.data.issueIspVos != null && result.data.data.issueIspVos.length > 0) {
@@ -835,6 +848,7 @@
$scope.vm.ispManager = issueIspFieldValue.manager;
$scope.vm.ispTel = issueIspFieldValue.tel;
$scope.vm.ispEmail = issueIspFieldValue.email;
+ $scope.vm.ispUrl = issueIspFieldValue.url;
$scope.vm.ispMemo = issueIspFieldValue.memo;
}
@@ -847,6 +861,7 @@
$scope.vm.hostingManager = issueHostingFieldValue.manager;
$scope.vm.hostingTel = issueHostingFieldValue.tel;
$scope.vm.hostingEmail = issueHostingFieldValue.email;
+ $scope.vm.hostingUrl = issueHostingFieldValue.url;
$scope.vm.hostingMemo = issueHostingFieldValue.memo;
}
diff --git a/src/main/webapp/views/companyField/companyFieldAdd.html b/src/main/webapp/views/companyField/companyFieldAdd.html
index 7dec1d2..2d1a8d6 100644
--- a/src/main/webapp/views/companyField/companyFieldAdd.html
+++ b/src/main/webapp/views/companyField/companyFieldAdd.html
@@ -164,6 +164,23 @@
</div>
<div>
<div class="form-group">
+ <label for="companyFieldAddForm10" class="issue-label">
+ <span translate="companyField.url">url</span>
+ </label>
+ <input id="companyFieldAddForm10"
+ name="url"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.url"
+ ng-maxlength="200"
+ maxlength="200"
+ >
+ </div>
+ </div>
+ <div>
+ <div class="form-group">
<label for="companyFieldAddForm8" class="issue-label">
<span translate="companyField.memo">鍮꾧퀬</span>
</label>
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index 94dccd5..56652a2 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -160,6 +160,23 @@
</div>
<div>
<div class="form-group">
+ <label for="companyFieldAddForm10" class="issue-label">
+ <span translate="companyField.url">url</span>
+ </label>
+ <input id="companyFieldAddForm10"
+ name="url"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.url"
+ ng-maxlength="200"
+ maxlength="200"
+ >
+ </div>
+ </div>
+ <div>
+ <div class="form-group">
<label for="companyFieldModifyForm8" class="issue-label">
<span translate="companyField.memo">鍮꾧퀬</span>
</label>
diff --git a/src/main/webapp/views/hostingField/hostingFieldAdd.html b/src/main/webapp/views/hostingField/hostingFieldAdd.html
index d80aa9d..c62231d 100644
--- a/src/main/webapp/views/hostingField/hostingFieldAdd.html
+++ b/src/main/webapp/views/hostingField/hostingFieldAdd.html
@@ -107,6 +107,23 @@
</div>
<div>
<div class="form-group">
+ <label for="hostingFieldAddForm11" class="issue-label">
+ <span translate="companyField.url">url</span>
+ </label>
+ <input id="hostingFieldAddForm11"
+ name="url"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.url"
+ ng-maxlength="200"
+ maxlength="200"
+ >
+ </div>
+ </div>
+ <div>
+ <div class="form-group">
<label for="hostingFieldAddForm8" class="issue-label">
<span translate="hostingField.memo">鍮꾧퀬</span>
</label>
diff --git a/src/main/webapp/views/hostingField/hostingFieldModify.html b/src/main/webapp/views/hostingField/hostingFieldModify.html
index e7f8a42..dbc2191 100644
--- a/src/main/webapp/views/hostingField/hostingFieldModify.html
+++ b/src/main/webapp/views/hostingField/hostingFieldModify.html
@@ -104,6 +104,23 @@
</div>
<div>
<div class="form-group">
+ <label for="hostingFieldAddForm11" class="issue-label">
+ <span translate="companyField.url">url</span>
+ </label>
+ <input id="hostingFieldAddForm11"
+ name="url"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.url"
+ ng-maxlength="200"
+ maxlength="200"
+ >
+ </div>
+ </div>
+ <div>
+ <div class="form-group">
<label for="hostingFieldModifyForm8" class="issue-label">
<span translate="hostingField.memo">鍮꾧퀬</span>
</label>
diff --git a/src/main/webapp/views/ispField/ispFieldAdd.html b/src/main/webapp/views/ispField/ispFieldAdd.html
index 681ac65..eb15cf6 100644
--- a/src/main/webapp/views/ispField/ispFieldAdd.html
+++ b/src/main/webapp/views/ispField/ispFieldAdd.html
@@ -107,6 +107,23 @@
</div>
<div>
<div class="form-group">
+ <label for="ispFieldAddForm12" class="issue-label">
+ <span translate="companyField.url">url</span>
+ </label>
+ <input id="ispFieldAddForm12"
+ name="url"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.url"
+ ng-maxlength="200"
+ maxlength="200"
+ >
+ </div>
+ </div>
+ <div>
+ <div class="form-group">
<label for="ispFieldAddForm8" class="issue-label">
<span translate="ispField.memo">鍮꾧퀬</span>
</label>
diff --git a/src/main/webapp/views/ispField/ispFieldModify.html b/src/main/webapp/views/ispField/ispFieldModify.html
index 5c01252..b4cd4bc 100644
--- a/src/main/webapp/views/ispField/ispFieldModify.html
+++ b/src/main/webapp/views/ispField/ispFieldModify.html
@@ -105,6 +105,23 @@
</div>
<div>
<div class="form-group">
+ <label for="ispFieldAddForm12" class="issue-label">
+ <span translate="companyField.url">url</span>
+ </label>
+ <input id="ispFieldAddForm12"
+ name="url"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.url"
+ ng-maxlength="200"
+ maxlength="200"
+ >
+ </div>
+ </div>
+ <div>
+ <div class="form-group">
<label for="hostingFieldModifyForm8" class="issue-label">
<span translate="hostingField.memo">鍮꾧퀬</span>
</label>
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 690c9ab..e55ca04 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -447,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"
@@ -553,6 +567,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"
@@ -659,6 +687,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"
diff --git a/src/main/webapp/views/issue/issueAddRelation.html b/src/main/webapp/views/issue/issueAddRelation.html
index 728f926..5d56570 100644
--- a/src/main/webapp/views/issue/issueAddRelation.html
+++ b/src/main/webapp/views/issue/issueAddRelation.html
@@ -455,6 +455,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"
@@ -561,6 +575,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"
@@ -667,6 +695,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"
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index 6034426..5ff5c92 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -445,6 +445,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"
@@ -551,6 +565,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"
@@ -657,6 +685,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