From a7bfeed4d0ed72598ba94f740d9b34fc1f1fd2cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 13 Dec 2022 19:37:39 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B5=AD=EC=A0=9C=EB=B2=94=EC=A3=84=20?= =?UTF-8?q?=EA=B2=80=EA=B1=B0=ED=98=84=ED=99=A9=20=EB=AA=A8=EB=8B=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faStatistics/internationalCrimeArrest.js | 805 +++++++++--------- .../internationalCrimeArrestEditModal.html | 287 ++++--- .../internationalCrimeArrestViewModal.html | 143 ++-- 3 files changed, 622 insertions(+), 613 deletions(-) diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js index a34aa989..235c47ff 100644 --- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js +++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js @@ -1,535 +1,530 @@ $(function(){ - $("#dateSelectorDiv").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); - $(".dateSelector").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); + $("#dateSelectorDiv").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + $(".dateSelector").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); }); $(document).on('click', '#icaAddBtn', function () { - getIcaEditModal(null); + getIcaEditModal(null); }); $(document).on('click', '#icaEditBtn', function () { - $("#icaViewModal").modal('hide'); - getIcaEditModal(Number($("#icaViewBody").find("[name='icaKey']").val())); + $("#icaViewModal").modal('hide'); + getIcaEditModal(Number($("#icaViewBody").find("[name='icaKey']").val())); }); $(document).on('click', '#saveIcaBtn', function (){ - saveInternationalCrimeArrest('N') + saveInternationalCrimeArrest('N') }); $(document).on('click', '#saveTempBtn', function (){ - saveInternationalCrimeArrest('Y') + saveInternationalCrimeArrest('Y') }); $(document).on('click', '.tr', function (){ - getIcaViewModal($(this).data('key')); + getIcaViewModal($(this).data('key')); }); $(document).on('change', 'select[name="organ"]', function (){ - departmentDynamicOption('select[name="department"]', $(this).val()); + departmentDynamicOption('select[name="department"]', $(this).val()); }); $(document).on('change', '#crimeType', function (){ - dynamicOption('#violationType', $(this).val()); + dynamicOption('#violationType', $(this).val()); }); $(document).on('change', '#searchCrimeType', function (){ - dynamicOption('#searchViolationType', $(this).val(), '위반유형'); + dynamicOption('#searchViolationType', $(this).val(), '위반유형'); }); $(document).on('change', '#crimeForm', function (){ - $('#crimeFormDiv').next().remove(); - if ($(this).val() != 'CMF001') { - $('#crimeFormDiv').after(''); - } else { - $.each($('.dynamic').children("input[name='spiKey']"), function (idx, item){ - let deleteKey = item.value; - $("#icaEditForm").append(''); - }); - $("#spiDiv").children('.dynamic').remove(); - } + if ($(this).val() !== 'CMF001') { + $("#spiAddBtn").show(); + } else { + $("#spiAddBtn").hide(); + $.each($('.dynamic').children("input[name='spiKey']"), function (idx, item){ + let deleteKey = item.value; + $("#icaEditForm").append(''); + }); + $("#spiDiv").children('.dynamic').remove(); + } }); $(document).on('click', '#spiAddBtn', function (){ - let sex = ''; - commonCode.SEX.forEach(function (item){ - sex += ''; - }); + let sex = ''; + commonCode.SEX.forEach(function (item){ + sex += ''; + }); - let age = ''; - commonCode.AGE.forEach(function (item){ - age += ''; - }) + let age = ''; + commonCode.AGE.forEach(function (item){ + age += ''; + }) - let country = ''; - commonCode.NNY.forEach(function (item){ - country += ''; - }) + let country = ''; + commonCode.NNY.forEach(function (item){ + country += ''; + }) - $("#spiDiv").append( - '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - ); + $("#spiDiv").append( + '
' + + '' + + '
' + + '' + + '
' + + '' + + '
' + + '' + + '
' + + '' + + '
' + + '' + + '
' + + '' + + '
' + ); }); $(document).on('change', '.country', function (){ - if ($(this).val() == 'etc') { - $(this).parent().after( - '
' - + '' - + '
' - ); - } else { - $(this).parent().next().remove(); - } + if ($(this).val() == 'etc') { + $(this).parent().after( + '
' + + '' + + '
' + ); + } else { + $(this).parent().next().remove(); + } }); $(document).on('change', '#processResult', function (){ - if ($(this).val() == 'etc') { - $(this).after( - '
' - + '' - + '
' - ); - } else { - $(this).next().remove(); - } + if ($(this).val() == 'etc') { + $(this).after( + '
' + + '' + + '
' + ); + } else { + $(this).next().remove(); + } }); $(document).on('click', '.spiCancelBtn', function (){ - let deleteKey = $(this).parent().children("input[name='spiKey']").val(); + const deleteKey = $(this).parent().children("input[name='spiKey']").val(); + if(deleteKey !== undefined){ $("#icaEditForm").append(''); - $(this).parent().remove(); + } + $(this).parent().remove(); }); $(document).on('change', '#crimeType', function (){ - $('#smugglingAmountDiv').children().remove(); - $('#crimeNameDiv').children().remove(); - $('#arrestAreaDiv').remove(); + $('#smugglingAmountDiv').children().remove(); + $('#crimeNameDiv').children().remove(); + $('#arrestAreaDiv').remove(); - let smugglingAmount = ''; - commonCode.SG.forEach(function (item){ - smugglingAmount += ''; - }) + let smugglingAmount = ''; + commonCode.SG.forEach(function (item){ + smugglingAmount += ''; + }) - if ($(this).val() == 'CTH2') { - makeArrestAreaDiv('장소'); - $('#smugglingAmountDiv').append( - '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - ); - } else { - $("#crimeNameDiv").append( - '' - + '
' - + '' - + '
' - ); - } + if ($(this).val() == 'CTH2') { + makeArrestAreaDiv('장소'); + $('#smugglingAmountDiv').append( + '' + + '
' + + '' + + '
' + + '' + + '
' + + '' + + '
' + + '' + + '
' + + '' + + '
' + ); + } else { + $("#crimeNameDiv").append( + '
\n' + + ' \n' + + '
\n' + + ' \n' + + '
\n' + + '
' + ); + } }); $(document).on('change', '#violationType', function (){ - $('#spiInfoDiv').remove(); - $('#arrestAreaDiv').remove(); - $('#meansDiv').remove(); - $('.entryVisa').remove(); - $('#violationAmountDiv').remove(); + $('#spiInfoDiv').remove(); + $('#arrestAreaDiv').remove(); + $('#meansDiv').remove(); + $('.entryVisa').remove(); + $('#violationAmountDiv').remove(); - if ($(this).val() == 'CTH101') { - makeSpiInfoDiv('피의자 정보'); - makeArrestAreaDiv('지역'); - makeSeaAreaDiv('밀입국'); - makeMeansDiv('밀입국'); - makePurposeDiv('밀입국'); - makeDestinationDiv('밀입국 출발지(국가)'); - } + if ($(this).val() == 'CTH101') { + makeSpiInfoDiv('피의자 정보'); + makeArrestAreaDiv('지역'); + makeSeaAreaDiv('밀입국'); + makeMeansDiv('밀입국'); + makePurposeDiv('밀입국'); + makeDestinationDiv('밀입국 출발지(국가)'); + } - if ($(this).val() == 'CTH102') { - makeSpiInfoDiv('피의자 정보'); - makeArrestAreaDiv('지역'); - makeSeaAreaDiv('도외이탈'); - makeMeansDiv('도외이탈'); - makePurposeDiv('도외이탈'); - } + if ($(this).val() == 'CTH102') { + makeSpiInfoDiv('피의자 정보'); + makeArrestAreaDiv('지역'); + makeSeaAreaDiv('도외이탈'); + makeMeansDiv('도외이탈'); + makePurposeDiv('도외이탈'); + } - if ($(this).val() == 'CTH103') { - makeSpiInfoDiv('피의자 정보'); - makeArrestAreaDiv('지역'); - makeSeaAreaDiv('밀출국'); - makeMeansDiv('밀출국'); - makePurposeDiv('밀출국'); - makeDestinationDiv('밀출국 행선지(도착예정지)'); - } + if ($(this).val() == 'CTH103') { + makeSpiInfoDiv('피의자 정보'); + makeArrestAreaDiv('지역'); + makeSeaAreaDiv('밀출국'); + makeMeansDiv('밀출국'); + makePurposeDiv('밀출국'); + makeDestinationDiv('밀출국 행선지(도착예정지)'); + } - if ($(this).val() == 'CTH104') { - makeSpiInfoDiv('피의자 정보'); - makeArrestAreaDiv('지역'); - makeSeaAreaDiv('밀항'); - makeMeansDiv('밀항'); - makePurposeDiv('밀항'); - makeDestinationDiv('밀항 행선지(도착예정지)'); - } + if ($(this).val() == 'CTH104') { + makeSpiInfoDiv('피의자 정보'); + makeArrestAreaDiv('지역'); + makeSeaAreaDiv('밀항'); + makeMeansDiv('밀항'); + makePurposeDiv('밀항'); + makeDestinationDiv('밀항 행선지(도착예정지)'); + } - if ($(this).val() == 'CTH105') { - makeSpiInfoDiv('불법체류 및 취업'); - makeEntryVisaDiv(); - } + if ($(this).val() == 'CTH105') { + makeSpiInfoDiv('불법체류 및 취업'); + makeEntryVisaDiv(); + } - if ($(this).val() == 'CTH401') { - makeViolationAmountDiv(); - } + if ($(this).val() == 'CTH401') { + makeViolationAmountDiv(); + } - if ($(this).val() == 'CTH201' || $(this).val() == 'CTH202' || $(this).val() == 'CTH203' || $(this).val() == 'CTH204') { - makeArrestAreaDiv('장소'); - } + if ($(this).val() == 'CTH201' || $(this).val() == 'CTH202' || $(this).val() == 'CTH203' || $(this).val() == 'CTH204') { + makeArrestAreaDiv('장소'); + } }); $(document).on('change', '#smugglingAmount', function (){ - if ($(this).val() == 'etc') { - $(this).parent().append( - '
' - + '' - + '
' - ); - } else { - $(this).next().remove(); - } + if ($(this).val() == 'etc') { + $(this).parent().append( + '
' + + '' + + '
' + ); + } else { + $(this).next().remove(); + } }); $(document).on('change', '#means', function (){ - if ($(this).val() == 'etc') { - $(this).parent().append( - '
' - + '' - + '
' - ); - } else { - $(this).next().remove(); - } + if ($(this).val() == 'etc') { + $(this).parent().append( + '
' + + '' + + '
' + ); + } else { + $(this).next().remove(); + } }); $(document).on('change', '#purpose', function (){ - if ($(this).val() == 'etc') { - $(this).parent().append( - '
' - + '' - + '
' - ); - } else { - $(this).next().remove(); - } + if ($(this).val() == 'etc') { + $(this).parent().append( + '
' + + '' + + '
' + ); + } else { + $(this).next().remove(); + } }); $(function(){ - $("#datePickerDiv").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); + $("#datePickerDiv").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); }); function makeEntryVisaDiv() { - $('#spiWrapper').prepend( - '' - + '
' - + '' - + '
' - ); + $('#spiWrapper').prepend( + '' + + '
' + + '' + + '
' + ); } function makeSpiInfoDiv(name) { - $('#spiParentDiv').after( - '
' - + '' - + '
' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '
' - + '
' - + '
' - ); - $("#stayQualificationDiv").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); + $('#spiParentDiv').after( + '
' + + '' + + '
' + + '
' + + '
' + + '' + + '
' + + '' + + '
' + + '' + + '
' + + '' + + '
' + + '
' + + '
' + + '
' + + '
' + ); + $("#stayQualificationDiv").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); } function makeSeaAreaDiv(name) { - let seaArea = ''; - commonCode.SAA.forEach(function (item){ - seaArea += ''; - }) + let seaArea = ''; + commonCode.SAA.forEach(function (item){ + seaArea += ''; + }) - $('#arrestAreaDiv').append( - '' - + '
' - + '' - + '
' - ); + $('#arrestAreaDiv').append( + '' + + '
' + + '' + + '
' + ); } function makeArrestAreaDiv(name) { - let arrestArea = ''; - commonCode.SAA.forEach(function (item){ - arrestArea += ''; - }) + let arrestArea = ''; + commonCode.SAA.forEach(function (item){ + arrestArea += ''; + }) - $('#spiParentDiv').after( - '
' - + '' - + '
' - + '' - + '
' - + '
' - ); + $('#spiParentDiv').after( + '
' + + '' + + '
' + + '' + + '
' + + '
' + ); } function makeMeansDiv(name, code) { - let means = ''; - if (code == 'CTH101') { - commonCode.MS1.forEach(function (item){ - means += ''; - }) - } else { - commonCode.MS2.forEach(function (item){ - means += ''; - }) - } + let means = ''; + if (code == 'CTH101') { + commonCode.MS1.forEach(function (item){ + means += ''; + }) + } else { + commonCode.MS2.forEach(function (item){ + means += ''; + }) + } - $('#spiParentDiv').after( - '
' - + '' - + '
' - + '' - + '
' - + '
' - ); + $('#spiParentDiv').after( + '
' + + '' + + '
' + + '' + + '
' + + '
' + ); } function makePurposeDiv(name) { - let purpose = ""; - commonCode.PPS.forEach(function (item){ - purpose += ''; - }) + let purpose = ""; + commonCode.PPS.forEach(function (item){ + purpose += ''; + }) - $('#meansDiv').append( - '' - + '
' - + '' - + '
' - ); + $('#meansDiv').append( + '' + + '
' + + '' + + '
' + ); } function makeDestinationDiv(name) { - $('#meansDiv').append( - '' - + '
' - + '' - + '
' - ); + $('#meansDiv').append( + '' + + '
' + + '' + + '
' + ); } function makeViolationAmountDiv() { - $('#spiParentDiv').after( - '
' - + '' - + '
' - + '' - + '
' - + '
' - ); + $('#spiParentDiv').after( + '
' + + '' + + '
' + + '' + + '
' + + '
' + ); } function getIcaViewModal(icaKey){ - $.ajax({ - url: '/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal', - data: {icaKey: icaKey}, - type: 'GET', - dataType:"html", - success: function(html){ - $("#icaViewBody").empty().append(html) - $("#icaViewModal").modal('show'); - }, - error:function(){ + $.ajax({ + url: '/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal', + data: {icaKey: icaKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#icaViewBody").empty().append(html) + $("#icaViewModal").modal('show'); + }, + error:function(){ - } - }); + } + }); } function getIcaEditModal(icaKey){ - $.ajax({ - url: '/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal', - data: { - icaKey: icaKey - }, - type: 'GET', - dataType:"html", - success: function(html){ - $("#icaViewBody").empty(); - $("#icaEditModalContent").empty().append(html); - $("#icaEditModal").modal('show'); - $("#crimeAwarenessDtDiv").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); - $("#caseSentDtDiv").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); - $("[name='caseOverview']").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(){ + $.ajax({ + url: '/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal', + data: { + icaKey: icaKey + }, + type: 'GET', + dataType:"html", + success: function(html){ + $("#icaViewBody").empty(); + $("#icaEditModalContent").empty().append(html); + $("#icaEditModal").modal('show'); + $("#crimeAwarenessDtDiv").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + $("#caseSentDtDiv").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + setEditor('editor', '400'); + }, + error:function(){ - } - }); + } + }); } function saveInternationalCrimeArrest(contentState){ - if(contentCheck()){ - if(confirm("저장하시겠습니까?")){ - $("#contentStatus").val(contentState); - contentFade("in"); - const formData = new FormData($("#icaEditForm")[0]); + if(contentCheck()){ + if(confirm("저장하시겠습니까?")){ + $("#contentStatus").val(contentState); + contentFade("in"); + const formData = new FormData($("#icaEditForm")[0]); - let spiList = []; + let spiList = []; - $(".spi-list").each(function (){ - spiList.push({ - spiKey: $(this).find('input[name="spiKey"]').val() != undefined ? Number($(this).find('input[name="spiKey"]').val()) : null, - sex: $(this).find('select[name="sex"]').val(), - age: $(this).find('select[name="age"]').val(), - country: $(this).find('select[name="country"]').val(), - stayQualification: $(this).find('input[name="stayQualification"]').val() != undefined ? $(this).find('input[name="stayQualification"]').val() : null, - stayPeriodExpiredDt: $(this).find('input[name="stayPeriodExpiredDt"]').val() != undefined ? $(this).find('input[name="stayPeriodExpiredDt"]').val() : null, - countryEtc: $(this).find('input[name="countryEtc"]').val() != undefined ? $(this).find('input[name="countryEtc"]').val() : null - }); - }); + $(".spi-list").each(function (){ + spiList.push({ + spiKey: $(this).find('input[name="spiKey"]').val() != undefined ? Number($(this).find('input[name="spiKey"]').val()) : null, + sex: $(this).find('select[name="sex"]').val(), + age: $(this).find('select[name="age"]').val(), + country: $(this).find('select[name="country"]').val(), + stayQualification: $(this).find('input[name="stayQualification"]').val() != undefined ? $(this).find('input[name="stayQualification"]').val() : null, + stayPeriodExpiredDt: $(this).find('input[name="stayPeriodExpiredDt"]').val() != undefined ? $(this).find('input[name="stayPeriodExpiredDt"]').val() : null, + countryEtc: $(this).find('input[name="countryEtc"]').val() != undefined ? $(this).find('input[name="countryEtc"]').val() : null + }); + }); - for (let i=0; i < spiList.length; i++) { - if (spiList[i].spiKey != null) { - formData.append(`suspectPersonInfoList[${i}].spiKey`, spiList[i].spiKey); - } - formData.append(`suspectPersonInfoList[${i}].sex`, spiList[i].sex); - formData.append(`suspectPersonInfoList[${i}].age`, spiList[i].age); - formData.append(`suspectPersonInfoList[${i}].country`, spiList[i].country); - if (spiList[i].stayQualification != null) { - formData.append(`suspectPersonInfoList[${i}].stayQualification`, spiList[i].stayQualification); - } - if (spiList[i].stayPeriodExpiredDt != null) { - formData.append(`suspectPersonInfoList[${i}].stayPeriodExpiredDt`, spiList[i].stayPeriodExpiredDt); - } - if (spiList[i].countryEtc != null) { - formData.append(`suspectPersonInfoList[${i}].countryEtc`, spiList[i].countryEtc); - } - } - - $.ajax({ - type : 'POST', - data : formData, - url : "/faStatistics/internationalCrimeArrest/saveInternationalCrimeArrest", - processData: false, - contentType: false, - success : function(result) { - alert("저장되었습니다."); - contentFade("out"); - $("#icaEditModal").modal('hide'); - }, - error : function(xhr, status) { - alert("저장에 실패하였습니다.") - contentFade("out"); - } - }) + for (let i=0; i < spiList.length; i++) { + if (spiList[i].spiKey != null) { + formData.append(`suspectPersonInfoList[${i}].spiKey`, spiList[i].spiKey); } + formData.append(`suspectPersonInfoList[${i}].sex`, spiList[i].sex); + formData.append(`suspectPersonInfoList[${i}].age`, spiList[i].age); + formData.append(`suspectPersonInfoList[${i}].country`, spiList[i].country); + if (spiList[i].stayQualification != null) { + formData.append(`suspectPersonInfoList[${i}].stayQualification`, spiList[i].stayQualification); + } + if (spiList[i].stayPeriodExpiredDt != null) { + formData.append(`suspectPersonInfoList[${i}].stayPeriodExpiredDt`, spiList[i].stayPeriodExpiredDt); + } + if (spiList[i].countryEtc != null) { + formData.append(`suspectPersonInfoList[${i}].countryEtc`, spiList[i].countryEtc); + } + } + formData.append("caseOverview", CrossEditor.GetBodyValue()); + $.ajax({ + type : 'POST', + data : formData, + url : "/faStatistics/internationalCrimeArrest/saveInternationalCrimeArrest", + processData: false, + contentType: false, + success : function(result) { + alert("저장되었습니다."); + contentFade("out"); + $("#icaEditModal").modal('hide'); + }, + error : function(xhr, status) { + alert("저장에 실패하였습니다.") + contentFade("out"); + } + }) } + } } function contentCheck(){ - let flag = true; + let flag = true; - return flag; + return flag; } $(document).on('click', '#icaExcelDownBtn', function (){ - const formData = $("#icaSearchForm").serialize(); - location.href = '/faStatistics/internationalCrimeArrest/ExcelDown?'+formData; + const formData = $("#icaSearchForm").serialize(); + location.href = '/faStatistics/internationalCrimeArrest/ExcelDown?'+formData; }); diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html index 616c3721..129a6458 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html @@ -15,7 +15,7 @@
- +
@@ -43,14 +43,9 @@
-
- -
- -
-
-
+
+
-
-
- - -
- - -
- -
- -
- -
- -
- -
- -
- -
-
- -
- -
- -
- -
- -
- -
-
-
- -
- -
- - - -
-
- -
- -
- -
- -
- -
- -
- -
- -
+
+
+ +
+
- - - -
- - -
- -
- -
- -
- -
- -
- -
- -
- - - - -
- - +
@@ -300,6 +171,143 @@
+
+ + +
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ + + +
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + + + +
+ + +
+
+
+
@@ -329,7 +337,8 @@
- +
+
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html index 7ce9dd46..df4db2d9 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html @@ -22,7 +22,7 @@
- @@ -33,7 +33,7 @@
- @@ -42,19 +42,12 @@
- -
- -
- -
-
-
+
-
- @@ -119,7 +121,7 @@
- @@ -129,75 +131,77 @@
-
- -
- -
- -
- -
- -
- -
- -
-
- - - -
+
+
+ +
- - +
- - +
- - + - +
- -
- -
-
- + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + +
@@ -235,7 +239,7 @@
-