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

Compare commits

base: DBNT:f3a782f24dec810791b1bb408246e71b9b886d0b
Branches Tags
DBNT:master
..
compare: DBNT:3c7d41b9e87ca3508d9d53f849b2d1df02ea48a6
Branches Tags
DBNT:master

No commits in common. "f3a782f24dec810791b1bb408246e71b9b886d0b" and "3c7d41b9e87ca3508d9d53f849b2d1df02ea48a6" have entirely different histories.
f3a782f24d ... 3c7d41b9e8

6 changed files with 548 additions and 370 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/com/mca/cmmn/web/MapController.java
View File

@ -129,7 +129,7 @@ public class MapController {
model.addAttribute("layers", layers); model.addAttribute("layers", layers);
model.addAttribute("layersVO", layersVO); model.addAttribute("layersVO", layersVO);
return "map/html/requestView"; return "map/requestView";
}else { }else {
model.addAttribute("url", "/map/request"); model.addAttribute("url", "/map/request");
model.addAttribute("resultMsg", "권한이 없습니다."); model.addAttribute("resultMsg", "권한이 없습니다.");

1
src/main/webapp/WEB-INF/jsp/admin/request.jsp
View File

@ -1,3 +1,4 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-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="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>

3
src/main/webapp/WEB-INF/jsp/map/request.jsp
View File

@ -34,9 +34,8 @@
<c:if test="${count >= 1}"> <c:if test="${count >= 1}">
<c:forEach var="item" items="${useRequestList}" varStatus="idx"> <c:forEach var="item" items="${useRequestList}" varStatus="idx">
<tr> <tr>
<%--<a href="/map/request/<c:out value='${item.idx}' />">--%>
<td>${idx.count}</td> <td>${idx.count}</td>
<td class="title-td" data-idx="${item.idx}">${item.title}</td> <td class="title-td" style="width:70%;"><a href="/map/request/<c:out value='${item.idx}' />">${item.title}</a></td>
<td class="td_date">${item.r_date}</td> <td class="td_date">${item.r_date}</td>
<td> <td>
<c:choose> <c:choose>

224
src/main/webapp/WEB-INF/jsp/map/requestView.jsp
View File

@ -5,7 +5,7 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
<form:form commandName="useRequestVO" name="frm" method="POST" action="/map/updateReq" id="updateFrm"> <form:form commandName="useRequestVO" name="frm" method="POST" action="/map/updateReq" id="updateFrm">
<input type="hidden" name="idx" value="${useRequestVO.idx}" /> <input type="hidden" name="idx" value="${useRequestVO.idx}" />
<div class="section_title"> <div class="section_title">
<!-- <p>현장 지원 시스템</p> --> <!-- <p>현장 지원 시스템</p> -->
@ -17,6 +17,11 @@
<c:choose> <c:choose>
<c:when test="${useRequestVO.status eq '99' }"> <c:when test="${useRequestVO.status eq '99' }">
<table class="detail_table"> <table class="detail_table">
<thead>
<tr>
<th colspan="5" style="text-align: center;">지도 사용 요청</th>
</tr>
</thead>
<tbody> <tbody>
<tr> <tr>
<th colspan="2">작업명</th> <th colspan="2">작업명</th>
@ -61,7 +66,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th rowspan="3">레이어</th> <th style="width:7%;" rowspan="3">레이어</th>
<th><label>지하시설물</label></th> <th><label>지하시설물</label></th>
<td> <td>
<c:forEach var="item" items="${layersVO}" varStatus="status"> <c:forEach var="item" items="${layersVO}" varStatus="status">
@ -115,6 +120,9 @@
</tbody> </tbody>
</table> </table>
<div class="section_btn"> <div class="section_btn">
<p class="search_p1">
<input class="btn btn-primary" type="button" value="목록" onclick="location.href='/map/request'" />
</p>
<p class="search_p2"> <p class="search_p2">
<input class="btn btn-danger" type="button" value="취소" onclick="deleteReqBtn(); return false;" /> <input class="btn btn-danger" type="button" value="취소" onclick="deleteReqBtn(); return false;" />
<input class="btn btn-success" type="button" value="수정" onclick="updateReqBtn(); return false;" /> <input class="btn btn-success" type="button" value="수정" onclick="updateReqBtn(); return false;" />
@ -123,6 +131,11 @@
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<table class="detail_table"> <table class="detail_table">
<thead>
<tr>
<th colspan="4" style="text-align: center;">지도 사용 요청</th>
</tr>
</thead>
<tbody> <tbody>
<tr> <tr>
<th>작업명</th> <th>작업명</th>
@ -220,14 +233,215 @@
</table> </table>
<div class="section_btn"> <div class="section_btn">
<p class="search_p1">
<input class="btn btn-primary" type="button" value="목록" onclick="location.href='/map/request'" />
</p>
</div> </div>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</div> </div>
</form:form> </form:form>
<script type="text/javascript"> <script type="text/javascript">
var areaAddCount = ${selectArea.size()}; var areaAddCount = ${selectArea.size()};
/*
* 지역 추가
*/
function addAreaBtn(){
var addedAreaWrapCnt = $(".addedAreaWrap").length;
if(addedAreaWrapCnt < 3){
if($("#city").val() != "0"){
areaAddCount++;
var selectAreaCode = null;
var selectAreaName = null;
if($("#town").val() == "0"){
selectArea = $("#county").val();
selectAreaName = $("#city option:selected").text() +" "+ $("#county option:selected").text();
if($("#county").val() == "0"){
selectArea = $("#city").val();
selectAreaName = $("#city option:selected").text();
}
}else{
selectArea = $("#town").val();
selectAreaName = $("#city option:selected").text()+" "+$("#county option:selected").text()+" "+$("#town option:selected").text();
}
var overLapArea = false;
$("input[name=selectArea]").each(function(){
if($(this).val() == selectArea){
overLapArea = true;
}
});
if(overLapArea){
alert('이미 등록된 장소 입니다.');
return false;
}else{
var tag = '';
tag += '<span id="addedAreaWrap'+areaAddCount+'" class="addedAreaWrap">';
tag += selectAreaName;
tag += '<span class="glyphicon glyphicon-remove point-cursor" onclick="removeAreaBtn('+areaAddCount+');"></span>';
tag += '<input type="hidden" name="selectArea" value="'+selectArea+'" />';
tag += '</span>';
$("#addedArea").append(tag);
}
}else{
alert('지역을 선택해주세요.');
}
}else{
alert('더 이상 추가 하실 수 없습니다.');
}
}
/*
* 지역 삭제
* removeNum : 삭제할 태그 번호
*/
function removeAreaBtn(removeNum){
$("#addedAreaWrap"+removeNum).remove();
}
function resetSelectBox(area){
var baseOption = "<option value='0'>::전체::</option>";
if(area == "county"){
$("#town").empty();
$("#town").append(baseOption);
}else if(area == "city"){
$("#county").empty();
$("#town").empty();
$("#county").append(baseOption);
$("#town").append(baseOption);
}
}
/*
* 지역 변경
*/
function changeAreaList(code, area){
var target = null
if(area == "city"){
target = $("#county");
}else{
target = $("#town");
}
resetSelectBox(area);
if(code != 0){
$.ajax({
url : "<c:url value='/selectAreaList' />",
type : "GET",
dataType : "json",
data:{
"code" : code,
"area" : area
},
success : function(data){
if(data){
if(area == "city"){
for(var idx in data){
target.append("<option value='"+data[idx].code+"'>"+data[idx].area+"</option>");
}
}else{
for(var idx in data){
target.append("<option value='"+data[idx].code+"'>"+data[idx].area+"</option>");
}
}
}
}
});
}
}
/*
* 날짜 변경
* state : 시작 또는 종료
*/
function dateChange(state){
var startDate = $("#startDate").val();
var endDate = $("#endDate").val();
if(endDate != "" && startDate > endDate){
if(state == "start"){
$("#endDate").val(startDate);
}else{
$("#startDate").val(endDate);
}
}
}
/*
* 지역 유효성 검사
*/
function areaCheck(){
var selectArr = [];
$("input[name=selectArea]").each(function(){
selectArr.push($(this).val());
});
$("#places").val(selectArr);
if($("#places").val() == ""){
return false;
}else{
return true;
}
}
/*
* 레이어 유효성 검사
*/
function layersCheck(){
var checkArr = []; // 배열 초기화
$('input:checkbox[name="facility"]:checked').each(function(index, item) {
checkArr.push($(item).val());
});
$('input:checkbox[name="structure"]:checked').each(function(index, item) {
checkArr.push($(item).val());
});
$('input:checkbox[name="ground"]:checked').each(function(index, item) {
checkArr.push($(item).val());
});
$('#layers').val(checkArr);
if($('#layers').val() == ""){
return false;
}else{
return true;
}
}
function updateReqBtn(){
if($("#title").val() == ""){
alert('작업명을 입력해주세요.');
$("#title").focus();
return;
}else if($("#startDate").val() == ""){
alert('시작 기간을 입력해주세요.');
$("#startDate").focus();
return;
}else if($("#endDate").val() == ""){
alert('종료 기간을 입력해주세요.');
$("#endDate").focus();
return;
}else if(!areaCheck()){
alert('지역을 추가해주세요.');
return;
}else if(!layersCheck()){
alert('레이어를 선택해주세요.');
return;
}else{
$("#updateFrm").submit();
}
}
function deleteReqBtn(){
if(confirm('지도사용요청을 취소하시겠습니까?')){
$("#updateFrm").attr("action", "/map/deleteReq");
$("#updateFrm").submit();
}
}
$(function(){ $(function(){
$("#startDate").datepicker({ $("#startDate").datepicker({
dateFormat: 'yy-mm-dd', dateFormat: 'yy-mm-dd',
@ -336,4 +550,4 @@
}); });
}); });
</script> </script>

1
src/main/webapp/css/style.css
View File

@ -656,6 +656,7 @@ a {
} }
.title-td{ .title-td{
text-align:left !important;
width:50%; width:50%;
} }

