DBNT
/
IMIS
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

무가치 반영.

master
강석 최 2022-05-02 10:25:42 +09:00
parent 196523e43d
commit e6714cced1
16 changed files with 1017 additions and 887 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
imis.iml Normal file
View File

@ -0,0 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<datasource-mapping>
<factory-entry name="imis" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
</sourceRoots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: egovframework.rte:egovframework.rte.psl.dataaccess:3.5.0" level="project" />
<orderEntry type="library" name="Maven: egovframework.rte:egovframework.rte.fdl.logging:3.5.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.12.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.12.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.12.4" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.7" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:4.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:4.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.ibatis:ibatis-sqlmap:2.3.4.726" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Maven: egovframework.rte:egovframework.rte.ptl.mvc:3.5.0" level="project" />
<orderEntry type="library" name="Maven: egovframework.rte:egovframework.rte.fdl.cmmn:3.5.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: egovframework.rte:egovframework.rte.fdl.property:3.5.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: egovframework.rte:egovframework.rte.fdl.excel:3.5.0" level="project" />
<orderEntry type="library" name="Maven: egovframework.rte:egovframework.rte.fdl.filehandling:3.5.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-vfs2:2.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:3.10-FINAL" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.10-FINAL" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-contrib:3.7-beta3" level="project" />
<orderEntry type="library" name="Maven: net.sf.jxls:jxls-core:1.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-jexl:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
<orderEntry type="library" name="Maven: net.sf.jxls:jxls-reader:1.0.5" level="project" />
<orderEntry type="library" name="Maven: egovframework.rte:egovframework.rte.fdl.crypto:3.5.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.jasypt:jasypt:1.9.2" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
<orderEntry type="library" name="Maven: egovframework.rte:egovframework.rte.fdl.string:3.5.0" level="project" />
<orderEntry type="library" name="Maven: egovframework.rte:egovframework.rte.fdl.security:3.5.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:3.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:3.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-taglibs:3.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-acl:3.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:3.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.3" level="project" />
<orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.4" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.0" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.0" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.0" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
<orderEntry type="library" name="Maven: net.sf:log4jdbc3:1.1" level="project" />
<orderEntry type="library" name="Maven: org.springmodules:spring-modules-validation:0.9" level="project" />
<orderEntry type="library" name="Maven: commons-validator:commons-validator:1.3.1" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.7.0" level="project" />
<orderEntry type="library" name="Maven: commons-digester:commons-digester:1.6" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
<orderEntry type="library" name="Maven: org.antlr:antlr:3.0.1" level="project" />
<orderEntry type="library" name="Maven: org.antlr:stringtemplate:3.1-b1" level="project" />
<orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
<orderEntry type="module-library">
<library name="Maven: ojdbc:ojdbc:14">
<CLASSES>
<root url="jar://$MODULE_DIR$/src/main/webapp/WEB-INF/lib/ojdbc-14.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:4.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.0.2" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
<orderEntry type="library" name="Maven: taglibs:standard:1.1.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-extras:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-core:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-api:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-servlet-wildcard:1.0.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-mustache:1.0.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-api:1.0.6" level="project" />
<orderEntry type="library" name="Maven: com.github.spullara.mustache.java:compiler:0.8.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-freemarker:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-freemarker:1.0.6" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.15" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-velocity:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" />
<orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.6.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-velocity:1.0.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-el:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-mvel:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.mvel:mvel2:2.0.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-ognl:3.0.5" level="project" />
<orderEntry type="library" name="Maven: ognl:ognl:2.7.3" level="project" />
<orderEntry type="library" name="Maven: jboss:javassist:3.7.ga" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-compat:3.0.5" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:12.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-jsp:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-template:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-autotag-core-runtime:1.1.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-jsp:1.0.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-servlet:3.0.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-servlet:1.0.6" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
<orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
<orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
<orderEntry type="library" name="Maven: com.ckeditor:ckeditor-java-core:3.5.3" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.navercorp.lucy:lucy-xss-servlet:2.0.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.navercorp.lucy:lucy-xss:1.6.3" level="project" />
</component>
</module>

7
pom.xml
View File

@ -277,13 +277,6 @@
<version>2.0.0</version> <version>2.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>

2
src/main/java/kcg/imis/report/web/ReportListController.java
View File

