From 4cdd015726e316e746c5f17a23c81252e5b8ff41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 27 Dec 2021 18:46:43 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?=EC=8A=B9=EC=9D=B8=EC=8B=9C=20=EB=8F=99=EC=9E=91=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InfoController.java | 79 ++++++++- .../controller/adminController.java | 2 +- .../mapper/CategoryRoleMapper.java | 12 -- .../mapper/ModifyRequestMapper.java | 12 ++ .../kcgfilemanager/model/ModifyRequest.java | 7 + .../service/CategoryRoleService.java | 18 +- .../service/ModifyRequestService.java | 88 ++++++++++ .../service/UserInfoService.java | 5 +- .../resources/mybatisMapper/BoardMapper.xml | 2 +- .../mybatisMapper/CategoryRoleMapper.xml | 16 -- .../mybatisMapper/ModifyRequestMapper.xml | 68 ++++++++ src/main/resources/static/js/user/info.js | 1 + .../static/js/user/modifyRequestList.js | 74 ++++++++ .../static/js/user/modifyRequestWrite.js | 55 ++++-- .../templates/fragments/leftMenu.html | 2 +- .../templates/user/modifyRequestDetail.html | 107 ++++++++++++ .../templates/user/modifyRequestList.html | 163 ++++++++++++++++++ .../templates/user/modifyRequestWrite.html | 46 ++--- src/main/resources/templates/user/myInfo.html | 2 +- 19 files changed, 676 insertions(+), 83 deletions(-) delete mode 100644 src/main/java/com/dbnt/kcgfilemanager/mapper/CategoryRoleMapper.java create mode 100644 src/main/java/com/dbnt/kcgfilemanager/mapper/ModifyRequestMapper.java delete mode 100644 src/main/resources/mybatisMapper/CategoryRoleMapper.xml create mode 100644 src/main/resources/mybatisMapper/ModifyRequestMapper.xml create mode 100644 src/main/resources/static/js/user/modifyRequestList.js create mode 100644 src/main/resources/templates/user/modifyRequestDetail.html create mode 100644 src/main/resources/templates/user/modifyRequestList.html diff --git a/src/main/java/com/dbnt/kcgfilemanager/controller/InfoController.java b/src/main/java/com/dbnt/kcgfilemanager/controller/InfoController.java index b61a9ac..f122dab 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/controller/InfoController.java +++ b/src/main/java/com/dbnt/kcgfilemanager/controller/InfoController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import java.util.ArrayList; +import java.util.List; @RestController @RequiredArgsConstructor @@ -46,20 +47,84 @@ public class InfoController { if(modifyRequest.getRequestSeq()==null){ mav.addObject("type", "new"); mav.addObject("modifyRequest", modifyRequest); - CategoryRole categoryRole = new CategoryRole(); - categoryRole.setUserSeq(loginUser.getUserSeq()); - mav.addObject("categorySeqList", categoryRoleService.selectCategorySeqListToUser(categoryRole)); }else{ mav.addObject("type", "modify"); - // 이하 수정기능 추가시 작업 필요. + modifyRequest = modifyRequestService.selectModifyRequestByRequestSeq(modifyRequest.getRequestSeq()); + modifyRequest.setCreateName(userInfoService.selectUserInfoByUserId(modifyRequest.getCreateId()).getName()); + if(modifyRequest.getRequestType().equals("categoryRole")){ + String[] categoryAry = modifyRequest.getRequestCategoryAry().split(","); + List requestCategoryList = new ArrayList<>(); + for(String categorySeq : categoryAry){ + requestCategoryList.add(Integer.parseInt(categorySeq.replaceAll(" ", ""))); + } + modifyRequest.setRequestCategoryList(requestCategoryList); + } mav.addObject("modifyRequest", modifyRequest); - mav.addObject("categorySeqList", new ArrayList<>()); } + CategoryRole categoryRole = new CategoryRole(); + categoryRole.setUserSeq(loginUser.getUserSeq()); + mav.addObject("categorySeqList", categoryRoleService.selectCategorySeqListToUser(categoryRole)); return mav; } @PostMapping("/saveModifyRequest") - public Integer saveModifyRequest(ModifyRequest modifyRequest){ - return modifyRequestService.saveModifyRequest(modifyRequest); + public Integer saveModifyRequest(ModifyRequest modifyRequest, + @RequestParam(value = "categorySeq", required = false) List categorySeqList){ + if(categorySeqList != null && categorySeqList.size()>0){ + String requestCategoryAry = categorySeqList.toString(); + modifyRequest.setRequestCategoryAry(requestCategoryAry.substring(1, requestCategoryAry.length()-1)); + } + if(modifyRequest.getRequestSeq()!=null){ + return modifyRequestService.updateModifyRequest(modifyRequest); + }else{ + return modifyRequestService.saveModifyRequest(modifyRequest); + } + } + + @PutMapping("/modifyRequestStateChange") + public Integer modifyRequestStateChange(ModifyRequest modifyRequest){ + return modifyRequestService.modifyRequestStateChange(modifyRequest); + } + + @GetMapping("/modifyRequestList") + public ModelAndView modifyRequestList(@AuthenticationPrincipal UserInfo loginUser, ModifyRequest modifyRequest){ + ModelAndView mav = new ModelAndView("user/modifyRequestList"); + if(loginUser.getUserRole().contains("ADMIN")){ + modifyRequest.setUserRole("ADMIN"); + }else{ + modifyRequest.setCreateId(loginUser.getUserId()); + modifyRequest.setUserRole("USER"); + } + modifyRequest.setQueryInfo(); + mav.addObject("modifyRequestList", modifyRequestService.selectModifyRequestList(modifyRequest)); + modifyRequest.setContentCnt(modifyRequestService.selectModifyRequestListCnt(modifyRequest)); + modifyRequest.setPaginationInfo(); + mav.addObject("searchParams", modifyRequest); + return mav; + } + + @GetMapping("/modifyRequestDetail") + public ModelAndView modifyRequestDetail(@AuthenticationPrincipal UserInfo loginUser, ModifyRequest modifyRequest){ + ModelAndView mav = new ModelAndView("user/modifyRequestDetail"); + ModifyRequest request = modifyRequestService.selectModifyRequestByRequestSeq(modifyRequest.getRequestSeq()); + mav.addObject("modifyRequest", request); + switch (request.getRequestType()){ + case "userInfo": + mav.addObject("userInfo", userInfoService.selectUserInfoByUserId(request.getCreateId())); + break; + case "categoryRole": + String[] categoryAry = request.getRequestCategoryAry().split(","); + List requestCategoryList = new ArrayList<>(); + for(String categorySeq : categoryAry){ + requestCategoryList.add(Integer.parseInt(categorySeq.replaceAll(" ", ""))); + } + request.setRequestCategoryList(requestCategoryList); + CategoryRole categoryRole = new CategoryRole(); + categoryRole.setUserSeq(loginUser.getUserSeq()); + mav.addObject("categorySeqList", categoryRoleService.selectCategorySeqListToUser(categoryRole)); + break; + } + mav.addObject("loginUser", loginUser); + return mav; } } diff --git a/src/main/java/com/dbnt/kcgfilemanager/controller/adminController.java b/src/main/java/com/dbnt/kcgfilemanager/controller/adminController.java index 7c8ecce..f8877c2 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/controller/adminController.java +++ b/src/main/java/com/dbnt/kcgfilemanager/controller/adminController.java @@ -82,7 +82,7 @@ public class adminController { @GetMapping("/selectUserInfo") public ModelAndView selectUserInfo(UserInfo userInfo){ ModelAndView mav = new ModelAndView("admin/userInfo"); - mav.addObject("userInfo", userInfoService.selectUserInfo(userInfo)); + mav.addObject("userInfo", userInfoService.selectUserInfoByUserSeq(userInfo)); return mav; } @PostMapping("/insertCategoryRole") diff --git a/src/main/java/com/dbnt/kcgfilemanager/mapper/CategoryRoleMapper.java b/src/main/java/com/dbnt/kcgfilemanager/mapper/CategoryRoleMapper.java deleted file mode 100644 index 1731a81..0000000 --- a/src/main/java/com/dbnt/kcgfilemanager/mapper/CategoryRoleMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.dbnt.kcgfilemanager.mapper; - -import com.dbnt.kcgfilemanager.model.BoardCategory; -import com.dbnt.kcgfilemanager.model.CategoryRole; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface CategoryRoleMapper { - List selectCategoryListToUser(CategoryRole categoryRole); -} diff --git a/src/main/java/com/dbnt/kcgfilemanager/mapper/ModifyRequestMapper.java b/src/main/java/com/dbnt/kcgfilemanager/mapper/ModifyRequestMapper.java new file mode 100644 index 0000000..5bf1289 --- /dev/null +++ b/src/main/java/com/dbnt/kcgfilemanager/mapper/ModifyRequestMapper.java @@ -0,0 +1,12 @@ +package com.dbnt.kcgfilemanager.mapper; + +import com.dbnt.kcgfilemanager.model.ModifyRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface ModifyRequestMapper { + List selectModifyRequestList(ModifyRequest modifyRequest); + Integer selectModifyRequestListCnt(ModifyRequest modifyRequest); +} diff --git a/src/main/java/com/dbnt/kcgfilemanager/model/ModifyRequest.java b/src/main/java/com/dbnt/kcgfilemanager/model/ModifyRequest.java index ba7a3d1..2b883f3 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/model/ModifyRequest.java +++ b/src/main/java/com/dbnt/kcgfilemanager/model/ModifyRequest.java @@ -43,4 +43,11 @@ public class ModifyRequest extends BaseModel{ private String createId; @Column(name = "CREATE_DATE") private LocalDateTime createDate; + + @Transient + private List requestCategoryList; + @Transient + private String createName; + @Transient + private String userRole; } diff --git a/src/main/java/com/dbnt/kcgfilemanager/service/CategoryRoleService.java b/src/main/java/com/dbnt/kcgfilemanager/service/CategoryRoleService.java index ffd3aea..146ce64 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/service/CategoryRoleService.java +++ b/src/main/java/com/dbnt/kcgfilemanager/service/CategoryRoleService.java @@ -1,11 +1,8 @@ package com.dbnt.kcgfilemanager.service; -import com.dbnt.kcgfilemanager.mapper.CategoryRoleMapper; -import com.dbnt.kcgfilemanager.model.BoardCategory; import com.dbnt.kcgfilemanager.model.CategoryRole; import com.dbnt.kcgfilemanager.repository.CategoryRoleRepository; import lombok.RequiredArgsConstructor; -import org.apache.logging.log4j.util.StringBuilders; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -17,7 +14,6 @@ import java.util.List; @RequiredArgsConstructor public class CategoryRoleService { private final CategoryRoleRepository categoryRoleRepository; - private final CategoryRoleMapper categoryRoleMapper; @Transactional public void insertCategoryRole(Integer userSeq, List mapList) { @@ -33,6 +29,20 @@ public class CategoryRoleService { categoryRoleRepository.saveAll(categoryRoleList); } + @Transactional + public void modifyCategoryRole(Integer userSeq, List categorySeqList) { + categoryRoleRepository.deleteByUserSeq(userSeq); + List categoryRoleList = new ArrayList<>(); + for(Integer categorySeq: categorySeqList){ + CategoryRole categoryRole = new CategoryRole(); + categoryRole.setUserSeq(userSeq); + categoryRole.setCategorySeq(categorySeq); + categoryRole.setCategoryRole("T"); + categoryRoleList.add(categoryRole); + } + categoryRoleRepository.saveAll(categoryRoleList); + } + public List selectCategorySeqListToUser(CategoryRole categoryRole) { List categoryRoleList = categoryRoleRepository.findByUserSeq(categoryRole.getUserSeq()); List roleList = new ArrayList<>(); diff --git a/src/main/java/com/dbnt/kcgfilemanager/service/ModifyRequestService.java b/src/main/java/com/dbnt/kcgfilemanager/service/ModifyRequestService.java index e250358..4420da5 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/service/ModifyRequestService.java +++ b/src/main/java/com/dbnt/kcgfilemanager/service/ModifyRequestService.java @@ -1,18 +1,106 @@ package com.dbnt.kcgfilemanager.service; +import com.dbnt.kcgfilemanager.mapper.ModifyRequestMapper; import com.dbnt.kcgfilemanager.model.ModifyRequest; +import com.dbnt.kcgfilemanager.model.UserInfo; import com.dbnt.kcgfilemanager.repository.ModifyRequestRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + @Service @RequiredArgsConstructor public class ModifyRequestService { private final ModifyRequestRepository modifyRequestRepository; + private final ModifyRequestMapper modifyRequestMapper; + private final UserInfoService userInfoService; + private final CategoryRoleService categoryRoleService; public Integer saveModifyRequest(ModifyRequest modifyRequest) { return modifyRequestRepository.save(modifyRequest).getRequestSeq(); } + + public Integer updateModifyRequest(ModifyRequest modifyRequest) { + ModifyRequest dbData = selectModifyRequestByRequestSeq(modifyRequest.getRequestSeq()); + + if(modifyRequest.getStatus()!=null && !modifyRequest.getStatus().equals("")){ + dbData.setStatus(modifyRequest.getStatus()); + } + if(modifyRequest.getRequestType()!=null && !modifyRequest.getRequestType().equals("")){ + dbData.setRequestType(modifyRequest.getRequestType()); + } + if(modifyRequest.getDescription()!=null && !modifyRequest.getDescription().equals("")){ + dbData.setDescription(modifyRequest.getDescription()); + } + if(modifyRequest.getRequestName()!=null && !modifyRequest.getRequestName().equals("")){ + dbData.setRequestName(modifyRequest.getRequestName()); + } + if(modifyRequest.getRequestDepartment()!=null && !modifyRequest.getRequestDepartment().equals(0)){ + dbData.setRequestDepartment(modifyRequest.getRequestDepartment()); + } + if(modifyRequest.getRequestPosition()!=null && !modifyRequest.getRequestPosition().equals(0)){ + dbData.setRequestPosition(modifyRequest.getRequestPosition()); + } + if(modifyRequest.getRequestCategoryAry()!=null && !modifyRequest.getRequestCategoryAry().equals("")){ + dbData.setRequestCategoryAry(modifyRequest.getRequestCategoryAry()); + } + + return modifyRequestRepository.save(dbData).getRequestSeq(); + } + public Integer deleteModifyRequest(ModifyRequest modifyRequest) { + modifyRequest = selectModifyRequestByRequestSeq(modifyRequest.getRequestSeq()); + modifyRequest.setTitle("삭제된 요청."); + modifyRequest.setStatus("delete"); + modifyRequest.setDescription(null); + modifyRequest.setRequestName(null); + modifyRequest.setRequestDepartment(null); + modifyRequest.setRequestPosition(null); + modifyRequest.setRequestCategoryAry(null); + return modifyRequestRepository.save(modifyRequest).getRequestSeq(); + } + + public List selectModifyRequestList(ModifyRequest modifyRequest) { + return modifyRequestMapper.selectModifyRequestList(modifyRequest); + } + public Integer selectModifyRequestListCnt(ModifyRequest modifyRequest) { + return modifyRequestMapper.selectModifyRequestListCnt(modifyRequest); + } + + public ModifyRequest selectModifyRequestByRequestSeq(Integer requestSeq) { + return modifyRequestRepository.findById(requestSeq).orElse(null); + } + + public Integer modifyRequestStateChange(ModifyRequest modifyRequest) { + switch (modifyRequest.getStatus()){ + case "approval": + ModifyRequest request = modifyRequestRepository.findById(modifyRequest.getRequestSeq()).orElse(null); + UserInfo userInfo = userInfoService.selectUserInfoByUserId(modifyRequest.getCreateId()); + switch (request.getRequestType()) { + case "userInfo": + userInfo.setUserId(request.getCreateId()); + userInfo.setName(request.getRequestName()); + userInfo.setPosition(request.getRequestPosition()); + userInfo.setDepartment(request.getRequestDepartment()); + userInfoService.updateUserInfo(userInfo); + break; + case "categoryRole": + String[] categoryAry = request.getRequestCategoryAry().split(","); + List requestCategoryList = new ArrayList<>(); + for(String categorySeq : categoryAry){ + requestCategoryList.add(Integer.parseInt(categorySeq.replaceAll(" ", ""))); + } + categoryRoleService.modifyCategoryRole(userInfo.getUserSeq(), requestCategoryList); + break; + } + return updateModifyRequest(modifyRequest); + case "delete": + return deleteModifyRequest(modifyRequest); + default: + return updateModifyRequest(modifyRequest); + } + } } diff --git a/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java b/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java index 2dfca4e..40a9b22 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java +++ b/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java @@ -68,7 +68,10 @@ public class UserInfoService implements UserDetailsService { return userInfoMapper.selectUserInfoListCnt(userInfo); } - public UserInfo selectUserInfo(UserInfo userInfo) { + public UserInfo selectUserInfoByUserSeq(UserInfo userInfo) { return userInfoRepository.findById(userInfo.getUserSeq()).orElse(null); } + public UserInfo selectUserInfoByUserId(String userId) { + return userInfoRepository.findByUserId(userId).orElse(null); + } } diff --git a/src/main/resources/mybatisMapper/BoardMapper.xml b/src/main/resources/mybatisMapper/BoardMapper.xml index 99ae63f..5e958a2 100644 --- a/src/main/resources/mybatisMapper/BoardMapper.xml +++ b/src/main/resources/mybatisMapper/BoardMapper.xml @@ -83,7 +83,7 @@ - SELECT COUNT(*) FROM BOARD A INNER JOIN USER_INFO B diff --git a/src/main/resources/mybatisMapper/CategoryRoleMapper.xml b/src/main/resources/mybatisMapper/CategoryRoleMapper.xml deleted file mode 100644 index cb1e6cc..0000000 --- a/src/main/resources/mybatisMapper/CategoryRoleMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatisMapper/ModifyRequestMapper.xml b/src/main/resources/mybatisMapper/ModifyRequestMapper.xml new file mode 100644 index 0000000..a9f2a05 --- /dev/null +++ b/src/main/resources/mybatisMapper/ModifyRequestMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/js/user/info.js b/src/main/resources/static/js/user/info.js index 3b24d44..69164ed 100644 --- a/src/main/resources/static/js/user/info.js +++ b/src/main/resources/static/js/user/info.js @@ -26,6 +26,7 @@ $(document).on('click', '#savePasswordBtn', function (){ } }) + function passwordCheck(){ let returnFlag = true; const password = $("#password"); diff --git a/src/main/resources/static/js/user/modifyRequestList.js b/src/main/resources/static/js/user/modifyRequestList.js new file mode 100644 index 0000000..ecfb403 --- /dev/null +++ b/src/main/resources/static/js/user/modifyRequestList.js @@ -0,0 +1,74 @@ +$(function (){ + $("#dateSelectorDiv").datepicker({ + format: "yyyy-mm-dd", + language: "ko" + }); +}) + +$(document).on('click', '.modifyRequestTr', function (){ + const checkBox = $(this).find(".modifyRequestCheckBox") + $(".modifyRequestCheckBox").prop("checked", false); + checkBox.prop("checked", true); + getRequestDetail(checkBox.val()); +}) + +$(document).on('click', '#deleteBtn', function (){ + if(confirm("삭제하시겠습니까?")){ + modifyRequestStatusChange({ + requestSeq: $(this).attr("data-requestseq"), + status: 'delete' + }); + } +}) + +$(document).on('click', '#dinialBtn', function (){ + if(confirm("요청을 거부 하시겠습니까?")){ + modifyRequestStatusChange({ + requestSeq: $(this).attr("data-requestseq"), + status: 'dinial' + }) + } +}) + +$(document).on('click', '#approvalBtn', function (){ + if(confirm("요청을 승인 하시겠습니까?")){ + modifyRequestStatusChange({ + requestSeq: $(this).attr("data-requestseq"), + createId: $(this).attr("data-createid"), + status: 'approval' + }) + } +}) + +function modifyRequestStatusChange(data){ + $.ajax({ + type: "PUT", + url: '/info/modifyRequestStateChange', + data: data, + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success: function (html) { + alert("저장 되었습니다.") + location.reload() + }, + error: function () { + + } + }); +} + +function getRequestDetail(requestSeq){ + $.ajax({ + url: '/info/modifyRequestDetail', + data: {requestSeq: requestSeq}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#requestDetailDiv").empty().append(html) + }, + error:function(){ + + } + }); +} \ No newline at end of file diff --git a/src/main/resources/static/js/user/modifyRequestWrite.js b/src/main/resources/static/js/user/modifyRequestWrite.js index cd15150..b33cc47 100644 --- a/src/main/resources/static/js/user/modifyRequestWrite.js +++ b/src/main/resources/static/js/user/modifyRequestWrite.js @@ -11,6 +11,9 @@ $(function (){ ['table', ['table']] ] }) + if(pageType === "modify"){ + $("#modifyInfoDiv").empty().append($("#"+$("#categorySelector").val()+"Div").children().clone()); + } }) $(document).on('change', '#categorySelector', function (){ $("#modifyInfoDiv").empty().append($("#"+this.value+"Div").children().clone()); @@ -18,27 +21,45 @@ $(document).on('change', '#categorySelector', function (){ $(document).on('click', '#saveBtn', function (){ if(contentCheck()){ if(confirm("저장하시겠습니까?")){ - const formData = new FormData($("#requestForm")[0]); - $.ajax({ - type : 'POST', - data : formData, - url : pageType==='modify'?"/info/updateModifyRequest":"/info/saveModifyRequest", - processData: false, - contentType: false, - success : function(result) { - if(result>0){ - alert("저장되었습니다."); - // location.href = "/board/contentList?categorySeq="+$("#categorySeq").val(); - } - }, - error : function(xhr, status) { - - } - }) + saveModifyRequest(); } } }) +$(document).on('change', '.parentSeq', function (){ + childCategoryStatusChange(this.value, this.checked); +}) + +function saveModifyRequest(){ + const formData = new FormData($("#requestForm")[0]); + $.ajax({ + type : 'POST', + data : formData, + url : "/info/saveModifyRequest", + processData: false, + contentType: false, + success : function(result) { + if(result>0){ + alert("저장되었습니다."); + location.href = "/info/modifyRequestList"; + } + }, + error : function(xhr, status) { + + } + }) +} + +function childCategoryStatusChange(parentSeq, flag){ + const target = $("[data-parentseq='"+parentSeq+"']"); + if(target.length>0){ + target.prop("checked", flag); + target.each(function(idx, el){ + childCategoryStatusChange(el.value, flag); + }) + } +} + function contentCheck(){ let flag = true; if(!$("#categorySelector").val()){ diff --git a/src/main/resources/templates/fragments/leftMenu.html b/src/main/resources/templates/fragments/leftMenu.html index 09f8346..b0d2c89 100644 --- a/src/main/resources/templates/fragments/leftMenu.html +++ b/src/main/resources/templates/fragments/leftMenu.html @@ -7,7 +7,7 @@ diff --git a/src/main/resources/templates/user/modifyRequestDetail.html b/src/main/resources/templates/user/modifyRequestDetail.html new file mode 100644 index 0000000..e50ea12 --- /dev/null +++ b/src/main/resources/templates/user/modifyRequestDetail.html @@ -0,0 +1,107 @@ + + +
+ +
+
+
+ +
+
+
+ 삭제 + 대기 + 거부 + 승인 +
+
+
+
+
+
+
+
+ +
+
+ +
+
+ + + +
+
+
+
+ +
+
+ + + + + + + + + + + +
+
+
+
+ +
+
+ + + + + + + + + + + +
+
+
+
+
+ + + +
+
+
+
+
+ + +
+
+ +
+
+ 수정 +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/user/modifyRequestList.html b/src/main/resources/templates/user/modifyRequestList.html new file mode 100644 index 0000000..8e82e0b --- /dev/null +++ b/src/main/resources/templates/user/modifyRequestList.html @@ -0,0 +1,163 @@ + + + + + +
+
+ + +

수정 요청 현황

+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+ +
+ +
+ + +
+ +
+
+
+
+ +
+ +
+ +
+ +
+ +
+
+ + +
+
+
+
+
+ +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
구분제목상태작성자생성일
+ + + 계정정보 + 권한정보 + 기타 + + 삭제 + 대기 + 거부 + 승인 +
+
+
+
+
+ +
+ +
+
+
+
+

왼쪽 목록에서 선택해주세요.

+
+
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/user/modifyRequestWrite.html b/src/main/resources/templates/user/modifyRequestWrite.html index 64f427a..8c3690a 100644 --- a/src/main/resources/templates/user/modifyRequestWrite.html +++ b/src/main/resources/templates/user/modifyRequestWrite.html @@ -28,15 +28,16 @@
- +
@@ -49,8 +50,8 @@
- - + +
@@ -76,12 +77,17 @@
+
+
+ 설명란에 내용 직접 입력. +
+
- +
@@ -89,7 +95,7 @@
@@ -99,7 +105,7 @@
@@ -119,8 +125,8 @@ - + @@ -135,8 +141,8 @@ - @@ -146,8 +152,8 @@ - @@ -157,8 +163,9 @@ - + @@ -172,11 +179,6 @@
-
-
- -
-
diff --git a/src/main/resources/templates/user/myInfo.html b/src/main/resources/templates/user/myInfo.html index e1a27e5..8347a7c 100644 --- a/src/main/resources/templates/user/myInfo.html +++ b/src/main/resources/templates/user/myInfo.html @@ -11,7 +11,7 @@

개인정보