From 5771581d10532e5223107e5dd48f309be26e591b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=80=EC=A7=80?= Date: Thu, 7 Nov 2024 09:51:06 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat=20::=20=EC=B1=84=EC=9A=A9=ED=98=95=20?= =?UTF-8?q?=EB=AA=A8=EC=A7=91=EC=9D=98=EB=A2=B0=EC=84=9C=20=EC=B1=84?= =?UTF-8?q?=EC=9A=A9=20=EC=A0=84=ED=99=98=20=EC=97=AC=EB=B6=80=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Apis/Recruitments/request.ts | 3 +- src/Apis/Recruitments/response.ts | 3 +- .../RecruitmentFormDetail/Basic/index.tsx | 12 +- .../RecruitmentFormDetail/Edit/index.tsx | 118 ++++++++++-------- 4 files changed, 78 insertions(+), 58 deletions(-) diff --git a/src/Apis/Recruitments/request.ts b/src/Apis/Recruitments/request.ts index 0a5d1fa..b06e8c3 100644 --- a/src/Apis/Recruitments/request.ts +++ b/src/Apis/Recruitments/request.ts @@ -17,13 +17,14 @@ export interface EditRecruitmentRequest { train_pay: number; pay: string | null; benefits: string | null; - military: boolean; + military_support: boolean; hiring_progress: string[]; submit_document: string; start_date: string | null; end_date: string | null; etc: string | null; flexible_working: boolean; + hire_convertible: boolean; } export interface EditAreasType { diff --git a/src/Apis/Recruitments/response.ts b/src/Apis/Recruitments/response.ts index 09765b1..db40d2c 100644 --- a/src/Apis/Recruitments/response.ts +++ b/src/Apis/Recruitments/response.ts @@ -30,13 +30,14 @@ export interface RecruitmentFormDetailResponse { train_pay: number; pay: string | null; benefits: string | null; - military: true; + military_support: true; submit_document: string; start_date: string; end_date: string; additional_qualifications: string | null; etc: string | null; winter_intern: boolean; + hire_convertible: boolean; } interface nameAndId { diff --git a/src/Components/Detail/RecruitmentFormDetail/Basic/index.tsx b/src/Components/Detail/RecruitmentFormDetail/Basic/index.tsx index c936375..0356eb7 100644 --- a/src/Components/Detail/RecruitmentFormDetail/Basic/index.tsx +++ b/src/Components/Detail/RecruitmentFormDetail/Basic/index.tsx @@ -296,7 +296,7 @@ export function RecruitmentFormDetailBasic({ 신청계획 <_.ContentBox width={20}> - {recruitmentFormDetail?.military + {recruitmentFormDetail?.military_support ? 'O' : 'X'} @@ -322,6 +322,16 @@ export function RecruitmentFormDetailBasic({ + <_.Stack> + <_.TitleBox height={70}>채용 전환 + <_.ContentBox height={70} width={90}> + {recruitmentFormDetail?.hire_convertible === true + ? '가능' + : recruitmentFormDetail?.hire_convertible === false + ? '불가능' + : '-'} + + ); } diff --git a/src/Components/Detail/RecruitmentFormDetail/Edit/index.tsx b/src/Components/Detail/RecruitmentFormDetail/Edit/index.tsx index 1e5914c..fec4bfc 100644 --- a/src/Components/Detail/RecruitmentFormDetail/Edit/index.tsx +++ b/src/Components/Detail/RecruitmentFormDetail/Edit/index.tsx @@ -61,24 +61,25 @@ export function RecruitmentFormDetailEdit({ train_pay: recruitmentFormDetail?.train_pay, pay: recruitmentFormDetail?.pay, benefits: recruitmentFormDetail?.benefits, - military: recruitmentFormDetail?.military, + military_support: recruitmentFormDetail?.military_support, hiring_progress: recruitmentFormDetail?.hiring_progress, submit_document: recruitmentFormDetail?.submit_document, start_date: recruitmentFormDetail?.start_date, end_date: recruitmentFormDetail?.end_date, etc: recruitmentFormDetail?.etc, flexible_working: recruitmentFormDetail?.flexible_working, + hire_convertible: recruitmentFormDetail?.hire_convertible, }); const { - required_grade, + hire_convertible, required_licenses, start_date, end_date, train_pay, pay, benefits, - military, + military_support, hiring_progress, submit_document, etc, @@ -415,52 +416,22 @@ export function RecruitmentFormDetailEdit({ <_.Stack> <_.TitleBox>자격요건 <_.Stack flexDirection="column" width={90}> - <_.Stack flexDirection="column" width={100}> - <_.Stack> - <_.TitleBox>국가자격증 - <_.ContentBox - width={54} - longText={true} - overflow="scroll" - > - {required_licenses.join(', ') || '-'} - - <_.TitleBox - width={6} - style={{ cursor: 'pointer' }} - onClick={openEditRequiredLicensesModal} - > - - - <_.TitleBox>성적 - <_.ContentBox width={20}> - <_.CustomInput - width={100} - type="number" - max={100} - placeholder="성적" - style={{ paddingRight: '50px' }} - value={required_grade!} - name="required_grade" - onInput={(e) => { - const value = Number( - e.currentTarget.value - ); - if (value < 0) { - e.currentTarget.value = '0'; - } else if (value > 100) { - e.currentTarget.value = '100'; - } - }} - onChange={recruitmentFormDetailInfohandler} - /> - <_.AbsoluteText right={50}>% - - + <_.Stack width={143}> + <_.TitleBox>국가자격증 + <_.ContentBox + width={54} + longText={true} + overflow="scroll" + > + {required_licenses.join(', ') || '-'} + + <_.TitleBox + width={6} + style={{ cursor: 'pointer' }} + onClick={openEditRequiredLicensesModal} + > + + @@ -669,35 +640,35 @@ export function RecruitmentFormDetailEdit({ { setRecruitmentFormDetailInfo( ( recruitmentFormDetailInfo ) => ({ ...recruitmentFormDetailInfo, - military: true, + military_support: true, }) ); }} - checked={military === true} + checked={military_support === true} /> 있음 { setRecruitmentFormDetailInfo( ( recruitmentFormDetailInfo ) => ({ ...recruitmentFormDetailInfo, - military: false, + military_support: false, }) ); }} - checked={military === false} + checked={military_support === false} /> 없음 @@ -737,6 +708,43 @@ export function RecruitmentFormDetailEdit({ + <_.Stack> + <_.TitleBox>채용 전환 + <_.ContentBox width={20}> + + + { + setRecruitmentFormDetailInfo( + (recruitmentFormDetailInfo) => ({ + ...recruitmentFormDetailInfo, + hire_convertible: true, + }) + ); + }} + checked={hire_convertible === true} + /> + 가능 + + + { + setRecruitmentFormDetailInfo( + (recruitmentFormDetailInfo) => ({ + ...recruitmentFormDetailInfo, + hire_convertible: false, + }) + ); + }} + checked={hire_convertible === false} + /> + 불가능 + + + + ); } From a9e56d9a7233b936ef703327bb044a99077e6a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=80=EC=A7=80?= Date: Thu, 7 Nov 2024 10:03:36 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat=20::=20=EC=B2=B4=ED=97=98=ED=98=95=20?= =?UTF-8?q?=EB=AA=A8=EC=A7=91=EC=9D=98=EB=A2=B0=EC=84=9C=20=ED=98=84?= =?UTF-8?q?=EC=9E=A5=EC=8B=A4=EC=8A=B5=20=EC=97=B0=EA=B3=84=20=EA=B3=84?= =?UTF-8?q?=ED=9A=8D=20=EC=97=AC=EB=B6=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Apis/Recruitments/request.ts | 1 + src/Apis/Recruitments/response.ts | 1 + .../RecruitmentFormDetail/Basic/index.tsx | 35 ++++-- .../RecruitmentFormDetail/Edit/index.tsx | 112 ++++++++++++------ 4 files changed, 104 insertions(+), 45 deletions(-) diff --git a/src/Apis/Recruitments/request.ts b/src/Apis/Recruitments/request.ts index b06e8c3..dea0ae4 100644 --- a/src/Apis/Recruitments/request.ts +++ b/src/Apis/Recruitments/request.ts @@ -25,6 +25,7 @@ export interface EditRecruitmentRequest { etc: string | null; flexible_working: boolean; hire_convertible: boolean; + integration_plan: boolean; } export interface EditAreasType { diff --git a/src/Apis/Recruitments/response.ts b/src/Apis/Recruitments/response.ts index db40d2c..9e4a5cc 100644 --- a/src/Apis/Recruitments/response.ts +++ b/src/Apis/Recruitments/response.ts @@ -38,6 +38,7 @@ export interface RecruitmentFormDetailResponse { etc: string | null; winter_intern: boolean; hire_convertible: boolean; + integration_plan: boolean; } interface nameAndId { diff --git a/src/Components/Detail/RecruitmentFormDetail/Basic/index.tsx b/src/Components/Detail/RecruitmentFormDetail/Basic/index.tsx index 0356eb7..08656c2 100644 --- a/src/Components/Detail/RecruitmentFormDetail/Basic/index.tsx +++ b/src/Components/Detail/RecruitmentFormDetail/Basic/index.tsx @@ -322,16 +322,31 @@ export function RecruitmentFormDetailBasic({ - <_.Stack> - <_.TitleBox height={70}>채용 전환 - <_.ContentBox height={70} width={90}> - {recruitmentFormDetail?.hire_convertible === true - ? '가능' - : recruitmentFormDetail?.hire_convertible === false - ? '불가능' - : '-'} - - + {recruitmentFormDetail?.winter_intern ? ( + <_.Stack> + <_.TitleBox height={70} width={21.2}> + 현장실습 연계 계획 + + <_.ContentBox height={70} width={90}> + {recruitmentFormDetail?.integration_plan === true + ? '있음' + : recruitmentFormDetail?.integration_plan === false + ? '없음' + : '-'} + + + ) : ( + <_.Stack> + <_.TitleBox height={70}>채용 전환 + <_.ContentBox height={70} width={90}> + {recruitmentFormDetail?.hire_convertible === true + ? '가능' + : recruitmentFormDetail?.hire_convertible === false + ? '불가능' + : '-'} + + + )} ); } diff --git a/src/Components/Detail/RecruitmentFormDetail/Edit/index.tsx b/src/Components/Detail/RecruitmentFormDetail/Edit/index.tsx index fec4bfc..caa5f3f 100644 --- a/src/Components/Detail/RecruitmentFormDetail/Edit/index.tsx +++ b/src/Components/Detail/RecruitmentFormDetail/Edit/index.tsx @@ -69,6 +69,7 @@ export function RecruitmentFormDetailEdit({ etc: recruitmentFormDetail?.etc, flexible_working: recruitmentFormDetail?.flexible_working, hire_convertible: recruitmentFormDetail?.hire_convertible, + integration_plan: recruitmentFormDetail?.integration_plan, }); const { @@ -84,6 +85,7 @@ export function RecruitmentFormDetailEdit({ submit_document, etc, flexible_working, + integration_plan, } = recruitmentFormDetailInfo; const [areaId, setAreaId] = useState(0); @@ -708,43 +710,83 @@ export function RecruitmentFormDetailEdit({ - <_.Stack> - <_.TitleBox>채용 전환 - <_.ContentBox width={20}> - - - { - setRecruitmentFormDetailInfo( - (recruitmentFormDetailInfo) => ({ - ...recruitmentFormDetailInfo, - hire_convertible: true, - }) - ); - }} - checked={hire_convertible === true} - /> - 가능 + {recruitmentFormDetail.winter_intern ? ( + <_.Stack> + <_.TitleBox width={21.2}>현장실습 연계 계획 + <_.ContentBox width={90}> + + + { + setRecruitmentFormDetailInfo( + (recruitmentFormDetailInfo) => ({ + ...recruitmentFormDetailInfo, + integration_plan: true, + }) + ); + }} + checked={integration_plan === true} + /> + 있음 + + + { + setRecruitmentFormDetailInfo( + (recruitmentFormDetailInfo) => ({ + ...recruitmentFormDetailInfo, + integration_plan: false, + }) + ); + }} + checked={integration_plan === false} + /> + 없음 + - - { - setRecruitmentFormDetailInfo( - (recruitmentFormDetailInfo) => ({ - ...recruitmentFormDetailInfo, - hire_convertible: false, - }) - ); - }} - checked={hire_convertible === false} - /> - 불가능 + + + ) : ( + <_.Stack> + <_.TitleBox>채용 전환 + <_.ContentBox width={20}> + + + { + setRecruitmentFormDetailInfo( + (recruitmentFormDetailInfo) => ({ + ...recruitmentFormDetailInfo, + hire_convertible: true, + }) + ); + }} + checked={hire_convertible === true} + /> + 가능 + + + { + setRecruitmentFormDetailInfo( + (recruitmentFormDetailInfo) => ({ + ...recruitmentFormDetailInfo, + hire_convertible: false, + }) + ); + }} + checked={hire_convertible === false} + /> + 불가능 + - - - + + + )} ); } From 149a2f704dea1a9da4d78e4ade9821b27bbe2357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=80=EC=A7=80?= Date: Thu, 7 Nov 2024 10:06:48 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20build=20=EC=98=A4=EB=A5=98=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/Pages/PdfPage/index.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Pages/PdfPage/index.tsx b/src/Pages/PdfPage/index.tsx index 7342e02..b723b74 100644 --- a/src/Pages/PdfPage/index.tsx +++ b/src/Pages/PdfPage/index.tsx @@ -417,7 +417,9 @@ export const PDFFile = () => { 병역특례기업 - {recruitmentDetail?.military ? 'O' : 'X'} + {recruitmentDetail?.military_support + ? 'O' + : 'X'} @@ -429,7 +431,9 @@ export const PDFFile = () => { {'산업기능요원 TO\n및 신청계획'} - {recruitmentDetail?.military ? 'O' : 'X'} + {recruitmentDetail?.military_support + ? 'O' + : 'X'}