From 315b351d14974189145d8a7d4887a637725c657d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Fri, 13 Jan 2023 18:01:55 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=88=EB=B2=95=EC=A1=B0=EC=97=85=EC=99=B8?= =?UTF-8?q?=EA=B5=AD=EC=96=B4=EC=84=A0=20=20-=20=EA=B2=80=EC=83=89?= =?UTF-8?q?=EC=96=91=EC=8B=9D=20=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EB=B0=98=EC=98=81=20=20-=20=EB=93=B1=EB=A1=9D=EC=96=91?= =?UTF-8?q?=EC=8B=9D=20=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20=EB=B0=98?= =?UTF-8?q?=EC=98=81=20=EC=B7=A8=EC=95=BD=EC=A7=80=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81=20?= =?UTF-8?q?=EA=B5=AD=EC=A0=9C=EB=B2=94=EC=A3=84=ED=86=B5=EA=B3=84=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crackdownStatus/CrackdownStatus.java | 365 +++++++++--------- .../model/fishingBoat/FishingBoat.java | 3 + .../fishingBoat/FishingBoatBaseEntity.java | 2 - .../model/processResult/ProcessResult.java | 74 ++-- .../crackdownsStatus/model/sailor/Sailor.java | 65 ++-- src/main/resources/static/css/common.css | 3 + src/main/resources/static/js/common.js | 14 +- .../static/js/faStatistics/fishingBoatMgt.js | 38 +- .../faStatistics/internationalCrimeArrest.js | 13 +- .../fishingBoat/fishingBoatEditModal.html | 186 ++++----- .../fishingBoat/fishingBoatMgt.html | 30 +- .../fishingBoat/fishingBoatViewModal.html | 2 +- .../internationalCrimeArrestEditModal.html | 13 +- .../internationalCrimeArrestViewModal.html | 15 +- .../templates/fipTarget/vulnerableList.html | 5 +- 15 files changed, 447 insertions(+), 381 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java index 7a488afe..b849c48f 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java @@ -26,194 +26,197 @@ import java.util.List; @Table(name = "crackdown_status") public class CrackdownStatus extends CrackdownStatusBaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "cds_key") - private Integer cdsKey; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "cds_key") + private Integer cdsKey; - @Transient - private List violationList; - @Transient - private FishingBoat fishingBoat; - @Transient - private List fishingBoatVersionList; - @Transient - private ProcessResult processResult; - @Transient - private List sailorList; + @Column(name="status") + private String status; - @Transient - private String crackdownPoliceEtc; - @Transient - private String crackdownBoatEtc; + @Transient + private List violationList; + @Transient + private FishingBoat fishingBoat; + @Transient + private List fishingBoatVersionList; + @Transient + private ProcessResult processResult; + @Transient + private List sailorList; - @Transient - private Integer fbKey; - @Transient - private String boatNameKr; - @Transient - private String fisheryType; - @Transient - private String boatNnySung; - @Transient - private String boatMaterial; - @Transient - private String boatNnySi; - @Transient - private Double tonCnt; - @Transient - private String boat_material; - @Transient - private String violationStr; + @Transient + private String crackdownPoliceEtc; + @Transient + private String crackdownBoatEtc; + + @Transient + private Integer fbKey; + @Transient + private String boatNameKr; + @Transient + private String fisheryType; + @Transient + private String boatNnySung; + @Transient + private String boatMaterial; + @Transient + private String boatNnySi; + @Transient + private Double tonCnt; + @Transient + private String boat_material; + @Transient + private String violationStr; - @Transient - private String sailorNameKr; + @Transient + private String sailorNameKr; - @Transient - private String processStatus; + @Transient + private String processStatus; - @Transient - private Integer restrictionCaptin; - @Transient - private Integer notRestrictionCaptin; - @Transient - private Integer restrictionMate; - @Transient - private Integer notRestrictionMate; - @Transient - private Integer restrictionWarden; - @Transient - private Integer notRestrictionWarden; - @Transient - private Integer restrictionSailor; - @Transient - private Integer notRestrictionSailor; - @Transient - private Integer restrictionTotal; - @Transient - private Integer notRestrictionTotal; - @Transient - private Integer unlicensedOperationTotal; - @Transient - private Integer specificImpossibilityTotal; - @Transient - private Integer eezTotal; - @Transient - private Integer invasionTerritorialWatersTotal; - @Transient - private List violationDeleteKeyList; - @Transient - private List sailorDeleteKeyList; + @Transient + private Integer restrictionCaptin; + @Transient + private Integer notRestrictionCaptin; + @Transient + private Integer restrictionMate; + @Transient + private Integer notRestrictionMate; + @Transient + private Integer restrictionWarden; + @Transient + private Integer notRestrictionWarden; + @Transient + private Integer restrictionSailor; + @Transient + private Integer notRestrictionSailor; + @Transient + private Integer restrictionTotal; + @Transient + private Integer notRestrictionTotal; + @Transient + private Integer unlicensedOperationTotal; + @Transient + private Integer specificImpossibilityTotal; + @Transient + private Integer eezTotal; + @Transient + private Integer invasionTerritorialWatersTotal; + @Transient + private List violationDeleteKeyList; + @Transient + private List sailorDeleteKeyList; - @Transient - private String year; - @Transient - private String month; - @Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate napoDate; - @Transient - private String violation; - @Transient - private Integer tonStartCnt; - @Transient - private Integer tonEndCnt; - @Transient - private String catchFishSpecies; - @Transient - private String catchCnt; - @Transient - private String offenseFishSpecies; - @Transient - private String offenseCatchCnt; - @Transient - private String offenseIllegalWasteQuantity; - @Transient - private String offenseQuantity; - @Transient - private String offenseAmount; - @Transient - private String damboPayment; - @Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate paymentPaymentDate; - @Transient - private Integer damboUnpaidAmount; - @Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate consignmentStartDate; - @Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate consignmentEndDate; - /*@Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate evictionDt;*/ - @Transient - private String isEvictionDt; - /*@Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate returnDt;*/ - @Transient - private String isReturnDt; - /*@Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate confiscationDt;*/ - @Transient - private String isConfiscationDt; - @Transient - private String isConsignmentStartDt; - @Transient - private String isDamboUnpaidAmount; - @Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate boatDisposalDate; - @Transient - private String boatDisposalType; - @Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate directHandoverDate; - @Transient - private String isDirectHandoverDt; - @Transient - private String handoverSeaPointLat; - @Transient - private String handoverSeaPointLon; - @Transient - private String handoverSeaPointDetail; - @Transient - private String handoverBoat; - @Transient - private String middleTakeoverBoat; - @Transient - private String captin; - @Transient - private String mate; - @Transient - private String warden; - @Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate fieldIvsgtNapoDate; - @Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate fieldIvsgtReleaseDate; - @Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate pressurizedStartDate; - @Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate pressurizedEndDate; - @Transient - private String distance; - @Transient - private String confiscationFrame; - @Transient - private String confiscationWidth; - @Transient - private String confiscationJo; - @Transient - private String confiscationGae; - @Transient - private String confiscationEtc; + @Transient + private String year; + @Transient + private String month; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate napoDate; + @Transient + private String violation; + @Transient + private Integer tonStartCnt; + @Transient + private Integer tonEndCnt; + @Transient + private String catchFishSpecies; + @Transient + private String catchCnt; + @Transient + private String offenseFishSpecies; + @Transient + private String offenseCatchCnt; + @Transient + private String offenseIllegalWasteQuantity; + @Transient + private String offenseQuantity; + @Transient + private String offenseAmount; + @Transient + private String damboPayment; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate paymentPaymentDate; + @Transient + private Integer damboUnpaidAmount; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate consignmentStartDate; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate consignmentEndDate; + /*@Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate evictionDt;*/ + @Transient + private String isEvictionDt; + /*@Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate returnDt;*/ + @Transient + private String isReturnDt; + /*@Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate confiscationDt;*/ + @Transient + private String isConfiscationDt; + @Transient + private String isConsignmentStartDt; + @Transient + private String isDamboUnpaidAmount; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate boatDisposalDate; + @Transient + private String boatDisposalType; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate directHandoverDate; + @Transient + private String isDirectHandoverDt; + @Transient + private String handoverSeaPointLat; + @Transient + private String handoverSeaPointLon; + @Transient + private String handoverSeaPointDetail; + @Transient + private String handoverBoat; + @Transient + private String middleTakeoverBoat; + @Transient + private String captin; + @Transient + private String mate; + @Transient + private String warden; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate fieldIvsgtNapoDate; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate fieldIvsgtReleaseDate; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate pressurizedStartDate; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate pressurizedEndDate; + @Transient + private String distance; + @Transient + private String confiscationFrame; + @Transient + private String confiscationWidth; + @Transient + private String confiscationJo; + @Transient + private String confiscationGae; + @Transient + private String confiscationEtc; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoat.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoat.java index a5d0e271..15671933 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoat.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoat.java @@ -22,6 +22,9 @@ public class FishingBoat extends FishingBoatBaseEntity { @Column(name = "fb_key") private Integer fbKey; + @Column(name="status") + private String status; + @Transient private String year; @Transient diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java index 4a2cebbe..2fcd612a 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java @@ -72,8 +72,6 @@ public class FishingBoatBaseEntity extends BaseModel { private String offenseFishSpecies; @Column(name = "offense_catch_cnt") private Integer offenseCatchCnt=0; - @Column(name = "status") - private String status; @Column(name = "wrt_organ") private String wrtOrgan; @Column(name = "wrt_part") diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java index a2478472..6247b336 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java @@ -23,42 +23,46 @@ import java.util.List; @Table(name = "process_result") public class ProcessResult extends ProcessResultBaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "pr_key") - private Integer prKey; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "pr_key") + private Integer prKey; - @Column(name = "cds_key") - private Integer cdsKey; - @Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDateTime updDt; - @Transient - private CrackdownStatus crackdownStatus; - @Transient - private List violationList; - @Transient - private FishingBoat fishingBoat; - @Transient - private String boatNameKr; + @Column(name = "cds_key") + private Integer cdsKey; - @Transient - private Integer fbKey; - @Transient - private String processStatusEtc; - @Transient - private String executionDetailEtc; - @Transient - private List crackdownStatusList; - @Transient - private List fishingBoatList; + @Column(name="status") + private String status; - @Transient - private String caseNum; - @Transient - private String crackdownPolice; - @Transient - private String year; - @Transient - private String violation; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDateTime updDt; + @Transient + private CrackdownStatus crackdownStatus; + @Transient + private List violationList; + @Transient + private FishingBoat fishingBoat; + @Transient + private String boatNameKr; + + @Transient + private Integer fbKey; + @Transient + private String processStatusEtc; + @Transient + private String executionDetailEtc; + @Transient + private List crackdownStatusList; + @Transient + private List fishingBoatList; + + @Transient + private String caseNum; + @Transient + private String crackdownPolice; + @Transient + private String year; + @Transient + private String violation; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java index 12643742..e85fc38c 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java @@ -25,39 +25,42 @@ import java.util.List; @Table(name = "sailor") public class Sailor extends SailorBaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "sailor_key") - private Integer sailorKey; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "sailor_key") + private Integer sailorKey; - @Column(name = "fb_key") - private Integer fbKey; + @Column(name = "fb_key") + private Integer fbKey; - @Transient - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDateTime updDt; - @Transient - private Integer cdsKey; - @Transient - private CrackdownStatus crackdownStatus; - @Transient - private FishingBoat fishingBoat; - @Transient - private List fishingBoatList; - @Transient - private List violationList; + @Column(name = "status") + private String status; - @Transient - private String year; - @Transient - private String crackdownPolice; - @Transient - private String crackdownBoat; - @Transient - private String boatNameKr; - @Transient - private LocalDateTime napoDt; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDateTime updDt; + @Transient + private Integer cdsKey; + @Transient + private CrackdownStatus crackdownStatus; + @Transient + private FishingBoat fishingBoat; + @Transient + private List fishingBoatList; + @Transient + private List violationList; - @Transient - private List fileList; + @Transient + private String year; + @Transient + private String crackdownPolice; + @Transient + private String crackdownBoat; + @Transient + private String boatNameKr; + @Transient + private LocalDateTime napoDt; + + @Transient + private List fileList; } diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 47de7df9..f850877f 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -84,6 +84,9 @@ .w-35{ width:35%!important; } +.w-70{ + width:70%!important; +} .w-100p{ width: 100px; } diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js index 1f5ac810..db2d3838 100644 --- a/src/main/resources/static/js/common.js +++ b/src/main/resources/static/js/common.js @@ -329,12 +329,14 @@ function OnInitCompleted(e){ } function ajaxErrorAction(e){ - if(e.responseText.includes("로그인이 해제되었습니다.")){ - alert("로그인이 해제되었습니다.") - location.href="/"; - }else if(e.responseText.includes("접근이 거부되었습니다.")){ - alert("접근이 거부되었습니다.") - location.href="/"; + if(e.responseText !== undefined){ + if(e.responseText.includes("로그인이 해제되었습니다.")){ + alert("로그인이 해제되었습니다.") + location.href="/"; + }else if(e.responseText.includes("접근이 거부되었습니다.")){ + alert("접근이 거부되었습니다.") + location.href="/"; + } } } \ No newline at end of file diff --git a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js index bd8e5aeb..836539c7 100644 --- a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js +++ b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js @@ -22,6 +22,12 @@ $(document).on('change', '#searchFormPolice', function (){ searchFormBoat.attr("disabled", "disabled") } }) +$(document).on('click', "#violationInput", function (){ + $("#violationSelectDiv").show(); +}) +$(document).on('mouseleave', "#violationSelectDiv", function (){ + $("#violationSelectDiv").hide(); +}) $(document).on('click', '#getFishingBoatEditModalBtn', function (){ getFishingBoatEditModal(null); }) @@ -107,6 +113,13 @@ $(document).on('click', '.violationRemoveBtn', function (){ $(document).on('change', '.boatNameKr', function (){ $(".boatNameKr").val(this.value); }) +$(document).on('change', '.oxSelector', function (){ + childInputStateChange(Number(this.value), $(this).parent().find("input,select").slice(1)); +}) +$(document).on('change', '#directHandoverSelector', function (){ + childInputStateChange(Number(this.value), $("#directHandoverDiv").find("input")) +}) + $(document).on('change', '#equalCaptain', function (){ if(this.checked){ $.each($("#captainDiv :input"), function (idx, input){ @@ -131,7 +144,6 @@ $(document).on('click', '#sailorAddBtn', function (){ ' \n' + ' \n' + ' \n' + @@ -152,6 +164,9 @@ $(document).on('click', '.saveEditInfoBtn', function (){ $(document).on('change', '#napoDate, #napoTime', function (){ $("#napoDt").val($("#napoDate").val()+" "+$("#napoTime").val()); }) +$(document).on('change', '#paymentPaymentDate, #paymentPaymentTime', function (){ + $("#paymentPaymentDt").val($("#paymentPaymentDate").val()+" "+$("#paymentPaymentTime").val()); +}) $(document).on('change', '.pressurizedTimeTaken', function (){ $("#pressurizedTimeTaken").val($("#pressurizedTimeTakenDate").val()+"일 "+$("#pressurizedTimeTakenTime").val()) }) @@ -187,17 +202,6 @@ function getFishingBoatEditModal(cdsKey){ language: "ko", autoclose: true }); - $(".dateTimeSelector").datetimepicker({ - format:'Y-m-d H:i', - lang:'kr', - step:20 - }); - $(".timeSelector").datetimepicker({ - datepicker:false, - format:'H시간i분', - lang:'kr', - step:20 - }); const crackdownPolice = $("#crackdownPolice").val() if(crackdownPolice){ getCrackdownBoatOption(crackdownPolice) @@ -254,6 +258,16 @@ function getCrackdownBoatOption(categoryCd){ }); } +function childInputStateChange(selectorValue, inputs){ + switch (selectorValue){ + case 1: + inputs.val('').attr('disabled', 'disabled') + break; + case 2: + inputs.removeAttr('disabled') + break; + } +} function saveFishingBoatInfo(status){ if(confirm("저장하시겠습니까?")){ $("#status").val(status) diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js index bea952d5..d0005578 100644 --- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js +++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js @@ -116,14 +116,11 @@ $(document).on('change', '.country', function (){ }); $(document).on('change', '#processResult', function (){ - if ($(this).val() == 'etc') { - $(this).after( - '
' - + '' - + '
' - ); + if ($(this).val() === 'etc') { + $("[name=\"processResultEtc\"]").val('') + $("#processResultEtcDiv").show(); } else { - $(this).next().remove(); + $("#processResultEtcDiv").hide(); } }); @@ -158,7 +155,7 @@ $(document).on('change', '#crimeType', function (){ + '' + '' + '' - + '' + + '' + '
' + '' + '
' diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html index 09e16af6..9acbc44f 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html @@ -46,11 +46,11 @@
- +
@@ -403,8 +403,12 @@
- - + + +
@@ -430,28 +434,35 @@
- +
- +
- - + +
-
-
- - - - +
+
+ + + + + +
-
- -
@@ -470,7 +481,7 @@
- +
@@ -480,7 +491,7 @@
- +
@@ -499,27 +510,42 @@
-
- -
- -
- -
-
- - + +
+ +
+
- -
- +
+ +
+ +
+ +
+
+ + +
+
+ +
+ +
+ +
+ +
- -
- -
-
+
+
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html index 55611862..3b2fb5a7 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html @@ -182,7 +182,7 @@
- +
@@ -321,11 +321,12 @@ - -
- -
- +
+ +
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html index 2abe81cf..101749b3 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html @@ -69,7 +69,7 @@
- +
@@ -295,13 +295,16 @@ - -
- -
- + +
+ +
+ +
+
+
diff --git a/src/main/resources/templates/fipTarget/vulnerableList.html b/src/main/resources/templates/fipTarget/vulnerableList.html index 68e53c54..10903828 100644 --- a/src/main/resources/templates/fipTarget/vulnerableList.html +++ b/src/main/resources/templates/fipTarget/vulnerableList.html @@ -39,9 +39,10 @@ - + - +