From cdf48f3242ab5ee6fae4a4af5a11012de718c474 Mon Sep 17 00:00:00 2001 From: hyuna Date: Tue, 19 Nov 2024 16:37:49 +0900 Subject: [PATCH] =?UTF-8?q?chore=20::=20=EC=A7=80=EC=9B=90=EC=9E=90,=20?= =?UTF-8?q?=EC=A7=80=EC=9B=90=EC=9A=94=EC=B2=AD=20=ED=8C=9D=EC=97=85=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 --- src/Components/ApplicationView/Table/index.tsx | 4 ---- src/Components/RecruitmentForm/Table/index.tsx | 5 +++-- src/Pages/PopUp/ApplicationPopup/index.tsx | 5 ++++- src/Pages/PopUp/RecruitmentRequestPopup/index.tsx | 6 ++++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Components/ApplicationView/Table/index.tsx b/src/Components/ApplicationView/Table/index.tsx index 7d684d0..e236642 100644 --- a/src/Components/ApplicationView/Table/index.tsx +++ b/src/Components/ApplicationView/Table/index.tsx @@ -493,10 +493,6 @@ export function ApplicationViewTable({ /** 테이블 width를 설정한 값입니다. */ const tableWidth: number[] = [4, 9, 7, 8, 15, 45, 12]; - useEffect(() => { - console.log(applicationViewQueryString.winter_intern); - }, [applicationViewQueryString]); - return ( <_.Container> <_.BtnContentWrapper> diff --git a/src/Components/RecruitmentForm/Table/index.tsx b/src/Components/RecruitmentForm/Table/index.tsx index c2bab97..ab1689d 100644 --- a/src/Components/RecruitmentForm/Table/index.tsx +++ b/src/Components/RecruitmentForm/Table/index.tsx @@ -144,16 +144,17 @@ export function RecruitmentFormTable({ }; /** 팝업창을 띄워줄 함수입니다.. */ + const openApplicationCountPage = (requested: boolean) => { if (requested) { window.open( - `/RecruitmentRequestPopup?id=${recruitment.id}`, + `/RecruitmentRequestPopup?id=${recruitment.id}&winterIntern=${recruitmentFormQueryString.winter_intern}`, '_blank', 'resizable=no,width=570,height=830,left=50,top=50' ); } else { window.open( - `ApplicationPopup?id=${recruitment.id}`, + `ApplicationPopup?id=${recruitment.id}&winterIntern=${recruitmentFormQueryString.winter_intern}`, '_blank', 'resizable=no,width=570,height=830,left=50,top=50' ); diff --git a/src/Pages/PopUp/ApplicationPopup/index.tsx b/src/Pages/PopUp/ApplicationPopup/index.tsx index ef098d5..897add2 100644 --- a/src/Pages/PopUp/ApplicationPopup/index.tsx +++ b/src/Pages/PopUp/ApplicationPopup/index.tsx @@ -10,12 +10,15 @@ import { useGetApplicantInfo } from '../../../Apis/Applications'; export function ApplicationPopup() { const date = new Date(); const id = new URLSearchParams(window.location.search).get('id'); + const winterIntern = new URLSearchParams(window.location.search).get( + 'winterIntern' + ); const [applicationQueryString] = useState({ application_status: 'APPROVED', student_name: '', recruitment_id: id ? id : '', year: date.getFullYear().toString(), - winter_intern: true, + winter_intern: winterIntern === 'false' ? false : true, }); const { diff --git a/src/Pages/PopUp/RecruitmentRequestPopup/index.tsx b/src/Pages/PopUp/RecruitmentRequestPopup/index.tsx index 764f336..eca1e90 100644 --- a/src/Pages/PopUp/RecruitmentRequestPopup/index.tsx +++ b/src/Pages/PopUp/RecruitmentRequestPopup/index.tsx @@ -10,14 +10,16 @@ import { useGetApplicantInfo } from '../../../Apis/Applications'; export function RecruitmentRequestPopup() { const date = new Date(); const id = new URLSearchParams(window.location.search).get('id'); + const winterIntern = new URLSearchParams(window.location.search).get( + 'winterIntern' + ); const [applicationQueryString] = useState({ application_status: 'REQUESTED', student_name: '', recruitment_id: id ? id : '', year: date.getFullYear().toString(), - winter_intern: false, + winter_intern: winterIntern === 'false' ? false : true, }); - const { data: applicationData, isLoading,