chore :: 지원자, 지원요청 팝업 수정

지원자, 지원요청 팝업 수정
Team-return · Nov 19, 2024 · 89c6151 · 89c6151
2 parents 83d15a8 + cdf48f3
commit 89c6151
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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<ApplicantInfoQueryStringType>({
 		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
@@ -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<ApplicantInfoQueryStringType>({
 		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,