diff --git a/src/main/java/com/mca/util/ImgPaginationRenderer.java b/src/main/java/com/mca/util/ImgPaginationRenderer.java index 7d43b68..43d33c9 100644 --- a/src/main/java/com/mca/util/ImgPaginationRenderer.java +++ b/src/main/java/com/mca/util/ImgPaginationRenderer.java @@ -51,17 +51,17 @@ public class ImgPaginationRenderer extends AbstractPaginationRenderer implements * @see 개발프레임웍크 실행환경 개발팀 */ public void initVariables() { - - firstPageLabel = "";//""" + " "; + // firstPageLabel = "" + " "; + firstPageLabel = "";//"" + " "; previousPageLabel = "
  • \n" + - "\t\t\t\t\t \n" + + "\t\t\t\t\t \n" + "\t\t\t\t\t\t«\n" + "\t\t\t\t\t \n" + "\t\t\t\t\t
    • "; currentPageLabel = "
  • {0}
    • "; otherPageLabel = "
  • {2}
    • "; nextPageLabel = "
  • \n" + - "\t\t\t\t\t \n" + + "\t\t\t\t\t \n" + "\t\t\t\t\t\t»\n" + "\t\t\t\t\t \n" + "\t\t\t\t\t
    • "; diff --git a/src/main/webapp/WEB-INF/config/egovframework/validator/validator.xml b/src/main/webapp/WEB-INF/config/egovframework/validator/validator.xml index 453fa36..c46139c 100644 --- a/src/main/webapp/WEB-INF/config/egovframework/validator/validator.xml +++ b/src/main/webapp/WEB-INF/config/egovframework/validator/validator.xml @@ -1,21 +1,21 @@ - +
    - - - - - + + + + + + + + - - -
    diff --git a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp index 5418297..3e764c0 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp @@ -1,106 +1,107 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%----%>
    -
    -
    -
    -
    -
    - -
    -
    - 지도사용 요청 승인대기 -

    -
    -
    -
    -
    -
    -
    - -
    -
    - 회원가입 승인대기 -

    -
    -
    -
    -
    -
    -
    - -
    -
    - 확인 요청 데이터 -

    +
    +
    +
    +
    +
    + +
    +
    + 지도사용 요청 승인대기 +

    +
    +
    +
    +
    +
    +
    + +
    +
    + 회원가입 승인대기 +

    +
    +
    +
    +
    +
    +
    + +
    +
    + 확인 요청 데이터 +

    -
    +
    +
    +
    -
    -
    -
    -
    -
    +
    +
    +
    -
    -

    -

    - 그래프 -
    +
    +

    -

    + 그래프 +
    +
    +
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -

    -

    -

    0

    -
    +
    +
    +
    +
    +
    + +
    +
    +

    -

    +

    0

    +
    +
    +
    +
    +
    +
    + +
    +
    +

    오늘 방문자 수

    +

    +
    +
    +
    +
    +
    +
    + +
    +
    +

    최근 한달 방문자 수

    +

    +
    +
    +
    -
    -
    -
    -
    - -
    -
    -

    오늘 방문자 수

    -

    -
    +
    +
    +
    +
    +

    -

    + 그래프 +
    +
    +
    -
    -
    -
    -
    - -
    -
    -

    최근 한달 방문자 수

    -

    -
    -
    -
    -
    -
    -
    -
    -

    -

    - 그래프 -
    -
    -
    -
    -
    diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp index fc6dd6f..1e10d0a 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp @@ -1,122 +1,140 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> - +
    -

    현장수집 데이터(${count})

    - -
    -
    - -
    +

    현장수집 데이터(${count})

    + +
    +
    + +
    -
    -
    - +
    +
    + +
    + +
    + +
    +
    + +
    +
    -
    - +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Data ID지역소속담당자수집날짜상태
    + + 수집 + 검증실패 + 검증 + 반영실패 + 반영 + +
    요청한 목록이 없습니다.
    -
    - + +
    + +
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Data ID지역소속담당자수집날짜상태
    - - 수집 - 검증실패 - 검증 - 반영실패 - 반영 - -
    요청한 목록이 없습니다.
    -
    - -
    - - -
    - +
    diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp index c58eaba..b34abdd 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp @@ -1,8 +1,8 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> " rel="stylesheet"> " rel="stylesheet"> @@ -10,108 +10,109 @@ -
    - -
    -
    -
    - - - -
    담당자
    - - - - - - - - - - - - -
    소속이름연락처
    -
    -
    - - - -

    현장수집 데이터

    - - - - - - - - - - - - - - - - - - - - - - -
    레이어 ID수집일
    지역상태 - - - 수집 - - - 검증실패 - - - 검증성공 - - - 반영실패 - - - 반영 - - -
    설명오류내용
    -
    -
    -
    -
    측량데이터
    -
    -
    -
    - - - - - - - - +
    + +
    +
    +
    +
    속성정보
    + + +
    담당자
    + + + + + + + + + + + +
    소속이름연락처
    -
    -
      -
      -
      -

      - -

      -

      - - -

      -
      +
      + + + +

      현장수집 데이터

      + + + + + + + + + + + + + + + + + + + + + + +
      레이어 ID수집일
      지역상태 + + + 수집 + + + 검증실패 + + + 검증성공 + + + 반영실패 + + + 반영 + + +
      설명오류내용
      +
      +
      +
      +
      측량데이터
      +
      +
      +
      + + + + + + + + + +
      속성정보
      +
      +
        +
        +
        +

        + +

        +

        + + +

        +
        +
        \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/admin/history.jsp b/src/main/webapp/WEB-INF/jsp/admin/history.jsp index 7ec65bd..0104825 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/history.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/history.jsp @@ -1,74 +1,86 @@ <%@ page language="java" contentType="text/html; charset=utf-8" - pageEncoding="utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> - + pageEncoding="utf-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> + +
        - -
        + +
        -
        -

        지도사용 이력

        - +
        +

        지도사용 이력

        + -
        +
        -
        -
        - -
        +
        +
        + +
        -
        - -
        -
        - -
        -
        -
        +
        + +
        +
        + +
        +
        +
        -
        - - - - - - - - - - - - - - - - - - - - - - - - -
        위치소속담당자날짜
        요청한 목록이 없습니다.
        -
        -
        - - -
        -
        +
        + + + + + + + + + + + + + + + + + + + + + + + + + + +
        위치소속담당자날짜
        요청한 목록이 없습니다.
        +
        +
        + + +
        +
        diff --git a/src/main/webapp/WEB-INF/jsp/admin/request.jsp b/src/main/webapp/WEB-INF/jsp/admin/request.jsp index 40de297..217d6f3 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/request.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/request.jsp @@ -1,96 +1,120 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> - + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> + +
        -

        지도사용 요청

        - - " /> +

        지도사용 요청

        + + "/> -
        - -
        - -
        - -
        -
        - -
        +
        - +
        -
        - + +
        +
        + +
        + +
        + +
        +
        + +
        -
        -
        +
        - -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        번호작업명소속담당자날짜상태
        - - - - - -
        요청한 목록이 없습니다.
        +
        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        번호작업명소속담당자날짜상태
        + + + + + + +
        요청한 목록이 없습니다.
        +
        +
        + +
        -
        - - -
        - +
        diff --git a/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp b/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp index b4165af..64d3a56 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp @@ -1,198 +1,206 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - + - - - -
        - -
        + + + +
        + +
        -
        - - -
        +
        + + +
        - - -
         담당자
        - - - - - - - - - - - - - -
        소속이름연락처상태 - - - - - -
        -
        + + +
         담당자
        + + + + + + + + + + + + + +
        소속이름연락처상태 + + + + + +
        +
        -
        - - -

        지도사용 요청

        - - +
        +
        + +

        지도사용 요청

        + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - -
        작업명
        기간 ~
        장소 - -
        - ${item} -
        -         -
        레이어 -
        - - - - - /> - - - -
        -
        -
        - - - - /> - - - -
        -
        -
        - - - - /> - - - -
        -
        작업명
        기간 ~
        장소 + +
        + ${item} +
        +         +
        레이어 +
        + + + + + /> + + + +
        +
        +
        + + + + /> + + + +
        +
        +
        + + + + /> + + + +
        +
        요청 내용
        요청 내용
        -
        - - - - - - - - - - -
        전달 메세지 - -
        - -
        + + +
        + + + + + + + + + + +
        전달 메세지 + +
        + +
        - -
        -
        -

        - -

        -

        - - -

        -
        -
        +
        +
        +

        + +

        +

        + + +

        +
        +
        - - + + - - - - - - - -
        전달 메세지
        + + + + + + + +
        전달 메세지
        -
        -

        - -

        -
        +
        +

        + +

        +
        -         - - +         + + diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp index 1413bb7..d7472ed 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp @@ -1,118 +1,140 @@ <%@ page language="java" contentType="text/html; charset=utf-8" - pageEncoding="utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> + pageEncoding="utf-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> + + -
        - +
        -

        회원관리

        - +

        회원관리

        + -
        -
        - - -
        +
        +
        + + +
        -
        -
        - +
        +
        + +
        + +
        + +
        +
        + +
        +
        -
        - + +
        + + + + + + + + + + + + + + + + + <%----%> + + + + + + + + + + + + + + + + +
        아이디이름소속전화번호이메일가입일${userSearchVO.auth eq '99'?'상태':'권한'}
        + + 관리자 + 사용자 + + + + + +
        요청한 목록이 없습니다.
        -
        - +
        + +
        -
        -
        + - -
        - - - - - - - - - - - - - - - - - <%----%> - - - - - - - - - - - - - - -
        아이디이름소속전화번호이메일가입일${userSearchVO.auth eq '99'?'상태':'권한'}
        - - 관리자 - 사용자 - - - - - -
        요청한 목록이 없습니다.
        -
        -
        - - -
        - - - - - - + + + +
        -