From 029d79b0bd0d464495a33c803aa680f8f38fe7c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Thu, 3 Nov 2022 18:36:08 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A4=91=EA=B0=84=EC=A0=80=EC=9E=A5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FishingBoatController.java | 9 + .../static/js/faStatistics/fishingBoatMgt.js | 11 + .../fishingBoat/fishingBoatEditModal.html | 529 +++++++++++------- 3 files changed, 349 insertions(+), 200 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java index 67cb7f10..1fa6e34c 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java @@ -1,6 +1,7 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.CrackdownStatus; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.ProcessResult; @@ -30,6 +31,7 @@ public class FishingBoatController { private final ViolationRepository violationRepository; private final CrackdownStatusRepository crackdownStatusRepository; private final FishingBoatRepository fishingBoatRepository; + private final CodeMgtService codeMgtService; @RequestMapping("/fishingBoat") public ModelAndView fishingBoat(@AuthenticationPrincipal UserInfo loginUser, FishingBoat fishingBoat) { @@ -90,6 +92,13 @@ public class FishingBoatController { fishingBoat.setWrtUserGrd(loginUser.getTitleCd()); fishingBoat.setWrtDt(LocalDateTime.now()); } + mav.addObject("ataList", codeMgtService.selectCodeMgtList("ATA")); + mav.addObject("cpoList", codeMgtService.selectCodeMgtList("CPO")); + mav.addObject("vtList", codeMgtService.selectCodeMgtList("VT")); + mav.addObject("ftList", codeMgtService.selectCodeMgtList("FT")); + mav.addObject("bmList", codeMgtService.selectCodeMgtList("BM")); + mav.addObject("prList", codeMgtService.selectCodeMgtList("PR")); + mav.addObject("bdtList", codeMgtService.selectCodeMgtList("BDT")); mav.addObject("fishingBoat", fishingBoat); return mav; } diff --git a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js index 09af841b..9743ac85 100644 --- a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js +++ b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js @@ -10,6 +10,17 @@ function getFishingBoatEditModal(fbKey, cdsKey){ dataType:"html", success: function(html){ $("#fishingBoatEditModalContent").empty().append(html) + $(".dateSelector").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + $(".timeSelector").datetimepicker({ + datepicker:false, + format:'H:i', + lang:'kr', + step:20 + }); $("#fishingBoatEditModal").modal('show'); }, error:function(){ diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html index a865ecf3..3f92aa4c 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html @@ -33,124 +33,168 @@
- +
- +
- +
- -
- -
- -
- -
- +
- +
- +
- +
- + +
+ +
+ +
+ +
+
- +
- +
- -
- + +
+
+ + + +
- +
- +
-
+
- +
- -
- - - -
-
-
- -
- -
- -
- -
-
-
- -
- -
- -
- -
-
-
- +
- +
+ + + +
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
사진을 업로드 해주세요. + +
+
+ +
-
+
- - + +
- -
- - - -
-
-
- -
- -
- -
- -
-
-
- -
- -
-
-
- +
- +
+ + + +
+
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
@@ -158,214 +202,299 @@
- -
- - + +
+
+ + +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- -
- - + +
+
+ + +
- -
- - + +
+
+ + +
-
- +
+
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- -
- - - - - + +
+
+ + + + +
+
+
+
- +
- +
- +
- +
+ + +
+
- +
- +
+ + +
+
- +
- +
- +
- +
- +
- +
- -
- -
- -
- + +
+
+ + +
- +
- +
- +
- +
- -
- -
- -
- -
- -
- -
- -
- + +
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
- -
- + +
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
- +
+
+
+
- + +
+ +
+ +
+ +
+
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
-
-
- +
- +
- +
- -
- -
- -
-
-
- -
- - +
+ + +