diff --git a/build.gradle b/build.gradle index a1d09fe6..c505fc82 100644 --- a/build.gradle +++ b/build.gradle @@ -33,10 +33,4 @@ dependencies { runtimeOnly 'org.postgresql:postgresql:42.3.6' annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor:2.7.2' annotationProcessor 'org.projectlombok:lombok:1.18.24' - testImplementation 'org.springframework.boot:spring-boot-starter-test:2.7.2' - testImplementation 'org.springframework.security:spring-security-test:5.7.2' -} - -tasks.named('test') { - useJUnitPlatform() } diff --git a/src/main/java/com/dbnt/faisp/controller/AuthMgtController.java b/src/main/java/com/dbnt/faisp/authMgt/AuthMgtController.java similarity index 82% rename from src/main/java/com/dbnt/faisp/controller/AuthMgtController.java rename to src/main/java/com/dbnt/faisp/authMgt/AuthMgtController.java index 5c31aac7..efa6543f 100644 --- a/src/main/java/com/dbnt/faisp/controller/AuthMgtController.java +++ b/src/main/java/com/dbnt/faisp/authMgt/AuthMgtController.java @@ -1,18 +1,13 @@ -package com.dbnt.faisp.controller; +package com.dbnt.faisp.authMgt; -import com.dbnt.faisp.authMgt.AuthMgtService; -import com.dbnt.faisp.authMgt.model.AccessConfig; -import com.dbnt.faisp.authMgt.model.ApprovalConfig; +import com.dbnt.faisp.authMgt.service.AuthMgtService; import com.dbnt.faisp.authMgt.model.AuthMgt; -import com.dbnt.faisp.menuMgt.MenuMgtService; -import com.dbnt.faisp.userInfo.UserInfoService; +import com.dbnt.faisp.userInfo.service.UserInfoService; import com.dbnt.faisp.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import java.util.List; - @RestController @RequiredArgsConstructor diff --git a/src/main/java/com/dbnt/faisp/authMgt/AuthMgtService.java b/src/main/java/com/dbnt/faisp/authMgt/service/AuthMgtService.java similarity index 96% rename from src/main/java/com/dbnt/faisp/authMgt/AuthMgtService.java rename to src/main/java/com/dbnt/faisp/authMgt/service/AuthMgtService.java index cb00586e..b7e99e4f 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/AuthMgtService.java +++ b/src/main/java/com/dbnt/faisp/authMgt/service/AuthMgtService.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.authMgt; +package com.dbnt.faisp.authMgt.service; import com.dbnt.faisp.authMgt.mapper.AuthMgtMapper; import com.dbnt.faisp.authMgt.model.AccessConfig; diff --git a/src/main/java/com/dbnt/faisp/controller/CodeMgtController.java b/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtController.java similarity index 90% rename from src/main/java/com/dbnt/faisp/controller/CodeMgtController.java rename to src/main/java/com/dbnt/faisp/codeMgt/CodeMgtController.java index b0a2d3ee..edfb551c 100644 --- a/src/main/java/com/dbnt/faisp/controller/CodeMgtController.java +++ b/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtController.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.controller; +package com.dbnt.faisp.codeMgt; import com.dbnt.faisp.codeMgt.model.CodeCatg; -import com.dbnt.faisp.codeMgt.CodeMgtService; +import com.dbnt.faisp.codeMgt.service.CodeMgtService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; diff --git a/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java b/src/main/java/com/dbnt/faisp/codeMgt/service/CodeMgtService.java similarity index 98% rename from src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java rename to src/main/java/com/dbnt/faisp/codeMgt/service/CodeMgtService.java index 47dcfdb7..c03b5591 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java +++ b/src/main/java/com/dbnt/faisp/codeMgt/service/CodeMgtService.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.codeMgt; +package com.dbnt.faisp.codeMgt.service; import com.dbnt.faisp.codeMgt.model.CodeCatg; import com.dbnt.faisp.codeMgt.model.CodeMgt; diff --git a/src/main/java/com/dbnt/faisp/controller/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java similarity index 85% rename from src/main/java/com/dbnt/faisp/controller/BaseController.java rename to src/main/java/com/dbnt/faisp/config/BaseController.java index 74364e06..2cb3efba 100644 --- a/src/main/java/com/dbnt/faisp/controller/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -1,13 +1,9 @@ -package com.dbnt.faisp.controller; +package com.dbnt.faisp.config; -import com.dbnt.faisp.authMgt.AuthMgtService; -import com.dbnt.faisp.menuMgt.MenuMgtService; -import com.dbnt.faisp.menuMgt.model.MenuMgt; -import com.dbnt.faisp.organMgt.OrganConfigService; +import com.dbnt.faisp.menuMgt.service.MenuMgtService; +import com.dbnt.faisp.organMgt.service.OrganConfigService; import com.dbnt.faisp.userInfo.model.UserInfo; -import com.dbnt.faisp.codeMgt.CodeMgtService; -import com.dbnt.faisp.codeMgt.model.CodeCatg; -import com.dbnt.faisp.codeMgt.model.CodeMgt; +import com.dbnt.faisp.codeMgt.service.CodeMgtService; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; @@ -15,9 +11,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; -import java.util.ArrayList; -import java.util.List; - import javax.servlet.http.HttpSession; @RestController diff --git a/src/main/java/com/dbnt/faisp/controller/FpiMgtController.java b/src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java similarity index 83% rename from src/main/java/com/dbnt/faisp/controller/FpiMgtController.java rename to src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java index e3dffd27..0f1ae45c 100644 --- a/src/main/java/com/dbnt/faisp/controller/FpiMgtController.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.controller; +package com.dbnt.faisp.fpiMgt; -import com.dbnt.faisp.fpiMgt.monthPlan.MonthPlanService; +import com.dbnt.faisp.fpiMgt.monthPlan.service.MonthPlanService; import com.dbnt.faisp.fpiMgt.monthPlan.model.BoardPlan; import com.dbnt.faisp.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; @@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.List; @RestController @@ -45,6 +44,14 @@ public class FpiMgtController { // 외사경찰견문관리 return mav; } + @GetMapping("/planViewModal") + public ModelAndView planViewModal(BoardPlan boardPlan){ + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monthPlan/planViewModal"); + boardPlan = monthPlanService.selectBoardPlan(boardPlan.getPlanKey()); + mav.addObject("plan", boardPlan); + return mav; + } + @PostMapping("/savePlan") public Integer savePlan(BoardPlan boardPlan, @RequestParam(value = "planInfos", required = false) List planInfos, diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/MonthPlanService.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/service/MonthPlanService.java similarity index 97% rename from src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/MonthPlanService.java rename to src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/service/MonthPlanService.java index 15dce4c0..89b9506c 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/MonthPlanService.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/service/MonthPlanService.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.monthPlan; +package com.dbnt.faisp.fpiMgt.monthPlan.service; import com.dbnt.faisp.fpiMgt.monthPlan.mapper.MonthPlanMapper; diff --git a/src/main/java/com/dbnt/faisp/controller/MenuMgtController.java b/src/main/java/com/dbnt/faisp/menuMgt/MenuMgtController.java similarity index 91% rename from src/main/java/com/dbnt/faisp/controller/MenuMgtController.java rename to src/main/java/com/dbnt/faisp/menuMgt/MenuMgtController.java index 81a3ed9a..4d5f14ea 100644 --- a/src/main/java/com/dbnt/faisp/controller/MenuMgtController.java +++ b/src/main/java/com/dbnt/faisp/menuMgt/MenuMgtController.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.controller; +package com.dbnt.faisp.menuMgt; -import com.dbnt.faisp.codeMgt.CodeMgtService; -import com.dbnt.faisp.menuMgt.MenuMgtService; +import com.dbnt.faisp.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.menuMgt.service.MenuMgtService; import com.dbnt.faisp.menuMgt.model.MenuMgt; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/dbnt/faisp/menuMgt/MenuMgtService.java b/src/main/java/com/dbnt/faisp/menuMgt/service/MenuMgtService.java similarity index 99% rename from src/main/java/com/dbnt/faisp/menuMgt/MenuMgtService.java rename to src/main/java/com/dbnt/faisp/menuMgt/service/MenuMgtService.java index 9cd4c5af..3a6ee419 100644 --- a/src/main/java/com/dbnt/faisp/menuMgt/MenuMgtService.java +++ b/src/main/java/com/dbnt/faisp/menuMgt/service/MenuMgtService.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.menuMgt; +package com.dbnt.faisp.menuMgt.service; import com.dbnt.faisp.menuMgt.mapper.MenuMgtMapper; import com.dbnt.faisp.menuMgt.model.MenuMgt; diff --git a/src/main/java/com/dbnt/faisp/controller/OrganConfigController.java b/src/main/java/com/dbnt/faisp/organMgt/OrganConfigController.java similarity index 93% rename from src/main/java/com/dbnt/faisp/controller/OrganConfigController.java rename to src/main/java/com/dbnt/faisp/organMgt/OrganConfigController.java index 73e9cc94..68f133a0 100644 --- a/src/main/java/com/dbnt/faisp/controller/OrganConfigController.java +++ b/src/main/java/com/dbnt/faisp/organMgt/OrganConfigController.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.controller; +package com.dbnt.faisp.organMgt; -import com.dbnt.faisp.codeMgt.CodeMgtService; +import com.dbnt.faisp.codeMgt.service.CodeMgtService; import com.dbnt.faisp.codeMgt.model.CodeMgt; -import com.dbnt.faisp.organMgt.OrganConfigService; +import com.dbnt.faisp.organMgt.service.OrganConfigService; import com.dbnt.faisp.organMgt.model.OrganConfig; import com.dbnt.faisp.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/organMgt/OrganConfigService.java b/src/main/java/com/dbnt/faisp/organMgt/service/OrganConfigService.java similarity index 95% rename from src/main/java/com/dbnt/faisp/organMgt/OrganConfigService.java rename to src/main/java/com/dbnt/faisp/organMgt/service/OrganConfigService.java index c3a06497..fcfcf4d8 100644 --- a/src/main/java/com/dbnt/faisp/organMgt/OrganConfigService.java +++ b/src/main/java/com/dbnt/faisp/organMgt/service/OrganConfigService.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.organMgt; +package com.dbnt.faisp.organMgt.service; import com.dbnt.faisp.organMgt.mapper.OrganConfigMapper; import com.dbnt.faisp.organMgt.model.OrganConfig; diff --git a/src/main/java/com/dbnt/faisp/controller/TranslatorController.java b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java similarity index 87% rename from src/main/java/com/dbnt/faisp/controller/TranslatorController.java rename to src/main/java/com/dbnt/faisp/translator/TranslatorController.java index 11976aaf..cba00566 100644 --- a/src/main/java/com/dbnt/faisp/controller/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java @@ -1,18 +1,15 @@ -package com.dbnt.faisp.controller; +package com.dbnt.faisp.translator; -import com.dbnt.faisp.authMgt.AuthMgtService; -import com.dbnt.faisp.codeMgt.CodeMgtService; -import com.dbnt.faisp.menuMgt.MenuMgtService; -import com.dbnt.faisp.menuMgt.model.MenuMgt; -import com.dbnt.faisp.organMgt.OrganConfigService; -import com.dbnt.faisp.translator.TranslatorService; +import com.dbnt.faisp.authMgt.service.AuthMgtService; +import com.dbnt.faisp.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.menuMgt.service.MenuMgtService; +import com.dbnt.faisp.organMgt.service.OrganConfigService; import com.dbnt.faisp.translator.model.Translator; -import com.dbnt.faisp.userInfo.UserInfoService; +import com.dbnt.faisp.translator.service.TranslatorService; +import com.dbnt.faisp.userInfo.service.UserInfoService; import com.dbnt.faisp.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; -import java.util.List; - import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; diff --git a/src/main/java/com/dbnt/faisp/translator/TranslatorService.java b/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java similarity index 98% rename from src/main/java/com/dbnt/faisp/translator/TranslatorService.java rename to src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java index 27ebdae0..a8b66d19 100644 --- a/src/main/java/com/dbnt/faisp/translator/TranslatorService.java +++ b/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.translator; +package com.dbnt.faisp.translator.service; import com.dbnt.faisp.menuMgt.mapper.MenuMgtMapper; import com.dbnt.faisp.menuMgt.model.MenuMgt; diff --git a/src/main/java/com/dbnt/faisp/controller/UserInfoController.java b/src/main/java/com/dbnt/faisp/userInfo/UserInfoController.java similarity index 86% rename from src/main/java/com/dbnt/faisp/controller/UserInfoController.java rename to src/main/java/com/dbnt/faisp/userInfo/UserInfoController.java index 68a662ab..b55e9cc6 100644 --- a/src/main/java/com/dbnt/faisp/controller/UserInfoController.java +++ b/src/main/java/com/dbnt/faisp/userInfo/UserInfoController.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.controller; +package com.dbnt.faisp.userInfo; import com.dbnt.faisp.userInfo.model.UserInfo; -import com.dbnt.faisp.userInfo.UserInfoService; +import com.dbnt.faisp.userInfo.service.UserInfoService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/dbnt/faisp/userInfo/UserInfoService.java b/src/main/java/com/dbnt/faisp/userInfo/service/UserInfoService.java similarity index 98% rename from src/main/java/com/dbnt/faisp/userInfo/UserInfoService.java rename to src/main/java/com/dbnt/faisp/userInfo/service/UserInfoService.java index 3da40c8a..286b80b4 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/UserInfoService.java +++ b/src/main/java/com/dbnt/faisp/userInfo/service/UserInfoService.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.userInfo; +package com.dbnt.faisp.userInfo.service; import com.dbnt.faisp.config.Role; import com.dbnt.faisp.userInfo.mapper.UserInfoMapper; diff --git a/src/main/java/com/dbnt/faisp/controller/userMgtController.java b/src/main/java/com/dbnt/faisp/userInfo/userMgtController.java similarity index 89% rename from src/main/java/com/dbnt/faisp/controller/userMgtController.java rename to src/main/java/com/dbnt/faisp/userInfo/userMgtController.java index 324c79b2..b7789d8d 100644 --- a/src/main/java/com/dbnt/faisp/controller/userMgtController.java +++ b/src/main/java/com/dbnt/faisp/userInfo/userMgtController.java @@ -1,10 +1,9 @@ -package com.dbnt.faisp.controller; +package com.dbnt.faisp.userInfo; -import com.dbnt.faisp.authMgt.AuthMgtService; -import com.dbnt.faisp.codeMgt.CodeMgtService; -import com.dbnt.faisp.menuMgt.MenuMgtService; -import com.dbnt.faisp.menuMgt.model.MenuMgt; -import com.dbnt.faisp.userInfo.UserInfoService; +import com.dbnt.faisp.authMgt.service.AuthMgtService; +import com.dbnt.faisp.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.menuMgt.service.MenuMgtService; +import com.dbnt.faisp.userInfo.service.UserInfoService; import com.dbnt.faisp.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; @@ -37,7 +36,7 @@ public class userMgtController { mav.addObject("searchParams", userInfo); return mav; } - + @GetMapping("/userEditModal") public ModelAndView menuEditModal(UserInfo userInfo){ ModelAndView mav = new ModelAndView("adminPage/userMgt/userEditModal"); diff --git a/src/main/resources/static/js/igActivities/fpiMgt/monthPlan.js b/src/main/resources/static/js/igActivities/fpiMgt/monthPlan.js index 86bea80a..dab4e092 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/monthPlan.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/monthPlan.js @@ -1,23 +1,27 @@ $(document).on('click', '#addPlanBtn', function (){ + getEditModal(null) +}) + +$(document).on('click', '.planTr', function (){ $.ajax({ - url: '/fpiMgt/planEditModal', - data: {planKey: null}, + url: '/fpiMgt/planViewModal', + data: {planKey: Number($(this).find(".planKey").val())}, type: 'GET', dataType:"html", success: function(html){ - $("#planEditBody").empty().append(html) - $("#planEditModal").modal('show'); - $("#planDt").datepicker({ - format: "yyyy-mm-dd", - language: "ko" - }); + $("#planViewBody").empty().append(html) + $("#planViewModal").modal('show'); }, error:function(){ } }); }) +$(document).on('click', '#editPlanBtn', function (){ + $("#planViewModal").modal('hide'); + getEditModal(Number($("#planViewBody").find("[name='planKey']").val())); +}) $(document).on('click', '#planAddBtn', function (){ $("#planDiv").append("") @@ -48,6 +52,38 @@ $(document).on('click', '#saveTempBtn', function (){ savePlan('T') }) +function getEditModal(planKey){ + $.ajax({ + url: '/fpiMgt/planEditModal', + data: {planKey: planKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#planEditModalContent").empty().append(html) + $("#planEditModal").modal('show'); + $("#planDt").datepicker({ + format: "yyyy-mm-dd", + language: "ko" + }); + $("[name='detailPlanInfos']").summernote({ + lang:'ko-KR', + height: 120, + disableDragAndDrop: true, + toolbar: [ + ['style', ['style']], + ['font', ['bold', 'underline', 'clear']], + ['color', ['color']], + ['para', ['ul', 'ol', 'paragraph']], + ['table', ['table']] + ] + }); + }, + error:function(){ + + } + }); +} + function savePlan(planState){ if(confirm("저장하시겠습니까?")){ $("#planState").val(planState); diff --git a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html b/src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html index 4891206e..6acd770f 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html +++ b/src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html @@ -25,7 +25,7 @@
-
+
@@ -63,7 +63,8 @@ - + + @@ -122,19 +123,25 @@ +