From 91ae101f2c214a154905365ebaafd0121ebb8dcb Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Wed, 4 Sep 2024 00:04:37 +0900
Subject: [PATCH] =?UTF-8?q?[fix]=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB?=
 =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/purchaseorders/DetailModal.tsx | 18 ++++-----
 .../src/pages/purchaseorders/index.tsx        | 14 ++++++-
 .../src/pages/purchasereports/index.tsx       | 40 +++----------------
 .../next-project/src/pages/teachers/index.tsx |  2 +-
 4 files changed, 27 insertions(+), 47 deletions(-)

diff --git a/view/next-project/src/components/purchaseorders/DetailModal.tsx b/view/next-project/src/components/purchaseorders/DetailModal.tsx
index 8e62464b..0ec6a35b 100644
--- a/view/next-project/src/components/purchaseorders/DetailModal.tsx
+++ b/view/next-project/src/components/purchaseorders/DetailModal.tsx
@@ -79,27 +79,27 @@ const DetailModal: FC<ModalProps> = (props) => {
             </div>
             <div
               className={clsx(
-                'col-span-3 grid w-full border border-x-white-0 border-b-primary-1 border-t-white-0 pl-1',
+                'col-span-4 grid w-full border border-x-white-0 border-b-primary-1 border-t-white-0 pl-1',
               )}
             >
               {props.purchaseOrderViewItem && props.purchaseOrderViewItem.purchaseOrder.id}
             </div>
-            <div className={clsx('col-span-3 grid')} />
+            <div className={clsx('col-span-2 grid')} />
           </div>
           <div className={clsx('col-span-1 grid ')} />
           <div className={clsx('my-2 grid w-full grid-cols-12')}>
             <div className={clsx('col-span-2 grid')} />
             <div className={clsx('col-span-4 mr-2 grid justify-items-end')}>
-              <div className={clsx('text-md flex items-center text-black-600')}>申請した局</div>
+              <div className={clsx('text-md flex items-center text-black-600')}>支出元</div>
             </div>
             <div
               className={clsx(
-                'col-span-3 grid w-full border border-x-white-0 border-b-primary-1 border-t-white-0 pl-1',
+                'col-span-4 grid w-full border border-x-white-0 border-b-primary-1 border-t-white-0 pl-1',
               )}
             >
               {expenseName}
             </div>
-            <div className={clsx('col-span-3 grid')} />
+            <div className={clsx('col-span-2 grid')} />
           </div>
           <div className={clsx('my-2 grid w-full grid-cols-12')}>
             <div className={clsx('col-span-2 grid')} />
@@ -108,7 +108,7 @@ const DetailModal: FC<ModalProps> = (props) => {
             </div>
             <div
               className={clsx(
-                'col-span-3 grid w-full border border-x-white-0 border-b-primary-1 border-t-white-0 pl-1',
+                'col-span-4 grid w-full border border-x-white-0 border-b-primary-1 border-t-white-0 pl-1',
               )}
             >
               {props.purchaseOrderViewItem &&
@@ -118,7 +118,7 @@ const DetailModal: FC<ModalProps> = (props) => {
                     : '',
                 )}
             </div>
-            <div className={clsx('col-span-3 grid')} />
+            <div className={clsx('col-span-2 grid')} />
           </div>
           <div className={clsx('my-2 grid w-full grid-cols-12')}>
             <div className={clsx('col-span-2 grid')} />
@@ -127,12 +127,12 @@ const DetailModal: FC<ModalProps> = (props) => {
             </div>
             <div
               className={clsx(
-                'col-span-3 grid w-full border border-x-white-0 border-b-primary-1 border-t-white-0 pl-1',
+                'col-span-4 grid w-full border border-x-white-0 border-b-primary-1 border-t-white-0 pl-1',
               )}
             >
               {props.purchaseOrderViewItem && props.purchaseOrderViewItem.purchaseOrder.deadline}
             </div>
-            <div className={clsx('col-span-3 grid')} />
+            <div className={clsx('col-span-2 grid')} />
           </div>
           <div className={clsx('col-span-1 grid ')} />
         </div>
diff --git a/view/next-project/src/pages/purchaseorders/index.tsx b/view/next-project/src/pages/purchaseorders/index.tsx
index d740f0e5..10995434 100644
--- a/view/next-project/src/pages/purchaseorders/index.tsx
+++ b/view/next-project/src/pages/purchaseorders/index.tsx
@@ -91,6 +91,12 @@ export default function PurchaseOrders(props: Props) {
     return datetime2;
   };
 
+  const formatDateForDeadline = (date: string) => {
+    const spilitDate = date.split('-');
+    const datetime = spilitDate[1] + '/' + spilitDate[2];
+    return datetime;
+  };
+
   const yearPeriods = props.yearPeriods;
   const [selectedYear, setSelectedYear] = useState<string>(
     yearPeriods ? String(yearPeriods[yearPeriods.length - 1].year) : String(date.getFullYear()),
@@ -215,7 +221,7 @@ export default function PurchaseOrders(props: Props) {
             </OpenAddModalButton>
           </div>
         </div>
-        <div className='w-100 mb-2 overflow-scroll p-5'>
+        <div className='w-100 mb-2 overflow-scroll p-5 md:overflow-visible'>
           <table className='mb-5 w-max table-auto border-collapse md:w-full md:table-fixed'>
             <thead>
               <tr className='border border-x-white-0 border-b-primary-1 border-t-white-0 py-3'>
@@ -293,7 +299,11 @@ export default function PurchaseOrders(props: Props) {
                       }}
                     >
                       <div className='text-center text-sm text-black-600'>
-                        {purchaseOrderViewItem.purchaseOrder.deadline}
+                        {formatDateForDeadline(
+                          purchaseOrderViewItem.purchaseOrder.deadline
+                            ? purchaseOrderViewItem.purchaseOrder.deadline
+                            : '',
+                        )}
                       </div>
                     </td>
                     <td
diff --git a/view/next-project/src/pages/purchasereports/index.tsx b/view/next-project/src/pages/purchasereports/index.tsx
index 96903869..9591824e 100644
--- a/view/next-project/src/pages/purchasereports/index.tsx
+++ b/view/next-project/src/pages/purchasereports/index.tsx
@@ -221,33 +221,27 @@ export default function PurchaseReports(props: Props) {
             <OpenAddModalButton>報告登録</OpenAddModalButton>
           </div>
         </div>
-        <div className='w-100 mb-2 overflow-scroll p-5'>
+        <div className='w-100 mb-2 overflow-scroll p-5 md:overflow-visible'>
           <table className='mb-5 w-max table-auto border-collapse md:w-full md:table-fixed'>
             <thead>
               <tr className='border border-x-white-0 border-b-primary-1 border-t-white-0 py-3'>
-                <th className='w-1/12 pb-2'></th>
-                <th className='w-1/12 pb-2'>
-                  <div className='text-center text-sm text-black-600'>ID</div>
-                </th>
-                <th className='w-2/12 border-b-primary-1 pb-2'>
+                <th className='pb-2'></th>
+                <th className='w-1/4 border-b-primary-1 pb-2'>
                   <div className='text-center text-sm text-black-600'>支出元</div>
                 </th>
                 <th className='w-1/12 border-b-primary-1 pb-2'>
                   <div className='text-center text-sm text-black-600'>報告日</div>
                 </th>
-                <th className='w-2/12 border-b-primary-1 pb-2'>
-                  <div className='text-center text-sm text-black-600'>期限日</div>
-                </th>
                 <th className='w-2/12 border-b-primary-1 pb-2'>
                   <div className='text-center text-sm text-black-600'>購入物品 (個数)</div>
                 </th>
-                <th className='w-2/12 border-b-primary-1 pb-2'>
+                <th className='w-1/12 border-b-primary-1 pb-2'>
                   <div className='text-center text-sm text-black-600'>合計金額</div>
                 </th>
                 <th className='w-2/12 border-b-primary-1 pb-2'>
                   <div className='text-center text-sm text-black-600'>備考</div>
                 </th>
-                <th className='w-2/12 border-b-primary-1 pb-2'>
+                <th className='w-1/12 border-b-primary-1 pb-2'>
                   <div className='text-center text-sm text-black-600'>購入者</div>
                 </th>
                 <th className='w-1/12 border-b-primary-1 pb-2'></th>
@@ -271,18 +265,6 @@ export default function PurchaseReports(props: Props) {
                         />
                       </div>
                     </td>
-                    <td
-                      onClick={() => {
-                        onOpen(
-                          purchaseReportViewItem.purchaseOrder.id || 0,
-                          purchaseReportViewItem,
-                        );
-                      }}
-                    >
-                      <div className='text-center text-sm text-black-600'>
-                        {purchaseReportViewItem.purchaseReport.id}
-                      </div>
-                    </td>
                     <td
                       onClick={() => {
                         onOpen(
@@ -318,18 +300,6 @@ export default function PurchaseReports(props: Props) {
                         )}
                       </div>
                     </td>
-                    <td
-                      onClick={() => {
-                        onOpen(
-                          purchaseReportViewItem.purchaseOrder.id || 0,
-                          purchaseReportViewItem,
-                        );
-                      }}
-                    >
-                      <div className='text-center text-sm text-black-600'>
-                        {purchaseReportViewItem.purchaseOrder.deadline}
-                      </div>
-                    </td>
                     <td
                       onClick={() => {
                         onOpen(
diff --git a/view/next-project/src/pages/teachers/index.tsx b/view/next-project/src/pages/teachers/index.tsx
index f139d7d6..20a09830 100644
--- a/view/next-project/src/pages/teachers/index.tsx
+++ b/view/next-project/src/pages/teachers/index.tsx
@@ -102,7 +102,7 @@ export default function TeachersList(props: Props) {
             <OpenAddModalButton departments={props.departments}>教員登録</OpenAddModalButton>
           </div>
         </div>
-        <div className='mb-2 overflow-scroll p-5'>
+        <div className='mb-2 overflow-scroll p-5 md:overflow-visible'>
           <table className='mb-5 w-max table-auto border-collapse md:w-full'>
             <thead className='text-sm text-black-600'>
               <tr className='border border-x-white-0 border-b-primary-1 border-t-white-0 py-3'>