Merge branch 'feature/sato/706-output-sponsor-activity' of github.com…

…:NUTFes/FinanSu into feature/sato/706-output-sponsor-activity
NUTFes · Mar 21, 2024 · e725f64 · e725f64
2 parents ccd8f94 + d1f8246
commit e725f64
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 29 deletions.
diff --git a/view/next-project/src/components/sponsoractivities/OpenPaymentDayModalButton.tsx b/view/next-project/src/components/sponsoractivities/OpenPaymentDayModalButton.tsx
@@ -19,9 +19,7 @@ const OpenPaymentDayModalButton: React.FC<Props> = (props) => {
 
   return (
     <>
-      <PrimaryButton onClick={onOpen}>
-        領収書作成
-      </PrimaryButton>
+      <PrimaryButton onClick={onOpen}>領収書作成</PrimaryButton>
       {isPaymentDayModalOpen && (
         <PaymentDayModal
           setIsOpen={setIsPaymentDayModalOpen}
@@ -32,4 +30,4 @@ const OpenPaymentDayModalButton: React.FC<Props> = (props) => {
   );
 };
 
-export default OpenPaymentDayModalButton;
+export default OpenPaymentDayModalButton;
diff --git a/view/next-project/src/components/sponsoractivities/PaymentDayModal.tsx b/view/next-project/src/components/sponsoractivities/PaymentDayModal.tsx
@@ -26,14 +26,15 @@ export default function PaymentDayModal(props: ModalProps) {
   const [formData, setFormData] = useState<FormDateFormat>({ receivedAt: ymd });
 
   const formatDate = (date: string) => {
-    const arrayDate = date.split("-");
-    return String(arrayDate[0] + "年" + arrayDate[1] + "月" + arrayDate[2] + "日");
+    const arrayDate = date.split('-');
+    return String(arrayDate[0] + '年' + arrayDate[1] + '月' + arrayDate[2] + '日');
   };
 
-  const handler = (input: string) =>
-    (e: React.ChangeEvent<HTMLSelectElement> | React.ChangeEvent<HTMLInputElement>) => {
-      setFormData({ ...formData, [input]: e.target.value });
-    };
+  const handler =
+    (input: string) =>
+      (e: React.ChangeEvent<HTMLSelectElement> | React.ChangeEvent<HTMLInputElement>) => {
+        setFormData({ ...formData, [input]: e.target.value });
+      };
 
   return (
     <Modal className='mt-64 md:mt-32 md:w-1/2'>
@@ -61,7 +62,7 @@ export default function PaymentDayModal(props: ModalProps) {
                 downloadContent: await createSponsorActivityFormPdf(
                   props.sponsorActivitiesViewItem,
                   issueDay,
-                  formatDate(formData.receivedAt)
+                  formatDate(formData.receivedAt),
                 ),
                 fileName: `領収書_${yyyy}${mm}${dd}_${props.sponsorActivitiesViewItem.sponsor.name}.pdf`,
                 isBomAdded: true,
@@ -72,6 +73,6 @@ export default function PaymentDayModal(props: ModalProps) {
           </PrimaryButton>
         </div>
       </div>
-    </Modal >
-  )
-}
+    </Modal>
+  );
+}
diff --git a/view/next-project/src/components/ui/context.tsx b/view/next-project/src/components/ui/context.tsx
@@ -12,15 +12,15 @@ const initialState = {
 
 type Action =
   | {
-    type: 'OPEN_MODAL';
-  }
+      type: 'OPEN_MODAL';
+    }
   | {
-    type: 'CLOSE_MODAL';
-  }
+      type: 'CLOSE_MODAL';
+    }
   | {
-    type: 'SET_MODAL_VIEW';
-    view: MODAL_VIEWS;
-  };
+      type: 'SET_MODAL_VIEW';
+      view: MODAL_VIEWS;
+    };
 
 type MODAL_VIEWS =
   | 'SPONSOR_ADD_MODAL'

diff --git a/view/next-project/src/utils/createPurchaseReportPdf.ts b/view/next-project/src/utils/createPurchaseReportPdf.ts
@@ -139,7 +139,6 @@ export const createPurchaseReportFormPdf = async (
     font: fontData,
   });
 
-
   page.drawText('報告書', {
     x: width / 2 - 33,
     y: height - 160,
@@ -559,8 +558,8 @@ export const createPurchaseReportFormPdf = async (
       page.drawText(
         String(
           sum +
-          purchaseReportViews.purchaseReport.addition -
-          purchaseReportViews.purchaseReport.discount,
+            purchaseReportViews.purchaseReport.addition -
+            purchaseReportViews.purchaseReport.discount,
         ),
         {
           x:
@@ -569,10 +568,10 @@ export const createPurchaseReportFormPdf = async (
             3 * rectangleWidth2 -
             String(
               sum +
-              purchaseReportViews.purchaseReport.addition -
-              purchaseReportViews.purchaseReport.discount,
+                purchaseReportViews.purchaseReport.addition -
+                purchaseReportViews.purchaseReport.discount,
             ).length *
-            7,
+              7,
           y: height - (tableTextHight + 20 * (4 + index)),
           size: fontSizes[0],
           font: fontData,

diff --git a/view/next-project/src/utils/createSponsorActivityPdf.ts b/view/next-project/src/utils/createSponsorActivityPdf.ts
@@ -2,7 +2,11 @@ import fontkit from '@pdf-lib/fontkit';
 import { PDFDocument, rgb } from 'pdf-lib';
 import { SponsorActivityView, SponsorStyleDetail } from '../type/common';
 
-export const createSponsorActivityFormPdf = async (SponsorActivityViews: SponsorActivityView, IssueDay: string, PaymentDay: string) => {
+export const createSponsorActivityFormPdf = async (
+  SponsorActivityViews: SponsorActivityView,
+  IssueDay: string,
+  PaymentDay: string,
+) => {
   const pdfDoc = await PDFDocument.create();
   pdfDoc.registerFontkit(fontkit);
   // A4サイズのpdf作成
@@ -37,7 +41,13 @@ export const createSponsorActivityFormPdf = async (SponsorActivityViews: Sponsor
   //フォントのサイズ
   const fontSizes = [12, 24, 8, 14, 16];
 
-  const totalFee = SponsorActivityViews.styleDetail.length > 0 ? SponsorActivityViews.styleDetail.reduce((total: number, detail: SponsorStyleDetail) => (total + detail.sponsorStyle.price), 0) : 0
+  const totalFee =
+    SponsorActivityViews.styleDetail.length > 0
+      ? SponsorActivityViews.styleDetail.reduce(
+          (total: number, detail: SponsorStyleDetail) => total + detail.sponsorStyle.price,
+          0,
+        )
+      : 0;
 
   // 内容の作成ここから
   page.drawText('領　収　書', {