@ -480,6 +480,7 @@ public class ReportListController {
header.put("isJudge5", messageSource.getMessage("report.type.record", null, locale)); header.put("isJudge5", messageSource.getMessage("report.type.record", null, locale));
header.put("isJudge6", messageSource.getMessage("report.type.survey", null, locale)); header.put("isJudge6", messageSource.getMessage("report.type.survey", null, locale));
header.put("isJudge7", messageSource.getMessage("report.type.reference", null, locale)); header.put("isJudge7", messageSource.getMessage("report.type.reference", null, locale));
header.put("isJudge8", messageSource.getMessage("report.type.worthless", null, locale));
try { try {
Date d = new Date(); Date d = new Date();
@ -593,6 +594,7 @@ public class ReportListController {
header.put("isJudge5", messageSource.getMessage("report.type.record", null, locale)); header.put("isJudge5", messageSource.getMessage("report.type.record", null, locale));
header.put("isJudge6", messageSource.getMessage("report.type.survey", null, locale)); header.put("isJudge6", messageSource.getMessage("report.type.survey", null, locale));
header.put("isJudge7", messageSource.getMessage("report.type.reference", null, locale)); header.put("isJudge7", messageSource.getMessage("report.type.reference", null, locale));
header.put("isJudge8", messageSource.getMessage("report.type.worthless", null, locale));
header.put("inCategory1Str", messageSource.getMessage("report.view.category1", null, locale)); header.put("inCategory1Str", messageSource.getMessage("report.view.category1", null, locale));
header.put("inCategory2Str", messageSource.getMessage("report.view.category2", null, locale)); header.put("inCategory2Str", messageSource.getMessage("report.view.category2", null, locale));

3
src/main/java/kcg/imis/report/web/ReportMngController.java
View File

@ -191,6 +191,7 @@ public class ReportMngController {
header.put("isJudge5", messageSource.getMessage("report.type.record", null, locale)); header.put("isJudge5", messageSource.getMessage("report.type.record", null, locale));
header.put("isJudge6", messageSource.getMessage("report.type.survey", null, locale)); header.put("isJudge6", messageSource.getMessage("report.type.survey", null, locale));
header.put("isJudge7", messageSource.getMessage("report.type.reference", null, locale)); header.put("isJudge7", messageSource.getMessage("report.type.reference", null, locale));
header.put("isJudge8", messageSource.getMessage("report.type.worthless", null, locale));
try { try {
Date d = new Date(); Date d = new Date();
@ -512,7 +513,7 @@ public class ReportMngController {
header.put("isJudge5", messageSource.getMessage("report.type.record", null, locale)); header.put("isJudge5", messageSource.getMessage("report.type.record", null, locale));
header.put("isJudge6", messageSource.getMessage("report.type.survey", null, locale)); header.put("isJudge6", messageSource.getMessage("report.type.survey", null, locale));
header.put("isJudge7", messageSource.getMessage("report.type.reference", null, locale)); header.put("isJudge7", messageSource.getMessage("report.type.reference", null, locale));
header.put("isJudge8", messageSource.getMessage("report.type.worthless", null, locale));
try { try {
Date d = new Date(); Date d = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");

2
src/main/java/kcg/imis/report/web/ReportStatsController.java
View File

@ -269,7 +269,7 @@ public class ReportStatsController {
header.put("C05", messageSource.getMessage("report.type.record", null, locale)); header.put("C05", messageSource.getMessage("report.type.record", null, locale));
header.put("C06", messageSource.getMessage("report.type.survey", null, locale)); header.put("C06", messageSource.getMessage("report.type.survey", null, locale));
header.put("C07", messageSource.getMessage("report.type.reference", null, locale)); header.put("C07", messageSource.getMessage("report.type.reference", null, locale));
header.put("C08", messageSource.getMessage("report.type.worthless", null, locale));
header.put("AG", messageSource.getMessage("report.stats.AGrade", null, locale)); header.put("AG", messageSource.getMessage("report.stats.AGrade", null, locale));
header.put("BG", messageSource.getMessage("report.stats.BGrade", null, locale)); header.put("BG", messageSource.getMessage("report.stats.BGrade", null, locale));
header.put("CG", messageSource.getMessage("report.stats.CGrade", null, locale)); header.put("CG", messageSource.getMessage("report.stats.CGrade", null, locale));

1520
src/main/resources/message/message-common_ko.properties
View File

File diff suppressed because it is too large Load Diff

12
src/main/resources/spring/context-datasource.xml
View File

@ -28,22 +28,16 @@
<property name="password" value="apmsetup"></property> <property name="password" value="apmsetup"></property>
</bean> --> </bean> -->
<bean id="dataSource" <!--<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
class="org.springframework.jdbc.datasource.DriverManagerDataSource">
<property name="driverClassName" value="com.mysql.jdbc.Driver"></property> <property name="driverClassName" value="com.mysql.jdbc.Driver"></property>
<property name="url" value="jdbc:mysql://106.247.244.146:57336/h2_bbs?characterEncoding=UTF-8"></property> <property name="url" value="jdbc:mysql://106.247.244.146:57336/h2_bbs?characterEncoding=UTF-8"></property>
<property name="username" value="root"></property> <property name="username" value="root"></property>
<property name="password" value="dbnt0928"></property> <property name="password" value="dbnt0928"></property>
</bean> </bean>-->
<!-- <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
<bean id="dataSource"
class="org.springframework.jdbc.datasource.DriverManagerDataSource">
<property name="driverClassName" value="com.mysql.jdbc.Driver"></property> <property name="driverClassName" value="com.mysql.jdbc.Driver"></property>
<property name="url" value="jdbc:mysql://localhost:3306/h2_bbs?characterEncoding=euc-kr"></property> <property name="url" value="jdbc:mysql://localhost:3306/h2_bbs?characterEncoding=euc-kr"></property>
<property name="username" value="root"></property> <property name="username" value="root"></property>
<property name="password" value="apmsetup"></property> <property name="password" value="apmsetup"></property>
</bean> </bean>
-->
</beans> </beans>

23
src/main/webapp/WEB-INF/jsp/report/approval.jsp
View File

@ -213,16 +213,6 @@
<c:if test="${reportVO.stateCodeName eq '결재 완료'}"> <c:if test="${reportVO.stateCodeName eq '결재 완료'}">
<table class="tbl_add"> <table class="tbl_add">
<colgroup>
<col width="200" />
<col width="200" />
<col width="200" />
<col width="200" />
<col width="200" />
<col width="200" />
<col width="200" />
<col width="200" />
</colgroup>
<tr class="th-bg"> <tr class="th-bg">
<th style="text-align:center;"><spring:message code="report.type.newsflash"/></th> <th style="text-align:center;"><spring:message code="report.type.newsflash"/></th>
<th style="text-align:center;"><spring:message code="report.type.judge"/></th> <th style="text-align:center;"><spring:message code="report.type.judge"/></th>
@ -247,16 +237,6 @@
</c:if> </c:if>
<c:if test="${num2 >= 2 }"> <c:if test="${num2 >= 2 }">
<table class="tbl_add"> <table class="tbl_add">
<colgroup>
<col width="200" />
<col width="200" />
<col width="200" />
<col width="200" />
<col width="200" />
<col width="200" />
<col width="200" />
<col width="200" />
</colgroup>
<tr class="th-bg"> <tr class="th-bg">
<th>-</th> <th>-</th>
<th style="text-align:center;"><spring:message code="report.type.newsflash"/></th> <th style="text-align:center;"><spring:message code="report.type.newsflash"/></th>
@ -284,8 +264,7 @@
<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="5"/></c:if></td> <td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="5"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="6"/></c:if></td> <td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="6"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="7"/></c:if></td> <td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="7"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="8" checked="checked" /></c:if></td> <td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="8" checked="checked" /></c:if></td>/
</tr> </tr>
<tr> <tr>
<th>평가자</th> <th>평가자</th>

19
src/main/webapp/WEB-INF/jsp/report/approveList.jsp
View File

@ -46,22 +46,6 @@
<table class="tbl_list" width="100%" border="0" cellpadding="0" cellspacing="0" summary="게시판 목록을 확인 할 수 있습니다."> <table class="tbl_list" width="100%" border="0" cellpadding="0" cellspacing="0" summary="게시판 목록을 확인 할 수 있습니다.">
<caption class="hidden">게시판 목록</caption> <caption class="hidden">게시판 목록</caption>
<colgroup>
<col width="150">
<col width="120">
<col width="?">
<col width="100">
<col width="34">
<col width="34">
<col width="34">
<col width="34">
<col width="34">
<col width="34">
<col width="34">
<col width="34">
<col width="34">
</colgroup>
<thead> <thead>
<tr> <tr>
<th align="center" rowspan="2"><span class="order" value="in_seq"><spring:message code="report.list.num" /><img src="/images/cmmn/blank_1x1.png" /></span></th> <th align="center" rowspan="2"><span class="order" value="in_seq"><spring:message code="report.list.num" /><img src="/images/cmmn/blank_1x1.png" /></span></th>
@ -81,8 +65,7 @@
<th align="center"><spring:message code="report.type.record" /></th> <th align="center"><spring:message code="report.type.record" /></th>
<th align="center"><spring:message code="report.type.survey" /></th> <th align="center"><spring:message code="report.type.survey" /></th>
<th align="center"><spring:message code="report.type.reference" /></th> <th align="center"><spring:message code="report.type.reference" /></th>
<th align="center" width="20"><spring:message code="report.type.worthless" /></th> <th align="center"><spring:message code="report.type.worthless" /></th>
</tr> </tr>
</thead> </thead>
<c:forEach var="result" items="${reportList}" varStatus="status"> <c:forEach var="result" items="${reportList}" varStatus="status">

19
src/main/webapp/WEB-INF/jsp/report/judgeRecord.jsp
View File

@ -53,22 +53,6 @@
<table class="tbl_list" width="100%" border="0" cellpadding="0" cellspacing="0" summary="게시판 목록을 확인 할 수 있습니다."> <table class="tbl_list" width="100%" border="0" cellpadding="0" cellspacing="0" summary="게시판 목록을 확인 할 수 있습니다.">
<caption class="hidden">게시판 목록</caption> <caption class="hidden">게시판 목록</caption>
<colgroup>
<col width="140">
<col width="100">
<col width="60">
<col width="150">
<col width="70">
<col width="">
<col width="42">
<col width="42">
<col width="42">
<col width="42">
<col width="42">
<col width="42">
<col width="42">
</colgroup>
<thead> <thead>
<tr> <tr>
<th align="center" rowspan="2"><span class="order" value="in_seq"><spring:message code="report.list.num" /><img src="/images/cmmn/blank_1x1.png" /></span></th> <th align="center" rowspan="2"><span class="order" value="in_seq"><spring:message code="report.list.num" /><img src="/images/cmmn/blank_1x1.png" /></span></th>
@ -87,8 +71,7 @@
<th align="center"><spring:message code="report.type.record" /></th> <th align="center"><spring:message code="report.type.record" /></th>
<th align="center"><spring:message code="report.type.survey" /></th> <th align="center"><spring:message code="report.type.survey" /></th>
<th align="center"><spring:message code="report.type.reference" /></th> <th align="center"><spring:message code="report.type.reference" /></th>
<th align="center" width="20"><spring:message code="report.type.worthless" /></th> <th align="center"><spring:message code="report.type.worthless" /></th>
</tr> </tr>
</thead> </thead>

19
src/main/webapp/WEB-INF/jsp/report/presentList.jsp
View File

@ -60,23 +60,6 @@
<table class="tbl_list" width="100%" border="0" cellpadding="0" cellspacing="0" summary="게시판 목록을 확인 할 수 있습니다."> <table class="tbl_list" width="100%" border="0" cellpadding="0" cellspacing="0" summary="게시판 목록을 확인 할 수 있습니다.">
<caption class="hidden">게시판 목록</caption> <caption class="hidden">게시판 목록</caption>
<colgroup>
<col width="50">
<col width="150">
<col width="100">
<col width="?">
<col width="100">
<col width="34">
<col width="34">
<col width="34">
<col width="34">
<col width="34">
<col width="34">
<col width="34">
<col width="34">
<col width="34">
</colgroup>
<thead> <thead>
<tr> <tr>
<th align="center" rowspan="2"><spring:message code="report.list.select" /></th> <th align="center" rowspan="2"><spring:message code="report.list.select" /></th>
@ -97,7 +80,7 @@
<th align="center"><spring:message code="report.type.record" /></th> <th align="center"><spring:message code="report.type.record" /></th>
<th align="center"><spring:message code="report.type.survey" /></th> <th align="center"><spring:message code="report.type.survey" /></th>
<th align="center"><spring:message code="report.type.reference" /></th> <th align="center"><spring:message code="report.type.reference" /></th>
<th align="center" width="20"><spring:message code="report.type.worthless" /></th> <th align="center"><spring:message code="report.type.worthless" /></th>
</tr> </tr>
</thead> </thead>

5
src/main/webapp/WEB-INF/jsp/report/reportModify.jsp
View File

@ -254,6 +254,7 @@
<th style="text-align:center;"><spring:message code="report.type.record" /></th> <th style="text-align:center;"><spring:message code="report.type.record" /></th>
<th style="text-align:center;"><spring:message code="report.type.survey" /></th> <th style="text-align:center;"><spring:message code="report.type.survey" /></th>
<th style="text-align:center;"><spring:message code="report.type.reference" /></th> <th style="text-align:center;"><spring:message code="report.type.reference" /></th>
<th style="text-align:center;"><spring:message code="report.type.worthless" /></th>
</tr> </tr>
<tr> <tr>
<td align="center"><c:if test="${reportVO.inJudge eq 1}">○</c:if></td> <td align="center"><c:if test="${reportVO.inJudge eq 1}">○</c:if></td>
@ -263,6 +264,7 @@
<td align="center"><c:if test="${reportVO.inJudge eq 5}">○</c:if></td> <td align="center"><c:if test="${reportVO.inJudge eq 5}">○</c:if></td>
<td align="center"><c:if test="${reportVO.inJudge eq 6}">○</c:if></td> <td align="center"><c:if test="${reportVO.inJudge eq 6}">○</c:if></td>
<td align="center"><c:if test="${reportVO.inJudge eq 7}">○</c:if></td> <td align="center"><c:if test="${reportVO.inJudge eq 7}">○</c:if></td>
<td align="center"><c:if test="${reportVO.inJudge eq 8}">○</c:if></td>
</tr> </tr>
</table> </table>
</c:if> </c:if>
@ -291,6 +293,7 @@
<th style="text-align:center;"><spring:message code="report.type.record"/></th> <th style="text-align:center;"><spring:message code="report.type.record"/></th>
<th style="text-align:center;"><spring:message code="report.type.survey"/></th> <th style="text-align:center;"><spring:message code="report.type.survey"/></th>
<th style="text-align:center;"><spring:message code="report.type.reference"/></th> <th style="text-align:center;"><spring:message code="report.type.reference"/></th>
<th style="text-align:center;"><spring:message code="report.type.worthless"/></th>
</tr> </tr>
<tr> <tr>
<td align="center"> <td align="center">
@ -310,6 +313,7 @@
<td align="center"><form:radiobutton path="inJudge" value="5" /></td> <td align="center"><form:radiobutton path="inJudge" value="5" /></td>
<td align="center"><form:radiobutton path="inJudge" value="6" /></td> <td align="center"><form:radiobutton path="inJudge" value="6" /></td>
<td align="center"><form:radiobutton path="inJudge" value="7" /></td> <td align="center"><form:radiobutton path="inJudge" value="7" /></td>
<td align="center"><form:radiobutton path="inJudge" value="8" /></td>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<td align="center"><c:if test="${reportVO.inJudge eq 1}">○</c:if></td> <td align="center"><c:if test="${reportVO.inJudge eq 1}">○</c:if></td>
@ -319,6 +323,7 @@
<td align="center"><c:if test="${reportVO.inJudge eq 5}">○</c:if></td> <td align="center"><c:if test="${reportVO.inJudge eq 5}">○</c:if></td>
<td align="center"><c:if test="${reportVO.inJudge eq 6}">○</c:if></td> <td align="center"><c:if test="${reportVO.inJudge eq 6}">○</c:if></td>
<td align="center"><c:if test="${reportVO.inJudge eq 7}">○</c:if></td> <td align="center"><c:if test="${reportVO.inJudge eq 7}">○</c:if></td>
<td align="center"><c:if test="${reportVO.inJudge eq 8}">○</c:if></td>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</tr> </tr>

3
src/main/webapp/WEB-INF/jsp/report/statsResult.jsp
View File

@ -170,7 +170,7 @@
<th align="center"><spring:message code="report.type.record"/></th> <th align="center"><spring:message code="report.type.record"/></th>
<th align="center"><spring:message code="report.type.survey"/></th> <th align="center"><spring:message code="report.type.survey"/></th>
<th align="center"><spring:message code="report.type.reference"/></th> <th align="center"><spring:message code="report.type.reference"/></th>
<th align="center"><spring:message code="report.type.worthless"/></th>
<th align="center"><spring:message code="report.stats.AGrade"/></th> <th align="center"><spring:message code="report.stats.AGrade"/></th>
<th align="center"><spring:message code="report.stats.BGrade"/></th> <th align="center"><spring:message code="report.stats.BGrade"/></th>
<th align="center"><spring:message code="report.stats.CGrade"/></th> <th align="center"><spring:message code="report.stats.CGrade"/></th>
@ -190,6 +190,7 @@
<td align="center"><c:out value="${stats.C05}"/></td> <td align="center"><c:out value="${stats.C05}"/></td>
<td align="center"><c:out value="${stats.C06}"/></td> <td align="center"><c:out value="${stats.C06}"/></td>
<td align="center"><c:out value="${stats.C07}"/></td> <td align="center"><c:out value="${stats.C07}"/></td>
<td align="center"><c:out value="${stats.C08}"/></td>
<td align="center"><c:out value="${stats.AG}"/></td> <td align="center"><c:out value="${stats.AG}"/></td>
<td align="center"><c:out value="${stats.BG}"/></td> <td align="center"><c:out value="${stats.BG}"/></td>

33
src/main/webapp/WEB-INF/jsp/report/waitList.jsp
View File

@ -44,6 +44,36 @@
<table class="tbl_list" width="100%" border="0" cellpadding="0" cellspacing="0" summary="게시판 목록을 확인 할 수 있습니다."> <table class="tbl_list" width="100%" border="0" cellpadding="0" cellspacing="0" summary="게시판 목록을 확인 할 수 있습니다.">
<caption class="hidden">게시판 목록</caption> <caption class="hidden">게시판 목록</caption>
<colgroup>
<c:if test="${dutiesCode == 2}">
<col width="150">
<col width="170">
<col width="60">
<col width="*">
<col width="80">
<col width="180">
<col width="30">
<col width="150">
</c:if>
<c:if test="${dutiesCode == 3}">
<col width="150">
<col width="170">
<col width="60">
<col width="*">
<col width="80">
<col width="80">
<col width="15">
<col width="15">
<col width="15">
<col width="15">
<col width="15">
<col width="15">
<col width="15">
<col width="15">
<col width="15">
<col width="80">
</c:if>
</colgroup>
<thead> <thead>
<tr> <tr>
<th align="center"><span class="order" value="in_regdate"><spring:message code="board.header.regdate" /><img src="/images/cmmn/blank_1x1.png" /></span></th> <th align="center"><span class="order" value="in_regdate"><spring:message code="board.header.regdate" /><img src="/images/cmmn/blank_1x1.png" /></span></th>
@ -64,7 +94,6 @@
<th align="center"><spring:message code="report.type.survey" /></th> <th align="center"><spring:message code="report.type.survey" /></th>
<th align="center"><spring:message code="report.type.reference" /></th> <th align="center"><spring:message code="report.type.reference" /></th>
<th align="center"><spring:message code="report.type.worthless" /></th> <th align="center"><spring:message code="report.type.worthless" /></th>
<c:if test="${myGroupCode ne 3}"> <c:if test="${myGroupCode ne 3}">
<th align="center"><spring:message code="report.type.fullReport" /></th> <th align="center"><spring:message code="report.type.fullReport" /></th>
</c:if> </c:if>
@ -137,7 +166,7 @@
</c:forEach> </c:forEach>
</form:form> </form:form>
<c:if test="${reportList.size() <= 0}"> <c:if test="${reportList.size() <= 0}">
<tr><td align="center" colspan="20"><spring:message code="report.nodata" /></td></tr> <tr><td align="center" colspan="10"><spring:message code="report.nodata" /></td></tr>
</c:if> </c:if>
</table> </table>
</div> </div>

10
src/main/webapp/dll/h2_common_code_data.sql.rej Normal file
View File

@ -0,0 +1,10 @@
diff a/src/main/webapp/dll/h2_common_code_data.sql b/src/main/webapp/dll/h2_common_code_data.sql (rejected hunks)
@@ -6,5 +6,4 @@
('DC05', '04', '<27>뺸', '', NOW(), '', 4, 'Y'),
('DC05', '05', '<27><><EFBFBD>', '', NOW(), '', 5, 'Y'),
('DC05', '06', '<27><><EFBFBD><EFBFBD>', '', NOW(), '', 6, 'Y'),
-('DC05', '07', '<27><><EFBFBD><EFBFBD>', '', NOW(), '', 7, 'Y'),
-('DC05', '08', '<27><><EFBFBD><EFBFBD>ġ', '', NOW(), '', 8, 'Y');
\ No newline at end of file
+('DC05', '07', '<27><><EFBFBD><EFBFBD>', '', NOW(), '', 7, 'Y');
\ No newline at end of file