From b2f516ce1ee9917808274d28ee6857aaff59fcf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 5 Apr 2023 18:11:24 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=ED=86=B5=EA=B3=84=20?= =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=8B=A4=EC=A0=81=ED=83=AD=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dbnt/faisp/config/FaispInterceptor.java | 23 ++- .../com/dbnt/faisp/config/WebMvcConfig.java | 1 + .../main/fpiMgt/affair/AffairController.java | 140 +++++++++--------- .../fpiMgt/affair/mapper/AffairMapper.java | 8 +- .../fpiMgt/affair/model/TypeStatistics.java | 9 -- .../fpiMgt/affair/service/AffairService.java | 62 ++++---- .../faisp/main/userInfo/model/UserInfo.java | 2 +- .../resources/mybatisMapper/AffairMapper.xml | 8 +- src/main/resources/static/css/common.css | 2 +- .../resources/static/css/login/login2.css | 2 +- .../static/js/igActivities/statistics.js | 94 +++++++----- .../affairStatistics.html | 3 +- .../fieldStatistics.html | 3 + .../fpiMgt/statistics/personalStatistics.html | 22 +++ .../ratingStatistics.html | 3 + src/main/resources/templates/user/myInfo.html | 4 +- 16 files changed, 216 insertions(+), 170 deletions(-) rename src/main/resources/templates/igActivities/fpiMgt/{affair => statistics}/affairStatistics.html (97%) rename src/main/resources/templates/igActivities/fpiMgt/{affair => statistics}/fieldStatistics.html (96%) create mode 100644 src/main/resources/templates/igActivities/fpiMgt/statistics/personalStatistics.html rename src/main/resources/templates/igActivities/fpiMgt/{affair => statistics}/ratingStatistics.html (94%) diff --git a/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java b/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java index 00f0ad81..b5fbdc30 100644 --- a/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java +++ b/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java @@ -41,18 +41,15 @@ public class FaispInterceptor implements HandlerInterceptor { @Override public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { //페이지 렌더링 후 실행. - if(request.getParameter("dashboardFlag") == null){ - // 대시보드 ajax 조회 로그 저장시 키 중첩으로 오류 발생. - // 대시보드 ajax 조회는 로그를 쌓지 않음. - UserRequestLog log = new UserRequestLog(); - log.setContactIp(Utils.getClientIP(request)); - log.setRequestUrl(request.getRequestURI()); - log.setRequestMethod(request.getMethod()); - log.setSearchParams(request.getQueryString()); - log.setHandlerDescription(((HandlerMethod) handler).toString()); - log.setUserOrgan((String) request.getSession().getAttribute("userOrgan")); - log.setUserBelong((String) request.getSession().getAttribute("belongValue")); - userLogService.saveRequestLog(log); - } + String uri = request.getRequestURI(); + UserRequestLog log = new UserRequestLog(); + log.setContactIp(Utils.getClientIP(request)); + log.setRequestUrl(uri); + log.setRequestMethod(request.getMethod()); + log.setSearchParams(request.getQueryString()); + log.setHandlerDescription(((HandlerMethod) handler).toString()); + log.setUserOrgan((String) request.getSession().getAttribute("userOrgan")); + log.setUserBelong((String) request.getSession().getAttribute("belongValue")); + userLogService.saveRequestLog(log); } } diff --git a/src/main/java/com/dbnt/faisp/config/WebMvcConfig.java b/src/main/java/com/dbnt/faisp/config/WebMvcConfig.java index 74e0fc7b..41dedee3 100644 --- a/src/main/java/com/dbnt/faisp/config/WebMvcConfig.java +++ b/src/main/java/com/dbnt/faisp/config/WebMvcConfig.java @@ -22,6 +22,7 @@ public class WebMvcConfig implements WebMvcConfigurer { "/fileDisplay", "/css/**", "/img/**", + "/font/**", "/js/**", "/vendor/**", "/Crosseditor/**", diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java index eb3de57a..19bf9235 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java @@ -1,33 +1,23 @@ package com.dbnt.faisp.main.fpiMgt.affair; -import com.dbnt.faisp.config.FileInfo; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.codeMgt.model.CodeMgt; -import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; -import com.dbnt.faisp.main.fpiMgt.affair.model.AffairFile; import com.dbnt.faisp.main.fpiMgt.affair.model.AffairRating; import com.dbnt.faisp.main.fpiMgt.affair.model.TypeStatistics; import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService; import com.dbnt.faisp.main.organMgt.service.OrganConfigService; import com.dbnt.faisp.main.userInfo.model.UserInfo; -import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import java.io.*; import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; @RestController @RequiredArgsConstructor @@ -184,8 +174,8 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 @PostMapping("/saveAffair") public Integer saveAffair(AffairBoard affairBoard, - MultipartHttpServletRequest request, - @RequestParam(value = "fileSeq", required = false) List deleteFileSeq){ + MultipartHttpServletRequest request, + @RequestParam(value = "fileSeq", required = false) List deleteFileSeq){ affairBoard.setMultipartFileList(request.getMultiFileMap().get("uploadFiles")); return affairService.saveAffairBoard(affairBoard, deleteFileSeq); } @@ -210,44 +200,44 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 @GetMapping("/statistics") public ModelAndView statistics(@AuthenticationPrincipal UserInfo loginUser, TypeStatistics typeStatistics){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/affairStatistics"); + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/statistics/affairStatistics"); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); - mav.addObject("searchParams", typeStatistics); - + mav.addObject("searchParams", typeStatistics); + return mav; } - + @PostMapping("/fieldStatistics") - public ModelAndView fieldStatistics(@AuthenticationPrincipal UserInfo loginUser, TypeStatistics typeStatistics){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/fieldStatistics"); + public ModelAndView fieldStatistics(TypeStatistics typeStatistics){ + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/statistics/fieldStatistics"); List totalList = affairService.selectStatusTotal(typeStatistics); - List type1List = affairService.selecType1ListCnt(typeStatistics); - List type2List = affairService.selecType2ListCnt(typeStatistics); - List type3List = affairService.selecType3ListCnt(typeStatistics); - List type4List = affairService.selecType4ListCnt(typeStatistics); + List type1List = affairService.selectType1ListCnt(typeStatistics); + List type2List = affairService.selectType2ListCnt(typeStatistics); + List type3List = affairService.selectType3ListCnt(typeStatistics); + List type4List = affairService.selectType4ListCnt(typeStatistics); if(!totalList.isEmpty()) { - TypeStatistics total = new TypeStatistics(); - total.setItemValue("누계"); - total.setWrtOrgan("total"); - total.setCnt(0); - for(TypeStatistics stat: totalList) { - total.setCnt(total.getCnt()+stat.getCnt()); - } - totalList.add(total); + TypeStatistics total = new TypeStatistics(); + total.setItemValue("누계"); + total.setWrtOrgan("total"); + total.setCnt(0); + for(TypeStatistics stat: totalList) { + total.setCnt(total.getCnt()+stat.getCnt()); + } + totalList.add(total); } mav.addObject("totalList", totalList); if(typeStatistics.getCategory1() != null) { - type1List = addTotalRow(typeStatistics.getCategory1(), type1List); + addTotalRow(typeStatistics.getCategory1(), type1List); + } + if(typeStatistics.getCategory2() != null) { + addTotalRow(typeStatistics.getCategory2(), type2List); + } + if(typeStatistics.getCategory3() != null) { + addTotalRow(typeStatistics.getCategory3(), type3List); + } + if(typeStatistics.getCategory4() != null) { + addTotalRow(typeStatistics.getCategory4(), type4List); } - if(typeStatistics.getCategory2() != null) { - type2List = addTotalRow(typeStatistics.getCategory2(), type2List); - } - if(typeStatistics.getCategory3() != null) { - type3List = addTotalRow(typeStatistics.getCategory3(), type3List); - } - if(typeStatistics.getCategory4() != null) { - type4List = addTotalRow(typeStatistics.getCategory4(), type4List); - } mav.addObject("type1List", type1List); mav.addObject("type2List", type2List); mav.addObject("type3List", type3List); @@ -255,28 +245,28 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 mav.addObject("searchParams", typeStatistics); return mav; } - + @PostMapping("/ratingStatistics") - public ModelAndView ratingStatistics(@AuthenticationPrincipal UserInfo loginUser, TypeStatistics typeStatistics){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/ratingStatistics"); + public ModelAndView ratingStatistics(TypeStatistics typeStatistics){ + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/statistics/ratingStatistics"); List totalList = affairService.selectRatingStatusTotal(typeStatistics); List sangboCntList = affairService.selectSangboTotal(typeStatistics); List arrCntList = affairService.selectArrCntList(typeStatistics); if(!totalList.isEmpty()) { - TypeStatistics total = new TypeStatistics(); - total.setItemValue("누계"); - total.setWrtOrgan("total"); - total.setCnt(0); - for(TypeStatistics stat: totalList) { - total.setCnt(total.getCnt()+stat.getCnt()); - } - totalList.add(total); + TypeStatistics total = new TypeStatistics(); + total.setItemValue("누계"); + total.setWrtOrgan("total"); + total.setCnt(0); + for(TypeStatistics stat: totalList) { + total.setCnt(total.getCnt()+stat.getCnt()); + } + totalList.add(total); } if(typeStatistics.getSangbo() != null) { - sangboCntList = addTotalRow(typeStatistics.getSangbo(), sangboCntList); + addTotalRow(typeStatistics.getSangbo(), sangboCntList); } if(typeStatistics.getRating() != null) { - arrCntList = addTotalRow(typeStatistics.getRating(), arrCntList); + addTotalRow(typeStatistics.getRating(), arrCntList); } mav.addObject("totalList", totalList); mav.addObject("sangboList", sangboCntList); @@ -285,25 +275,31 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 return mav; } - private List addTotalRow(List type, List typeList){ - Map totalMap = new HashMap<>(); - for(String t: type) { - totalMap.put(t, 0); - } - for(TypeStatistics t: typeList) { - totalMap.put(t.getAffairType(), totalMap.get(t.getAffairType())+t.getCnt()); - } - Iterator keys = totalMap.keySet().iterator(); - while(keys.hasNext()) { - String affairType = keys.next(); - Integer cnt = totalMap.get(affairType); - TypeStatistics total = new TypeStatistics(); - total.setWrtOrgan("total"); - total.setAffairType(affairType); - total.setCnt(cnt); - typeList.add(total); - } - return typeList; + @PostMapping("/personalStatistics") + public ModelAndView personalStatistics(TypeStatistics typeStatistics){ + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/statistics/personalStatistics"); + List totalList = affairService.selectPersonalStatusTotal(typeStatistics); + mav.addObject("totalList", totalList); + mav.addObject("searchParams", typeStatistics); + return mav; + } + + private void addTotalRow(List type, List typeList){ + Map totalMap = new HashMap<>(); + for(String t: type) { + totalMap.put(t, 0); + } + for(TypeStatistics t: typeList) { + totalMap.put(t.getAffairType(), totalMap.get(t.getAffairType())+t.getCnt()); + } + for (String affairType : totalMap.keySet()) { + Integer cnt = totalMap.get(affairType); + TypeStatistics total = new TypeStatistics(); + total.setWrtOrgan("total"); + total.setAffairType(affairType); + total.setCnt(cnt); + typeList.add(total); + } } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java index 10678942..64131124 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java @@ -21,13 +21,13 @@ public interface AffairMapper { List selectStatusTotal(TypeStatistics typeStatistics); - List selecType1ListCnt(TypeStatistics typeStatistics); + List selectType1ListCnt(TypeStatistics typeStatistics); - List selecType2ListCnt(TypeStatistics typeStatistics); + List selectType2ListCnt(TypeStatistics typeStatistics); - List selecType3ListCnt(TypeStatistics typeStatistics); + List selectType3ListCnt(TypeStatistics typeStatistics); - List selecType4ListCnt(TypeStatistics typeStatistics); + List selectType4ListCnt(TypeStatistics typeStatistics); List selectRatingStatusTotal(TypeStatistics typeStatistics); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/TypeStatistics.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/TypeStatistics.java index 8a0dd342..423f5fc6 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/TypeStatistics.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/TypeStatistics.java @@ -39,16 +39,7 @@ public class TypeStatistics extends BaseModel { private List organList; @Transient private List sangbo; -@Override -public String toString() { - return "TypeStatistics [wrtOrgan=" + wrtOrgan + ", itemValue=" + itemValue + ", affairType=" + affairType + ", cnt=" - + cnt + ", rating=" + rating + ", category1=" + category1 + ", category2=" + category2 + ", category3=" - + category3 + ", category4=" + category4 + ", organList=" + organList + "]"; -} - - - } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java index e5149250..3bb1a8d0 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java @@ -294,35 +294,6 @@ public class AffairService extends BaseService { // 견문보고 public List selectAffairFileList(List affairKeyList) { return affairFileRepository.findByAffairKeyIn(affairKeyList); } - - public List selectStatusTotal(TypeStatistics typeStatistics) { - return affairMapper.selectStatusTotal(typeStatistics); - } - - public List selecType1ListCnt(TypeStatistics typeStatistics) { - return affairMapper.selecType1ListCnt(typeStatistics); - } - - public List selecType2ListCnt(TypeStatistics typeStatistics) { - return affairMapper.selecType2ListCnt(typeStatistics); - } - - public List selecType3ListCnt(TypeStatistics typeStatistics) { - return affairMapper.selecType3ListCnt(typeStatistics); - } - - public List selecType4ListCnt(TypeStatistics typeStatistics) { - return affairMapper.selecType4ListCnt(typeStatistics); - } - public List selectRatingStatusTotal(TypeStatistics typeStatistics) { - return affairMapper.selectRatingStatusTotal(typeStatistics); - } - public List selectSangboTotal(TypeStatistics typeStatistics) { - return affairMapper.selectSangboTotal(typeStatistics); - } - public List selectArrCntList(TypeStatistics typeStatistics) { - return affairMapper.selectArrCntList(typeStatistics); - } public AffairBoard getPrintTypeAffairBoard(AffairBoard affair, Map> codeMap) { affair.setWrtPart(Utils.searchCodeValue(affair.getWrtPart(), codeMap.get(affair.getWrtOrgan()))); @@ -382,4 +353,37 @@ public class AffairService extends BaseService { // 견문보고 return affairRating; } + + public List selectStatusTotal(TypeStatistics typeStatistics) { + return affairMapper.selectStatusTotal(typeStatistics); + } + + public List selectType1ListCnt(TypeStatistics typeStatistics) { + return affairMapper.selectType1ListCnt(typeStatistics); + } + + public List selectType2ListCnt(TypeStatistics typeStatistics) { + return affairMapper.selectType2ListCnt(typeStatistics); + } + + public List selectType3ListCnt(TypeStatistics typeStatistics) { + return affairMapper.selectType3ListCnt(typeStatistics); + } + + public List selectType4ListCnt(TypeStatistics typeStatistics) { + return affairMapper.selectType4ListCnt(typeStatistics); + } + public List selectRatingStatusTotal(TypeStatistics typeStatistics) { + return affairMapper.selectRatingStatusTotal(typeStatistics); + } + public List selectSangboTotal(TypeStatistics typeStatistics) { + return affairMapper.selectSangboTotal(typeStatistics); + } + public List selectArrCntList(TypeStatistics typeStatistics) { + return affairMapper.selectArrCntList(typeStatistics); + } + + public List selectPersonalStatusTotal(TypeStatistics typeStatistics) { + return new ArrayList<>(); + } } diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java index b0b28f0b..1f9d3cf5 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java @@ -187,7 +187,7 @@ public class UserInfo extends BaseModel implements UserDetails{ @Override public boolean isEnabled() { - return userStatus.equals("USC003"); + return userStatus.equals("USC003")||userStatus.equals("USC007"); } @Override diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index b1af65f5..6889b175 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -329,7 +329,7 @@ order by wrt_organ asc - select b.item_cd as wrt_organ , b.item_value, a.item_cd as affair_type, @@ -367,7 +367,7 @@ order by wrt_organ,affair_type asc - select b.item_cd as wrt_organ , b.item_value, a.item_cd as affair_type, @@ -405,7 +405,7 @@ order by wrt_organ,affair_type asc - select b.item_cd as wrt_organ , b.item_value, a.item_cd as affair_type, @@ -443,7 +443,7 @@ order by wrt_organ,affair_type asc - select b.item_cd as wrt_organ , b.item_value, a.item_cd as affair_type, diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index f01b046d..30e46536 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -235,7 +235,7 @@ } @font-face { font-family: 'GmarketSansMedium'; - src: url("/img/GmarketSansTTFMedium.ttf"); + src: url("/font/GmarketSansTTFMedium.ttf"); font-weight: normal; font-style: normal; } diff --git a/src/main/resources/static/css/login/login2.css b/src/main/resources/static/css/login/login2.css index 93060528..640ab67b 100644 --- a/src/main/resources/static/css/login/login2.css +++ b/src/main/resources/static/css/login/login2.css @@ -55,7 +55,7 @@ div {margin:0px;padding:0px;box-sizing:border-box;} @font-face { font-family: 'Montserrat-Bold'; - src: url("/font/Montserrat-Bold.ttf"); + src: url("../../font/Montserrat-Bold.ttf"); font-weight: normal; font-style: normal; } diff --git a/src/main/resources/static/js/igActivities/statistics.js b/src/main/resources/static/js/igActivities/statistics.js index a6ba182c..78f41a1c 100644 --- a/src/main/resources/static/js/igActivities/statistics.js +++ b/src/main/resources/static/js/igActivities/statistics.js @@ -22,29 +22,6 @@ $(document).on('click', '#fieldTab', function (){ goFieldStatistics(); }) -function goFieldStatistics(){ - - const formData = new FormData($("#searchFm")[0]); - $.ajax({ - url: '/affair/fieldStatistics', - data: formData, - type: 'POST', - dataType:"html", - contentType: false, - processData: false, - success: function(html){ - $("#statisticsBody").empty().append(html) - $("#statisticsBody").show(); - $(".statisticsMenu").hide(); - - }, - error:function(e){ - - ajaxErrorAction(e); - } - }); -} - $(document).on('click', '#ratingSearch', function (){ if($('input:checkbox[name=rating]:checked').length < 1){ alert("평가항목을 선택해주세요"); @@ -53,15 +30,45 @@ $(document).on('click', '#ratingSearch', function (){ goRatingStatistics(); }) $(document).on('click', '#ratingTab', function (){ - if($('input:checkbox[name=rating]:checked').length < 1){ - alert("평가항목을 선택해주세요"); - return false; - } - goRatingStatistics(); + if($('input:checkbox[name=rating]:checked').length < 1){ + alert("평가항목을 선택해주세요"); + return false; + } + goRatingStatistics(); }) +$(document).on('click', '#personalSearch', function (){ + goPersonalStatistics(); +}) + +$(document).on('click', '#personalTab', function (){ + goPersonalStatistics(); +}) + +function goFieldStatistics(){ + contentFade("in") + const formData = new FormData($("#searchFm")[0]); + $.ajax({ + url: '/affair/fieldStatistics', + data: formData, + type: 'POST', + dataType:"html", + contentType: false, + processData: false, + success: function(html){ + contentFade("out") + $("#statisticsBody").empty().append(html).show(); + $(".statisticsMenu").hide(); + }, + error:function(e){ + contentFade("out") + ajaxErrorAction(e); + } + }); +} + function goRatingStatistics(){ - + contentFade("in") const formData = new FormData($("#searchFm")[0]); $.ajax({ url: '/affair/ratingStatistics', @@ -71,13 +78,34 @@ function goRatingStatistics(){ contentType: false, processData: false, success: function(html){ - $("#statisticsBody").empty().append(html) - $("#statisticsBody").show(); + contentFade("out") + $("#statisticsBody").empty().append(html).show(); $(".statisticsMenu").hide(); - }, error:function(e){ - + contentFade("out") + ajaxErrorAction(e); + } + }); +} + +function goPersonalStatistics(){ + contentFade("in") + const formData = new FormData($("#searchFm")[0]); + $.ajax({ + url: '/affair/personalStatistics', + data: formData, + type: 'GET', + dataType:"html", + contentType: false, + processData: false, + success: function(html){ + contentFade("out") + $("#statisticsBody").empty().append(html).show(); + $(".statisticsMenu").hide(); + }, + error:function(e){ + contentFade("out") ajaxErrorAction(e); } }); diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html b/src/main/resources/templates/igActivities/fpiMgt/statistics/affairStatistics.html similarity index 97% rename from src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html rename to src/main/resources/templates/igActivities/fpiMgt/statistics/affairStatistics.html index 60a10c20..25f62f9e 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html +++ b/src/main/resources/templates/igActivities/fpiMgt/statistics/affairStatistics.html @@ -3,7 +3,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - + @@ -133,6 +133,7 @@
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/fieldStatistics.html b/src/main/resources/templates/igActivities/fpiMgt/statistics/fieldStatistics.html similarity index 96% rename from src/main/resources/templates/igActivities/fpiMgt/affair/fieldStatistics.html rename to src/main/resources/templates/igActivities/fpiMgt/statistics/fieldStatistics.html index f0e78974..af579aea 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/fieldStatistics.html +++ b/src/main/resources/templates/igActivities/fpiMgt/statistics/fieldStatistics.html @@ -5,6 +5,9 @@ +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/statistics/personalStatistics.html b/src/main/resources/templates/igActivities/fpiMgt/statistics/personalStatistics.html new file mode 100644 index 00000000..295e6248 --- /dev/null +++ b/src/main/resources/templates/igActivities/fpiMgt/statistics/personalStatistics.html @@ -0,0 +1,22 @@ + +
+
+
+ + +
+
+
+ +
+
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/ratingStatistics.html b/src/main/resources/templates/igActivities/fpiMgt/statistics/ratingStatistics.html similarity index 94% rename from src/main/resources/templates/igActivities/fpiMgt/affair/ratingStatistics.html rename to src/main/resources/templates/igActivities/fpiMgt/statistics/ratingStatistics.html index 9603deb4..164730f1 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/ratingStatistics.html +++ b/src/main/resources/templates/igActivities/fpiMgt/statistics/ratingStatistics.html @@ -5,6 +5,9 @@ +
diff --git a/src/main/resources/templates/user/myInfo.html b/src/main/resources/templates/user/myInfo.html index a9cbf2c2..06919422 100644 --- a/src/main/resources/templates/user/myInfo.html +++ b/src/main/resources/templates/user/myInfo.html @@ -25,9 +25,9 @@ -