43
src/main/webapp/js/map/request.js
View File

@ -18,14 +18,8 @@ $(function(){
}); });
$(document).on('click', '#mapRequestModalBtn', function (){ $(document).on('click', '#mapRequestModalBtn', function (){
mapRequestModalOpen('/map/reqWrite');
})
$(document).on('click', '.title-td', function (){
mapRequestModalOpen('/map/request/'+$(this).attr("data-idx"));
})
function mapRequestModalOpen(url){
$.ajax({ $.ajax({
url: url, url: '/map/reqWrite',
type: 'GET', type: 'GET',
dataType:"html", dataType:"html",
success: function(html){ success: function(html){
@ -36,7 +30,8 @@ function mapRequestModalOpen(url){
} }
}); });
} })
/* 날짜포맷 yyyy-MM-dd 변환 */ /* 날짜포맷 yyyy-MM-dd 변환 */
function getFormatDate(date){ function getFormatDate(date){
var year = date.getFullYear(); var year = date.getFullYear();
@ -243,35 +238,3 @@ function insertReqBtn(){
$("#insertFrm").submit(); $("#insertFrm").submit();
} }
} }
function updateReqBtn(){
if($("#title").val() == ""){
alert('작업명을 입력해주세요.');
$("#title").focus();
return;
}else if($("#startDate").val() == ""){
alert('시작 기간을 입력해주세요.');
$("#startDate").focus();
return;
}else if($("#endDate").val() == ""){
alert('종료 기간을 입력해주세요.');
$("#endDate").focus();
return;
}else if(!areaCheck()){
alert('지역을 추가해주세요.');
return;
}else if(!layersCheck()){
alert('레이어를 선택해주세요.');
return;
}else{
$("#updateFrm").submit();
}
}
function deleteReqBtn(){
if(confirm('지도사용요청을 취소하시겠습니까?')){
$("#updateFrm").attr("action", "/map/deleteReq");
$("#updateFrm").submit();
}
}