From 363a0b1915b80174acb48263b41f4a6980af5971 Mon Sep 17 00:00:00 2001 From: TkymHrt <23.h.takayama.nutfes@gmail.com> Date: Thu, 21 May 2026 17:44:13 +0900 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E5=8D=94=E8=B3=9B=E3=83=9A=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E6=A8=A9=E9=99=90=E3=81=A8=E8=AB=8B=E6=B1=82=E6=9B=B8?= =?UTF-8?q?=E7=B7=A8=E9=9B=86=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProgressReportInvoicePdfModal.tsx | 22 ++++++++++++++++--- .../src/pages/sponsor-activities/index.tsx | 4 ++-- .../next-project/src/pages/sponsors/index.tsx | 4 ++-- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/view/next-project/src/components/progress-report/ProgressReportInvoicePdfModal.tsx b/view/next-project/src/components/progress-report/ProgressReportInvoicePdfModal.tsx index c5120522..d287a2b7 100644 --- a/view/next-project/src/components/progress-report/ProgressReportInvoicePdfModal.tsx +++ b/view/next-project/src/components/progress-report/ProgressReportInvoicePdfModal.tsx @@ -31,6 +31,8 @@ export default function ProgressReportInvoicePdfModal({ const totalPrice = useMemo(() => getActivityAmountFromApi(activity), [activity]); const [issuedDate, setIssuedDate] = useState(today); const [deadline, setDeadline] = useState(today); + const [sponsorName, setSponsorName] = useState(baseInvoice.sponsorName); + const [managerName, setManagerName] = useState(baseInvoice.managerName); const [subject, setSubject] = useState(baseInvoice.subject); const [remark, setRemark] = useState(''); const [isGenerating, setIsGenerating] = useState(false); @@ -39,9 +41,11 @@ export default function ProgressReportInvoicePdfModal({ if (!isOpen) return; setIssuedDate(today); setDeadline(today); + setSponsorName(baseInvoice.sponsorName); + setManagerName(baseInvoice.managerName); setSubject(baseInvoice.subject); setRemark(''); - }, [isOpen, today, baseInvoice.subject]); + }, [isOpen, today, baseInvoice.sponsorName, baseInvoice.managerName, baseInvoice.subject]); if (!isOpen) return null; @@ -49,6 +53,8 @@ export default function ProgressReportInvoicePdfModal({ ...baseInvoice, issuedDate, deadline, + sponsorName, + managerName, subject, remark, }; @@ -68,9 +74,19 @@ export default function ProgressReportInvoicePdfModal({

企業名

- + setSponsorName(event.target.value)} + className='mb-3 w-full' + />

担当者名(企業)

- + setManagerName(event.target.value)} + className='mb-3 w-full' + />

件名

; - if (!user?.roleID || (user.roleID !== 2 && user.roleID !== 3)) return ; + if (!user?.roleID || (user.roleID !== 2 && user.roleID !== 4)) return ; return ( { router.push('/'); return; } - if (user.roleID !== 2 && user.roleID !== 3) { + if (user.roleID !== 2 && user.roleID !== 4) { router.push('/my_page'); } }, [_hasHydrated, user?.roleID, router]); @@ -50,7 +50,7 @@ const Sponsorship: NextPage = () => { const sponsors = sponsorsData?.data; if (!_hasHydrated) return ; - if (!user?.roleID || (user.roleID !== 2 && user.roleID !== 3)) return ; + if (!user?.roleID || (user.roleID !== 2 && user.roleID !== 4)) return ; if (isYearPeriodsLoading || isSponsorsLoading) return ; if (yearPeriodsError || sponsorsError) return
error...
; From 631bd4d0e10eb6e5a4487c3fd39e197b0b8b3d9c Mon Sep 17 00:00:00 2001 From: TkymHrt <23.h.takayama.nutfes@gmail.com> Date: Thu, 21 May 2026 22:25:58 +0900 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E6=A8=A9=E9=99=90=E3=81=AE=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/next-project/src/pages/sponsor-activities/index.tsx | 4 ++-- view/next-project/src/pages/sponsors/index.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/view/next-project/src/pages/sponsor-activities/index.tsx b/view/next-project/src/pages/sponsor-activities/index.tsx index 8dac5cce..acdfbf21 100644 --- a/view/next-project/src/pages/sponsor-activities/index.tsx +++ b/view/next-project/src/pages/sponsor-activities/index.tsx @@ -90,7 +90,7 @@ export default function SponsorActivities(props: Props) { router.push('/'); return; } - if (user.roleID !== 2 && user.roleID !== 4) { + if (user.roleID !== 2 && user.roleID !== 3 && user.roleID !== 4) { router.push('/my_page'); } }, [_hasHydrated, user?.roleID, router]); @@ -184,7 +184,7 @@ export default function SponsorActivities(props: Props) { }, [filterData, sponsorIdSetByYear]); if (!_hasHydrated) return ; - if (!user?.roleID || (user.roleID !== 2 && user.roleID !== 4)) return ; + if (!user?.roleID || (user.roleID !== 2 && user.roleID !== 3 && user.roleID !== 4)) return ; return ( { router.push('/'); return; } - if (user.roleID !== 2 && user.roleID !== 4) { + if (user.roleID !== 2 && user.roleID !== 3 && user.roleID !== 4) { router.push('/my_page'); } }, [_hasHydrated, user?.roleID, router]); @@ -50,7 +50,7 @@ const Sponsorship: NextPage = () => { const sponsors = sponsorsData?.data; if (!_hasHydrated) return ; - if (!user?.roleID || (user.roleID !== 2 && user.roleID !== 4)) return ; + if (!user?.roleID || (user.roleID !== 2 && user.roleID !== 3 && user.roleID !== 4)) return ; if (isYearPeriodsLoading || isSponsorsLoading) return ; if (yearPeriodsError || sponsorsError) return
error...
; From dc744a3d04431291e7441a14700a2a4aac1e9b74 Mon Sep 17 00:00:00 2001 From: TkymHrt <23.h.takayama.nutfes@gmail.com> Date: Thu, 21 May 2026 22:26:53 +0900 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E6=89=8B=E5=85=A5=E5=8A=9B=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E3=81=AA=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProgressReportInvoicePdfModal.tsx | 12 ++++++++++-- .../legacy-documents/invoice/AddPdfDetailModal.tsx | 2 +- .../legacy-documents/invoice/EditInvoiceModal.tsx | 2 +- .../src/utils/createSponsorActivitiesInvoicesPDF.tsx | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/view/next-project/src/components/progress-report/ProgressReportInvoicePdfModal.tsx b/view/next-project/src/components/progress-report/ProgressReportInvoicePdfModal.tsx index d287a2b7..f59fc343 100644 --- a/view/next-project/src/components/progress-report/ProgressReportInvoicePdfModal.tsx +++ b/view/next-project/src/components/progress-report/ProgressReportInvoicePdfModal.tsx @@ -34,6 +34,7 @@ export default function ProgressReportInvoicePdfModal({ const [sponsorName, setSponsorName] = useState(baseInvoice.sponsorName); const [managerName, setManagerName] = useState(baseInvoice.managerName); const [subject, setSubject] = useState(baseInvoice.subject); + const [fesStuffName, setFesStuffName] = useState(baseInvoice.fesStuffName); const [remark, setRemark] = useState(''); const [isGenerating, setIsGenerating] = useState(false); @@ -44,8 +45,9 @@ export default function ProgressReportInvoicePdfModal({ setSponsorName(baseInvoice.sponsorName); setManagerName(baseInvoice.managerName); setSubject(baseInvoice.subject); + setFesStuffName(baseInvoice.fesStuffName); setRemark(''); - }, [isOpen, today, baseInvoice.sponsorName, baseInvoice.managerName, baseInvoice.subject]); + }, [isOpen, today, baseInvoice.sponsorName, baseInvoice.managerName, baseInvoice.subject, baseInvoice.fesStuffName]); if (!isOpen) return null; @@ -56,6 +58,7 @@ export default function ProgressReportInvoicePdfModal({ sponsorName, managerName, subject, + fesStuffName, remark, }; @@ -109,7 +112,12 @@ export default function ProgressReportInvoicePdfModal({ className='mb-3 w-full' />

担当者名(実行委員)

- + setFesStuffName(event.target.value)} + className='mb-3 w-full' + />

合計金額

(e: React.ChangeEvent | React.ChangeEvent) => { - setInvoiceDate({ ...invoiceData, [input]: e.target.value }); + setInvoiceDate((prev) => ({ ...prev, [input]: e.target.value })); }; const onClose = () => { diff --git a/view/next-project/src/components/sponsor-activities/legacy-documents/invoice/EditInvoiceModal.tsx b/view/next-project/src/components/sponsor-activities/legacy-documents/invoice/EditInvoiceModal.tsx index 70931014..344c681a 100644 --- a/view/next-project/src/components/sponsor-activities/legacy-documents/invoice/EditInvoiceModal.tsx +++ b/view/next-project/src/components/sponsor-activities/legacy-documents/invoice/EditInvoiceModal.tsx @@ -22,7 +22,7 @@ export default function EditInvoiceModal(props: ModalProps) { | React.ChangeEvent | React.ChangeEvent, ) => { - setEditInvoice({ ...editInvoice, [input]: e.target.value }); + setEditInvoice((prev) => ({ ...prev, [input]: e.target.value })); }; const onChangeSponsorStyle = (inputInvoiceSponsorStyle: InvoiceSponsorStyle, index: number) => { diff --git a/view/next-project/src/utils/createSponsorActivitiesInvoicesPDF.tsx b/view/next-project/src/utils/createSponsorActivitiesInvoicesPDF.tsx index 02b7c6f2..bf128d18 100644 --- a/view/next-project/src/utils/createSponsorActivitiesInvoicesPDF.tsx +++ b/view/next-project/src/utils/createSponsorActivitiesInvoicesPDF.tsx @@ -208,7 +208,7 @@ const MyDocument = ({ invoiceItem, deadline, issuedDate }: MyDocumentProps) => { 御中 - ご担当 : {invoiceItem.managerName} 様 + ご担当 : {invoiceItem.managerName && invoiceItem.managerName.trim() !== '' ? `${invoiceItem.managerName} 様` : ''} 件名 : {invoiceItem.subject || '技大祭企業協賛'} From e192351bbe4467ac4dbaed7bae484d0c47585354 Mon Sep 17 00:00:00 2001 From: TkymHrt <131145590+TkymHrt@users.noreply.github.com> Date: Thu, 21 May 2026 13:36:57 +0000 Subject: [PATCH 4/9] formatted by workflow --- .../progress-report/ProgressReportInvoicePdfModal.tsx | 9 ++++++++- view/next-project/src/pages/sponsor-activities/index.tsx | 3 ++- view/next-project/src/pages/sponsors/index.tsx | 3 ++- .../src/utils/createSponsorActivitiesInvoicesPDF.tsx | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/view/next-project/src/components/progress-report/ProgressReportInvoicePdfModal.tsx b/view/next-project/src/components/progress-report/ProgressReportInvoicePdfModal.tsx index f59fc343..fa7493a6 100644 --- a/view/next-project/src/components/progress-report/ProgressReportInvoicePdfModal.tsx +++ b/view/next-project/src/components/progress-report/ProgressReportInvoicePdfModal.tsx @@ -47,7 +47,14 @@ export default function ProgressReportInvoicePdfModal({ setSubject(baseInvoice.subject); setFesStuffName(baseInvoice.fesStuffName); setRemark(''); - }, [isOpen, today, baseInvoice.sponsorName, baseInvoice.managerName, baseInvoice.subject, baseInvoice.fesStuffName]); + }, [ + isOpen, + today, + baseInvoice.sponsorName, + baseInvoice.managerName, + baseInvoice.subject, + baseInvoice.fesStuffName, + ]); if (!isOpen) return null; diff --git a/view/next-project/src/pages/sponsor-activities/index.tsx b/view/next-project/src/pages/sponsor-activities/index.tsx index acdfbf21..8150ecb6 100644 --- a/view/next-project/src/pages/sponsor-activities/index.tsx +++ b/view/next-project/src/pages/sponsor-activities/index.tsx @@ -184,7 +184,8 @@ export default function SponsorActivities(props: Props) { }, [filterData, sponsorIdSetByYear]); if (!_hasHydrated) return ; - if (!user?.roleID || (user.roleID !== 2 && user.roleID !== 3 && user.roleID !== 4)) return ; + if (!user?.roleID || (user.roleID !== 2 && user.roleID !== 3 && user.roleID !== 4)) + return ; return ( { const sponsors = sponsorsData?.data; if (!_hasHydrated) return ; - if (!user?.roleID || (user.roleID !== 2 && user.roleID !== 3 && user.roleID !== 4)) return ; + if (!user?.roleID || (user.roleID !== 2 && user.roleID !== 3 && user.roleID !== 4)) + return ; if (isYearPeriodsLoading || isSponsorsLoading) return ; if (yearPeriodsError || sponsorsError) return
error...
; diff --git a/view/next-project/src/utils/createSponsorActivitiesInvoicesPDF.tsx b/view/next-project/src/utils/createSponsorActivitiesInvoicesPDF.tsx index bf128d18..41cbe971 100644 --- a/view/next-project/src/utils/createSponsorActivitiesInvoicesPDF.tsx +++ b/view/next-project/src/utils/createSponsorActivitiesInvoicesPDF.tsx @@ -208,7 +208,10 @@ const MyDocument = ({ invoiceItem, deadline, issuedDate }: MyDocumentProps) => { 御中 - ご担当 : {invoiceItem.managerName && invoiceItem.managerName.trim() !== '' ? `${invoiceItem.managerName} 様` : ''} + ご担当 :{' '} + {invoiceItem.managerName && invoiceItem.managerName.trim() !== '' + ? `${invoiceItem.managerName} 様` + : ''} 件名 : {invoiceItem.subject || '技大祭企業協賛'} From 6c4b500f881a9977ba0a275592cea9b5fba0797b Mon Sep 17 00:00:00 2001 From: TkymHrt <131145590+TkymHrt@users.noreply.github.com> Date: Thu, 21 May 2026 22:41:07 +0900 Subject: [PATCH 5/9] Update view/next-project/src/pages/sponsor-activities/index.tsx Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- view/next-project/src/pages/sponsor-activities/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/next-project/src/pages/sponsor-activities/index.tsx b/view/next-project/src/pages/sponsor-activities/index.tsx index 8150ecb6..830cd71b 100644 --- a/view/next-project/src/pages/sponsor-activities/index.tsx +++ b/view/next-project/src/pages/sponsor-activities/index.tsx @@ -90,7 +90,7 @@ export default function SponsorActivities(props: Props) { router.push('/'); return; } - if (user.roleID !== 2 && user.roleID !== 3 && user.roleID !== 4) { + if (![2, 3, 4].includes(user.roleID)) { router.push('/my_page'); } }, [_hasHydrated, user?.roleID, router]); From 3a8b941a73e3b017350891d46e870c3b0df4ac23 Mon Sep 17 00:00:00 2001 From: TkymHrt <131145590+TkymHrt@users.noreply.github.com> Date: Thu, 21 May 2026 22:41:21 +0900 Subject: [PATCH 6/9] Update view/next-project/src/pages/sponsor-activities/index.tsx Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- view/next-project/src/pages/sponsor-activities/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/next-project/src/pages/sponsor-activities/index.tsx b/view/next-project/src/pages/sponsor-activities/index.tsx index 830cd71b..4829d800 100644 --- a/view/next-project/src/pages/sponsor-activities/index.tsx +++ b/view/next-project/src/pages/sponsor-activities/index.tsx @@ -184,7 +184,7 @@ export default function SponsorActivities(props: Props) { }, [filterData, sponsorIdSetByYear]); if (!_hasHydrated) return ; - if (!user?.roleID || (user.roleID !== 2 && user.roleID !== 3 && user.roleID !== 4)) + if (!user?.roleID || ![2, 3, 4].includes(user.roleID)) return ; return ; return ( From e2239facccee961efeea30399e7a21f142c34c02 Mon Sep 17 00:00:00 2001 From: TkymHrt <131145590+TkymHrt@users.noreply.github.com> Date: Thu, 21 May 2026 22:41:32 +0900 Subject: [PATCH 7/9] Update view/next-project/src/pages/sponsors/index.tsx Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- view/next-project/src/pages/sponsors/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/next-project/src/pages/sponsors/index.tsx b/view/next-project/src/pages/sponsors/index.tsx index 2ff10c9f..91e39632 100644 --- a/view/next-project/src/pages/sponsors/index.tsx +++ b/view/next-project/src/pages/sponsors/index.tsx @@ -26,7 +26,7 @@ const Sponsorship: NextPage = () => { router.push('/'); return; } - if (user.roleID !== 2 && user.roleID !== 3 && user.roleID !== 4) { + if (![2, 3, 4].includes(user.roleID)) { router.push('/my_page'); } }, [_hasHydrated, user?.roleID, router]); From d734d6ed4f6021dc74943563153baa5eaa0ab424 Mon Sep 17 00:00:00 2001 From: TkymHrt <131145590+TkymHrt@users.noreply.github.com> Date: Thu, 21 May 2026 22:41:42 +0900 Subject: [PATCH 8/9] Update view/next-project/src/pages/sponsors/index.tsx Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- view/next-project/src/pages/sponsors/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/next-project/src/pages/sponsors/index.tsx b/view/next-project/src/pages/sponsors/index.tsx index 91e39632..d75962bc 100644 --- a/view/next-project/src/pages/sponsors/index.tsx +++ b/view/next-project/src/pages/sponsors/index.tsx @@ -50,7 +50,7 @@ const Sponsorship: NextPage = () => { const sponsors = sponsorsData?.data; if (!_hasHydrated) return ; - if (!user?.roleID || (user.roleID !== 2 && user.roleID !== 3 && user.roleID !== 4)) + if (!user?.roleID || ![2, 3, 4].includes(user.roleID)) return ; return ; if (isYearPeriodsLoading || isSponsorsLoading) return ; if (yearPeriodsError || sponsorsError) return
error...
; From 4b99ba31a2b43f64fbc318016ac8bc4b94b9b827 Mon Sep 17 00:00:00 2001 From: TkymHrt <23.h.takayama.nutfes@gmail.com> Date: Thu, 21 May 2026 23:02:28 +0900 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20format=E3=81=A8=E5=9E=8B=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E5=AF=BE=E5=87=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/sponsor-activities/index.tsx | 1 - .../next-project/src/pages/sponsors/index.tsx | 26 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/view/next-project/src/pages/sponsor-activities/index.tsx b/view/next-project/src/pages/sponsor-activities/index.tsx index 4829d800..b5947004 100644 --- a/view/next-project/src/pages/sponsor-activities/index.tsx +++ b/view/next-project/src/pages/sponsor-activities/index.tsx @@ -185,7 +185,6 @@ export default function SponsorActivities(props: Props) { if (!_hasHydrated) return ; if (!user?.roleID || ![2, 3, 4].includes(user.roleID)) return ; - return ; return ( { isLoading: isYearPeriodsLoading, error: yearPeriodsError, } = useGetYearsPeriods(); - const yearPeriods = yearPeriodsData?.data; + const yearPeriods = yearPeriodsData?.data ?? []; const [selectedYear, setSelectedYear] = useState( - yearPeriods ? String(yearPeriods[yearPeriods.length - 1].year) : String(date.getFullYear()), + yearPeriods.length > 0 + ? String(yearPeriods[yearPeriods.length - 1].year) + : String(date.getFullYear()), ); const { @@ -47,11 +49,10 @@ const Sponsorship: NextPage = () => { isLoading: isSponsorsLoading, error: sponsorsError, } = useGetSponsorsPeriodsYear(Number(selectedYear)); - const sponsors = sponsorsData?.data; + const sponsors = sponsorsData?.data ?? []; if (!_hasHydrated) return ; if (!user?.roleID || ![2, 3, 4].includes(user.roleID)) return ; - return ; if (isYearPeriodsLoading || isSponsorsLoading) return ; if (yearPeriodsError || sponsorsError) return
error...
; @@ -70,14 +71,13 @@ const Sponsorship: NextPage = () => { defaultValue={selectedYear} onChange={(e) => setSelectedYear(e.target.value)} > - {yearPeriods && - yearPeriods.map((year, index) => { - return ( - - ); - })} + {yearPeriods.map((year, index) => { + return ( + + ); + })}
@@ -109,7 +109,7 @@ const Sponsorship: NextPage = () => { - {sponsors && sponsors.length > 0 ? ( + {sponsors.length > 0 ? ( sponsors.map((sponsor, index) => (