- 오수발생량 추정 기간선택 문제해결

- geoserver 주소 변경

.gitignore

@@ -1,5 +1,6 @@
 # turbo
 .turbo/
+.vscode/**/*
 
 # dependencies
 node_modules/

apps/fo/.env.development

@@ -5,7 +5,8 @@ NEXT_PUBLIC_SERVER_API_URL = http://con.mind-one.co.kr:11082/api/v1
 #NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000
 NEXT_PUBLIC_WR_SERVER_API_URL = http://con.mind-one.co.kr:11080/api/v1
 NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000
-NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
+#NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
+NEXT_PUBLIC_GEOSERVER_URL = https://hasudo.geo.rsonesoft.com/geoserver
 NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver
 NEXT_PUBLIC_CLAIM_NAME = Authorization
 NEXT_PUBLIC_AUTH_USER_ID = token-id

apps/fo/.env.local

@@ -5,7 +5,8 @@ NEXT_PUBLIC_SERVER_API_URL = http://con.mind-one.co.kr:11082/api/v1
 #NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000
 NEXT_PUBLIC_WR_SERVER_API_URL = http://con.mind-one.co.kr:11080/api/v1
 NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000
-NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
+#NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
+NEXT_PUBLIC_GEOSERVER_URL = https://hasudo.geo.rsonesoft.com/geoserver
 NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver
 NEXT_PUBLIC_CLAIM_NAME = Authorization
 NEXT_PUBLIC_AUTH_USER_ID = token-id

apps/fo/.env.production

@@ -18,7 +18,8 @@ NEXT_PUBLIC_SERVER_API_URL = http://con.mind-one.co.kr:11082/api/v1
 #NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 
 NEXT_PUBLIC_WR_SERVER_API_URL = http://con.mind-one.co.kr:11080/api/v1
 NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000
-NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
+#NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
+NEXT_PUBLIC_GEOSERVER_URL = https://hasudo.geo.rsonesoft.com/geoserver
 NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver
 NEXT_PUBLIC_CLAIM_NAME = Authorization
 NEXT_PUBLIC_AUTH_USER_ID = token-id

apps/fo/app/pages/(with-layout)/sewageOccur/modal/page.tsx

@@ -5,8 +5,6 @@ import { DateMonthPicker, UiTable } from "@common/business_components/ui";
 import ListDiv from "@common/business_components/ui/list_div";
 import { Table, TableCell, TableHead, TableRow } from "@common/components/ui";
 import { useEffect, useState } from "react";
-import { start } from "repl";
-
 
 export default function SewageOccurModal(props: { fcltyName: string; facilityCd : string; searchYear : string}) {
   // 그리드 관련
@@ -19,8 +17,8 @@ export default function SewageOccurModal(props: { fcltyName: string; facilityCd
   const [startYearMonth, setStartYearMonth] = useState(validSearchYear+'01');
   const [endYearMonth, setEndYearMonth] = useState(validSearchYear+'12');
   const [detailList, setDetailList] = useState<modalTableType[]>([]);
+
   // 가능한 시작년월 설정
-  const [enableStartMonth, setEnableStartMonth] = useState<string[]>(['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월']);
   const [enableEndMonth, setEnableEndMonth] = useState<string[]>(['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월']);
   
   const {
@@ -43,13 +41,17 @@ export default function SewageOccurModal(props: { fcltyName: string; facilityCd
 
   useEffect(() => {
     const standdardMonthList = ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월']
-
+    setEnableEndMonth(standdardMonthList);
     // 시작년월이 바뀌면 선택가능한 년월 데이터가 변경돼야 한다.
     if(startYearMonth){
       const startMm = startYearMonth.substring(4, 6);
 
+      if(endYearMonth < startYearMonth) {
+          setEndYearMonth(startYearMonth);
+        }
+
       standdardMonthList.forEach((month) => {
-        setEnableStartMonth((prev) => {
+        setEnableEndMonth((prev) => {
           if (parseInt(month.replaceAll('월', '')) < parseInt(startMm)) {
             return prev.filter((m) => m !== month);
           }
@@ -57,20 +59,7 @@ export default function SewageOccurModal(props: { fcltyName: string; facilityCd
         });
       });
     }
-
-    if(endYearMonth){
-      const endMm = endYearMonth.substring(4, 6);
-      standdardMonthList.forEach((month) => {
-        setEnableEndMonth((prev) => {
-          if (parseInt(month.replaceAll('월', '')) > parseInt(endMm)) {
-            return prev.filter((m) => m !== month);
-          }
-          return prev;
-        });
-      });
-    }
-
-  }, [startYearMonth, endYearMonth]);
+  }, [endYearMonth, startYearMonth]);
 
   return (
     <>
@@ -100,7 +89,7 @@ export default function SewageOccurModal(props: { fcltyName: string; facilityCd
                   selectClass="ml-5 w-[100px]"
                   startYear={1900}
                   yearReadOnly={true}
-                  enableMonth={enableStartMonth}
+                  enableMonth={['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월']}
                 />~
                 <DateMonthPicker
                   field={{