From 2754938948ae0105cf62b6d7aaa78fa0cb17c3bb Mon Sep 17 00:00:00 2001 From: thkim Date: Sun, 13 Oct 2024 00:28:36 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A7=91=ED=95=A9=EA=B5=90=EC=9C=A1,=20?= =?UTF-8?q?=EB=B0=A9=EB=AC=B8=EA=B5=90=EC=9C=A1=20layout=20=EC=9E=91?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- list.txt | 4 +- .../admins/user/GeneralUserMngController.java | 42 +++++- .../user/home-training-approval-system.jsp | 23 ++++ .../views/admins/user/home-training-index.jsp | 33 ++++- .../webapp/WEB-INF/views/admins/user/left.jsp | 92 +++++++++----- .../user/visit-training-approval-system.jsp | 120 ++++++++++++++++++ src/main/webapp/css/admins/sass/style.scss | 53 +++++++- src/main/webapp/css/admins/style.css | 45 +++++++ src/main/webapp/css/admins/style.css.map | 2 +- 9 files changed, 374 insertions(+), 40 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/admins/user/home-training-approval-system.jsp create mode 100644 src/main/webapp/WEB-INF/views/admins/user/visit-training-approval-system.jsp diff --git a/list.txt b/list.txt index 809df6f..c9ccb44 100644 --- a/list.txt +++ b/list.txt @@ -10,4 +10,6 @@ src\main\webapp\css\admins\style.css src\main\webapp\css\admins\style.css.map src\main\java\geoinfo\admins\user\GeneralUserMngController.java src\main\webapp\WEB-INF\views\admins\user\home-training-index.jsp -src\main\webapp\WEB-INF\views\admins\user\visit-training-index.jsp \ No newline at end of file +src\main\webapp\WEB-INF\views\admins\user\home-training-approval-system.jsp +src\main\webapp\WEB-INF\views\admins\user\visit-training-index.jsp +src\main\webapp\WEB-INF\views\admins\user\visit-training-approval-system.jsp \ No newline at end of file diff --git a/src/main/java/geoinfo/admins/user/GeneralUserMngController.java b/src/main/java/geoinfo/admins/user/GeneralUserMngController.java index f339add..72c2f29 100644 --- a/src/main/java/geoinfo/admins/user/GeneralUserMngController.java +++ b/src/main/java/geoinfo/admins/user/GeneralUserMngController.java @@ -639,7 +639,27 @@ public class GeneralUserMngController { } /** - * 방문교육 화면 + * 집합교육 승인 화면 + * @param params + * @param model + * @param response + * @param request + * @return + * @throws Exception + */ + @RequestMapping(value = "admins/user/home-training-approval-system") + public String homeTrainingApprovalSystem(@RequestParam HashMap params, ModelMap model, HttpServletResponse response, HttpServletRequest request) throws Exception { + + if (!UserInfo.isValidSession(request, response, "admin")) { + return ""; + } + + model.addAttribute("params", params); + return "admins/user/home-training-approval-system"; + } + + /** + * 방문교육 달력 화면 * @param params * @param model * @param response @@ -657,5 +677,25 @@ public class GeneralUserMngController { model.addAttribute("params", params); return "admins/user/visit-training-index"; } + + /** + * 방문교육 승인 화면 + * @param params + * @param model + * @param response + * @param request + * @return + * @throws Exception + */ + @RequestMapping(value = "admins/user/visit-training-approval-system") + public String visitTrainingApprovalSystem(@RequestParam HashMap params, ModelMap model, HttpServletResponse response, HttpServletRequest request) throws Exception { + + if (!UserInfo.isValidSession(request, response, "admin")) { + return ""; + } + + model.addAttribute("params", params); + return "admins/user/visit-training-approval-system"; + } } diff --git a/src/main/webapp/WEB-INF/views/admins/user/home-training-approval-system.jsp b/src/main/webapp/WEB-INF/views/admins/user/home-training-approval-system.jsp new file mode 100644 index 0000000..f1cad31 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/admins/user/home-training-approval-system.jsp @@ -0,0 +1,23 @@ +<%@ 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"%> + + + + + + + + + + + + +

집합교육 - 집합교육 신청 승인

+
+
+ + diff --git a/src/main/webapp/WEB-INF/views/admins/user/home-training-index.jsp b/src/main/webapp/WEB-INF/views/admins/user/home-training-index.jsp index dbfdfc6..dbf9275 100644 --- a/src/main/webapp/WEB-INF/views/admins/user/home-training-index.jsp +++ b/src/main/webapp/WEB-INF/views/admins/user/home-training-index.jsp @@ -12,6 +12,37 @@ @@ -73,7 +104,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/admins/user/left.jsp b/src/main/webapp/WEB-INF/views/admins/user/left.jsp index 4e286aa..79f47a7 100644 --- a/src/main/webapp/WEB-INF/views/admins/user/left.jsp +++ b/src/main/webapp/WEB-INF/views/admins/user/left.jsp @@ -6,6 +6,47 @@ +