From d3ad0ef114a5c9f7f2ae91ad72f228085bd92e65 Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Tue, 3 Sep 2024 23:42:24 +0900
Subject: [PATCH 1/2] =?UTF-8?q?[fix]=E6=96=87=E9=9D=A2=E3=81=A8=E3=82=B9?=
 =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=AB=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 view/next-project/src/components/common/Card/Card.tsx   | 4 ++--
 view/next-project/src/pages/purchaseorders/index.tsx    | 4 ++--
 view/next-project/src/pages/purchasereports/index.tsx   | 2 +-
 view/next-project/src/pages/sponsoractivities/index.tsx | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/view/next-project/src/components/common/Card/Card.tsx b/view/next-project/src/components/common/Card/Card.tsx
index a07259dd1..a488d886f 100644
--- a/view/next-project/src/components/common/Card/Card.tsx
+++ b/view/next-project/src/components/common/Card/Card.tsx
@@ -9,10 +9,10 @@ interface Props {
 
 function Card(props: Props): JSX.Element {
   return (
-    <div className={clsx('mx-auto', props.w ? props.w : 'md:w-4/5')} onClick={props.onClick}>
+    <div className={clsx('mx-auto', props.w ? props.w : 'md:w-11/12')} onClick={props.onClick}>
       <div
         className={clsx(
-          'm-2 rounded-lg border border-black-300 border-opacity-10 px-2 shadow-md md:m-10 md:px-10',
+          'm-2 rounded-lg border border-black-300 border-opacity-10 px-2 shadow-md md:m-7 md:px-10',
         )}
       >
         {props.children}
diff --git a/view/next-project/src/pages/purchaseorders/index.tsx b/view/next-project/src/pages/purchaseorders/index.tsx
index b8a4491b1..d740f0e5c 100644
--- a/view/next-project/src/pages/purchaseorders/index.tsx
+++ b/view/next-project/src/pages/purchaseorders/index.tsx
@@ -222,8 +222,8 @@ export default function PurchaseOrders(props: Props) {
                 <th className='w-1/12 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 className='w-1/5 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>
diff --git a/view/next-project/src/pages/purchasereports/index.tsx b/view/next-project/src/pages/purchasereports/index.tsx
index 0ffa37c37..96903869d 100644
--- a/view/next-project/src/pages/purchasereports/index.tsx
+++ b/view/next-project/src/pages/purchasereports/index.tsx
@@ -230,7 +230,7 @@ export default function PurchaseReports(props: Props) {
                   <div className='text-center text-sm text-black-600'>ID</div>
                 </th>
                 <th className='w-2/12 border-b-primary-1 pb-2'>
-                  <div className='text-center text-sm text-black-600'>購入した局</div>
+                  <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>
diff --git a/view/next-project/src/pages/sponsoractivities/index.tsx b/view/next-project/src/pages/sponsoractivities/index.tsx
index 11a265038..f2db3bc14 100644
--- a/view/next-project/src/pages/sponsoractivities/index.tsx
+++ b/view/next-project/src/pages/sponsoractivities/index.tsx
@@ -249,7 +249,7 @@ export default function SponsorActivities(props: Props) {
         <meta name='viewpoinst' content='initial-scale=1.0, width=device-width' />
       </Head>
       {isLoading && <Loading />}
-      <Card w='w-full'>
+      <Card>
         <div className='mx-6 mt-10 md:mx-5'>
           <div className='gap-4 md:flex'>
             <div className='flex'>

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 2/2] =?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 8e62464bc..0ec6a35b3 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 d740f0e5c..109954344 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 96903869d..9591824e8 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 f139d7d62..20a09830a 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'>