From bd6d1f2c39b987145bda6cabdd8c1c385648fb61 Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Wed, 10 Jul 2024 21:29:45 +0900
Subject: [PATCH 1/5] =?UTF-8?q?[feat]=E8=B3=BC=E5=85=A5=E7=94=B3=E8=AB=8B?=
 =?UTF-8?q?=E3=83=A2=E3=83=BC=E3=83=80=E3=83=AB=E3=81=AE=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/purchaseorders/DetailModal.tsx  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/view/next-project/src/components/purchaseorders/DetailModal.tsx b/view/next-project/src/components/purchaseorders/DetailModal.tsx
index b74d84b84..7826c30da 100644
--- a/view/next-project/src/components/purchaseorders/DetailModal.tsx
+++ b/view/next-project/src/components/purchaseorders/DetailModal.tsx
@@ -207,14 +207,16 @@ const DetailModal: FC<ModalProps> = (props) => {
                   <td className={clsx('border-b py-3')}>
                     <div className={clsx('text-center text-sm text-black-300')}>
                       <div className={clsx('flex justify-center')}>
-                        <a
-                          className={clsx('mx-1')}
-                          href={purchaseItem.url}
-                          target='_blank'
-                          rel='noopener noreferrer'
-                        >
-                          <RiExternalLinkLine size={'16px'} />
-                        </a>
+                        {purchaseItem.url && (
+                          <a
+                            className={clsx('mx-1')}
+                            href={purchaseItem.url}
+                            target='_blank'
+                            rel='noopener noreferrer'
+                          >
+                            <RiExternalLinkLine size={'16px'} />
+                          </a>
+                        )}
                         <Tooltip text={'copy URL'}>
                           <RiFileCopyLine
                             className={clsx('mx-1')}

From 3117be8ab051e47bc8068400e48cd3e707c5382b Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Wed, 10 Jul 2024 21:30:49 +0900
Subject: [PATCH 2/5] =?UTF-8?q?[feat]=E8=B3=BC=E5=85=A5=E5=A0=B1=E5=91=8A?=
 =?UTF-8?q?=E3=83=A2=E3=83=BC=E3=83=80=E3=83=AB=E3=81=AE=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/purchasereports/DetailModal.tsx | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/view/next-project/src/components/purchasereports/DetailModal.tsx b/view/next-project/src/components/purchasereports/DetailModal.tsx
index d72bc80aa..946a0b051 100644
--- a/view/next-project/src/components/purchasereports/DetailModal.tsx
+++ b/view/next-project/src/components/purchasereports/DetailModal.tsx
@@ -182,14 +182,16 @@ const DetailModal: FC<ModalProps> = (props) => {
                   <td className='border-b py-3'>
                     <div className='text-center text-sm text-black-300'>
                       <div className='flex justify-center'>
-                        <a
-                          className='mx-1'
-                          href={purchaseItem.url}
-                          target='_blank'
-                          rel='noopener noreferrer'
-                        >
-                          <RiExternalLinkLine size={'16px'} />
-                        </a>
+                        {purchaseItem.url && (
+                          <a
+                            className='mx-1'
+                            href={purchaseItem.url}
+                            target='_blank'
+                            rel='noopener noreferrer'
+                          >
+                            <RiExternalLinkLine size={'16px'} />
+                          </a>
+                        )}
                         <Tooltip text={'copy URL'}>
                           <RiFileCopyLine
                             className='mx-1'

From ad9638a14bda85ddbb86a76d8bad1737bfd42082 Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Wed, 10 Jul 2024 21:35:30 +0900
Subject: [PATCH 3/5] =?UTF-8?q?[feat]=E8=B3=BC=E5=85=A5=E7=94=B3=E8=AB=8B?=
 =?UTF-8?q?=E3=81=AE=E4=BD=9C=E6=88=90=E3=83=BB=E7=B7=A8=E9=9B=86=E3=81=A7?=
 =?UTF-8?q?url=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=83=BB=E9=9D=9E=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/purchaseorders/EditModal.tsx   | 10 ++++++----
 .../purchaseorders/PurchaseOrderAddModal.tsx  | 20 ++++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/view/next-project/src/components/purchaseorders/EditModal.tsx b/view/next-project/src/components/purchaseorders/EditModal.tsx
index 0af7c15c2..35fbd80df 100644
--- a/view/next-project/src/components/purchaseorders/EditModal.tsx
+++ b/view/next-project/src/components/purchaseorders/EditModal.tsx
@@ -166,16 +166,18 @@ export default function EditModal(props: ModalProps) {
                 </thead>
                 <tbody>
                   {formDataList.map((data) => (
-                    <tr key={data.id} className='border-gray-300 border-b'>
+                    <tr key={data.id} className='border-gray-300 border-b text-center'>
                       <td className='py-2'>{data.item}</td>
                       <td className='py-2'>{data.price}</td>
                       <td className='py-2'>{data.quantity}</td>
                       <td className='py-2'>{data.detail}</td>
                       <td className='py-2'>
                         <div className={'flex justify-center'}>
-                          <a href={data.url} target='_blank' rel='noopener noreferrer'>
-                            <RiExternalLinkLine size={'16px'} />
-                          </a>
+                          {data.url && (
+                            <a href={data.url} target='_blank' rel='noopener noreferrer'>
+                              <RiExternalLinkLine size={'16px'} />
+                            </a>
+                          )}
                           <Tooltip text={'copy URL'}>
                             <RiFileCopyLine
                               size={'16px'}
diff --git a/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx b/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx
index fcda8252b..1bab8c232 100644
--- a/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx
+++ b/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx
@@ -209,15 +209,17 @@ export default function AddModal(props: ModalProps) {
                 )}
               >
                 <div className={clsx('text-center text-sm text-black-300')}>
-                  <div className={clsx('flex')}>
-                    <a
-                      className={clsx('mx-1')}
-                      href={purchaseItem.url}
-                      target='_blank'
-                      rel='noopener noreferrer'
-                    >
-                      <RiExternalLinkLine size={'16px'} />
-                    </a>
+                  <div className={clsx('flex justify-center')}>
+                    {purchaseItem.url && (
+                      <a
+                        className={clsx('mx-1')}
+                        href={purchaseItem.url}
+                        target='_blank'
+                        rel='noopener noreferrer'
+                      >
+                        <RiExternalLinkLine size={'16px'} />
+                      </a>
+                    )}
                     <Tooltip text={'copy URL'}>
                       <RiFileCopyLine
                         className={clsx('mx-1')}

From c4ea8a4867fae89c53ad7d2e4f1971978f2d6ef7 Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Wed, 10 Jul 2024 21:51:42 +0900
Subject: [PATCH 4/5] =?UTF-8?q?[feat]=E8=B3=BC=E5=85=A5=E5=A0=B1=E5=91=8A?=
 =?UTF-8?q?=E7=99=BB=E9=8C=B2=E6=99=82=E3=81=AE=E7=A2=BA=E8=AA=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseReportConfirmModal.tsx            | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/view/next-project/src/components/purchasereports/PurchaseReportConfirmModal.tsx b/view/next-project/src/components/purchasereports/PurchaseReportConfirmModal.tsx
index dfb5f02d2..8331acdc7 100644
--- a/view/next-project/src/components/purchasereports/PurchaseReportConfirmModal.tsx
+++ b/view/next-project/src/components/purchasereports/PurchaseReportConfirmModal.tsx
@@ -96,15 +96,17 @@ export default function PurchaseItemNumModal(props: ModalProps) {
                 )}
               >
                 <div className='text-center text-sm text-black-300'>
-                  <div className='flex'>
-                    <a
-                      className='mx-1'
-                      href={purchaseItem.url}
-                      target='_blank'
-                      rel='noopener noreferrer'
-                    >
-                      <RiExternalLinkLine size={'16px'} />
-                    </a>
+                  <div className='flex justify-center'>
+                    {purchaseItem.url && (
+                      <a
+                        className='mx-1'
+                        href={purchaseItem.url}
+                        target='_blank'
+                        rel='noopener noreferrer'
+                      >
+                        <RiExternalLinkLine size={'16px'} />
+                      </a>
+                    )}
                     <Tooltip text={'copy URL'}>
                       <RiFileCopyLine
                         className='mx-1'

From 7e5d4e9cfd846e8b73b1e7f57928a014e7df39ba Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Fri, 12 Jul 2024 13:34:21 +0900
Subject: [PATCH 5/5] =?UTF-8?q?[fix]=E3=82=B3=E3=83=94=E3=83=BC=E3=83=9C?=
 =?UTF-8?q?=E3=82=BF=E3=83=B3=E3=82=82=E9=9D=9E=E8=A1=A8=E7=A4=BA=E3=81=AB?=
 =?UTF-8?q?=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/purchaseorders/DetailModal.tsx | 26 +++++++++---------
 .../components/purchaseorders/EditModal.tsx   | 27 ++++++++++---------
 .../purchaseorders/PurchaseOrderAddModal.tsx  | 26 +++++++++---------
 .../purchasereports/DetailModal.tsx           | 26 +++++++++---------
 .../PurchaseReportConfirmModal.tsx            | 26 +++++++++---------
 5 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/view/next-project/src/components/purchaseorders/DetailModal.tsx b/view/next-project/src/components/purchaseorders/DetailModal.tsx
index 7826c30da..8e62464bc 100644
--- a/view/next-project/src/components/purchaseorders/DetailModal.tsx
+++ b/view/next-project/src/components/purchaseorders/DetailModal.tsx
@@ -206,8 +206,8 @@ const DetailModal: FC<ModalProps> = (props) => {
                   </td>
                   <td className={clsx('border-b py-3')}>
                     <div className={clsx('text-center text-sm text-black-300')}>
-                      <div className={clsx('flex justify-center')}>
-                        {purchaseItem.url && (
+                      {purchaseItem.url && (
+                        <div className={clsx('flex justify-center')}>
                           <a
                             className={clsx('mx-1')}
                             href={purchaseItem.url}
@@ -216,17 +216,17 @@ const DetailModal: FC<ModalProps> = (props) => {
                           >
                             <RiExternalLinkLine size={'16px'} />
                           </a>
-                        )}
-                        <Tooltip text={'copy URL'}>
-                          <RiFileCopyLine
-                            className={clsx('mx-1')}
-                            size={'16px'}
-                            onClick={() => {
-                              navigator.clipboard.writeText(purchaseItem.url);
-                            }}
-                          />
-                        </Tooltip>
-                      </div>
+                          <Tooltip text={'copy URL'}>
+                            <RiFileCopyLine
+                              className={clsx('mx-1')}
+                              size={'16px'}
+                              onClick={() => {
+                                navigator.clipboard.writeText(purchaseItem.url);
+                              }}
+                            />
+                          </Tooltip>
+                        </div>
+                      )}
                     </div>
                   </td>
                   {user.roleID === 3 ? (
diff --git a/view/next-project/src/components/purchaseorders/EditModal.tsx b/view/next-project/src/components/purchaseorders/EditModal.tsx
index 35fbd80df..8c54a0d4d 100644
--- a/view/next-project/src/components/purchaseorders/EditModal.tsx
+++ b/view/next-project/src/components/purchaseorders/EditModal.tsx
@@ -172,22 +172,23 @@ export default function EditModal(props: ModalProps) {
                       <td className='py-2'>{data.quantity}</td>
                       <td className='py-2'>{data.detail}</td>
                       <td className='py-2'>
-                        <div className={'flex justify-center'}>
-                          {data.url && (
+                        {data.url && (
+                          <div className={'flex justify-center'}>
                             <a href={data.url} target='_blank' rel='noopener noreferrer'>
                               <RiExternalLinkLine size={'16px'} />
                             </a>
-                          )}
-                          <Tooltip text={'copy URL'}>
-                            <RiFileCopyLine
-                              size={'16px'}
-                              className='cursor-pointer'
-                              onClick={() => {
-                                navigator.clipboard.writeText(data.url);
-                              }}
-                            />
-                          </Tooltip>
-                        </div>
+
+                            <Tooltip text={'copy URL'}>
+                              <RiFileCopyLine
+                                size={'16px'}
+                                className='cursor-pointer'
+                                onClick={() => {
+                                  navigator.clipboard.writeText(data.url);
+                                }}
+                              />
+                            </Tooltip>
+                          </div>
+                        )}
                       </td>
                     </tr>
                   ))}
diff --git a/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx b/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx
index 1bab8c232..2cccd5908 100644
--- a/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx
+++ b/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx
@@ -209,8 +209,8 @@ export default function AddModal(props: ModalProps) {
                 )}
               >
                 <div className={clsx('text-center text-sm text-black-300')}>
-                  <div className={clsx('flex justify-center')}>
-                    {purchaseItem.url && (
+                  {purchaseItem.url && (
+                    <div className={clsx('flex justify-center')}>
                       <a
                         className={clsx('mx-1')}
                         href={purchaseItem.url}
@@ -219,17 +219,17 @@ export default function AddModal(props: ModalProps) {
                       >
                         <RiExternalLinkLine size={'16px'} />
                       </a>
-                    )}
-                    <Tooltip text={'copy URL'}>
-                      <RiFileCopyLine
-                        className={clsx('mx-1')}
-                        size={'16px'}
-                        onClick={() => {
-                          navigator.clipboard.writeText(purchaseItem.url);
-                        }}
-                      />
-                    </Tooltip>
-                  </div>
+                      <Tooltip text={'copy URL'}>
+                        <RiFileCopyLine
+                          className={clsx('mx-1')}
+                          size={'16px'}
+                          onClick={() => {
+                            navigator.clipboard.writeText(purchaseItem.url);
+                          }}
+                        />
+                      </Tooltip>
+                    </div>
+                  )}
                 </div>
               </td>
             </tr>
diff --git a/view/next-project/src/components/purchasereports/DetailModal.tsx b/view/next-project/src/components/purchasereports/DetailModal.tsx
index 946a0b051..a53d5a575 100644
--- a/view/next-project/src/components/purchasereports/DetailModal.tsx
+++ b/view/next-project/src/components/purchasereports/DetailModal.tsx
@@ -181,8 +181,8 @@ const DetailModal: FC<ModalProps> = (props) => {
                   </td>
                   <td className='border-b py-3'>
                     <div className='text-center text-sm text-black-300'>
-                      <div className='flex justify-center'>
-                        {purchaseItem.url && (
+                      {purchaseItem.url && (
+                        <div className='flex justify-center'>
                           <a
                             className='mx-1'
                             href={purchaseItem.url}
@@ -191,17 +191,17 @@ const DetailModal: FC<ModalProps> = (props) => {
                           >
                             <RiExternalLinkLine size={'16px'} />
                           </a>
-                        )}
-                        <Tooltip text={'copy URL'}>
-                          <RiFileCopyLine
-                            className='mx-1'
-                            size={'16px'}
-                            onClick={() => {
-                              navigator.clipboard.writeText(purchaseItem.url);
-                            }}
-                          />
-                        </Tooltip>
-                      </div>
+                          <Tooltip text={'copy URL'}>
+                            <RiFileCopyLine
+                              className='mx-1'
+                              size={'16px'}
+                              onClick={() => {
+                                navigator.clipboard.writeText(purchaseItem.url);
+                              }}
+                            />
+                          </Tooltip>
+                        </div>
+                      )}
                     </div>
                   </td>
                   <td className='border-b py-3'>
diff --git a/view/next-project/src/components/purchasereports/PurchaseReportConfirmModal.tsx b/view/next-project/src/components/purchasereports/PurchaseReportConfirmModal.tsx
index 8331acdc7..17e5cd539 100644
--- a/view/next-project/src/components/purchasereports/PurchaseReportConfirmModal.tsx
+++ b/view/next-project/src/components/purchasereports/PurchaseReportConfirmModal.tsx
@@ -96,8 +96,8 @@ export default function PurchaseItemNumModal(props: ModalProps) {
                 )}
               >
                 <div className='text-center text-sm text-black-300'>
-                  <div className='flex justify-center'>
-                    {purchaseItem.url && (
+                  {purchaseItem.url && (
+                    <div className='flex justify-center'>
                       <a
                         className='mx-1'
                         href={purchaseItem.url}
@@ -106,17 +106,17 @@ export default function PurchaseItemNumModal(props: ModalProps) {
                       >
                         <RiExternalLinkLine size={'16px'} />
                       </a>
-                    )}
-                    <Tooltip text={'copy URL'}>
-                      <RiFileCopyLine
-                        className='mx-1'
-                        size={'16px'}
-                        onClick={() => {
-                          navigator.clipboard.writeText(purchaseItem.url);
-                        }}
-                      />
-                    </Tooltip>
-                  </div>
+                      <Tooltip text={'copy URL'}>
+                        <RiFileCopyLine
+                          className='mx-1'
+                          size={'16px'}
+                          onClick={() => {
+                            navigator.clipboard.writeText(purchaseItem.url);
+                          }}
+                        />
+                      </Tooltip>
+                    </div>
+                  )}
                 </div>
               </td>
             </tr>