バグ修正

NUTFes · Jul 7, 2024 · 4962666 · 4962666
1 parent f14314b
commit 4962666
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       RESET_PASSWORD_URL: "http://localhost:3000/reset_password"
     #シェルスクリプトを実行するコマンド
     command: "./start.sh"
-    env_file: ["./finansu.env"]
+    env_file: ["./finansu.local.env"]
     ports:
       - "1323:1323"
     stdin_open: true

diff --git a/view/next-project/src/components/sponsoractivities/FilterModal.tsx b/view/next-project/src/components/sponsoractivities/FilterModal.tsx
@@ -126,7 +126,7 @@ const FilterModal: FC<ModalProps> = (props) => {
                 </div>
               </div>
             </div>
-            <p className='col-span-2 text-black-600'>回収有無</p>
+            <p className='col-span-2 text-black-600'>協賛金回収状況</p>
             <div className='col-span-2 w-full'>
               <Select
                 defaultValue={draftFilterData.isDone}

diff --git a/view/next-project/src/pages/sponsoractivities/index.tsx b/view/next-project/src/pages/sponsoractivities/index.tsx
@@ -103,6 +103,25 @@ export default function SponsorActivities(props: Props) {
   };
 
   const getSponsorActivities = async () => {
+    if (isFiltered) {
+      const getSponsorActivitiesViewUrlByYear =
+        process.env.CSR_API_URI + '/activities/filtered_details/' + selectedYear;
+      const getFilterSponsorActivitiesByYears = await getByFiler(
+        getSponsorActivitiesViewUrlByYear,
+        filterData.isDone,
+        filterData.styleIds,
+        filterData.keyword,
+        sponsorStyles.length,
+      );
+      setSponsorActivities(getFilterSponsorActivitiesByYears);
+    } else {
+      console.log('notFiltered');
+      const getSponsorActivitiesViewUrlByYear =
+        process.env.CSR_API_URI + '/activities/details/' + selectedYear;
+      const getSponsorActivitiesByYears = await get(getSponsorActivitiesViewUrlByYear);
+      setSponsorActivities(getSponsorActivitiesByYears);
+    }
+
     const getSponsorActivitiesViewUrlByYear =
       process.env.CSR_API_URI + '/activities/filtered_details/' + selectedYear;
     const getFilterSponsorActivitiesByYears = await getByFiler(
@@ -207,10 +226,6 @@ export default function SponsorActivities(props: Props) {
     return totalFee;
   }, [sortedSponsorActivitiesViews]);
 
-  useEffect(() => {
-    getSponsorActivities();
-  }, [filterData, selectedYear]);
-
   const isFiltered = useMemo(() => {
     const isStyleFilter = sponsorStyles.length !== filterData.styleIds.length;
     const isDonefilter = filterData.isDone !== 'all';
@@ -219,6 +234,10 @@ export default function SponsorActivities(props: Props) {
     return isStyleFilter || isDonefilter || isKeywordFilter || isSorted;
   }, [filterData]);
 
+  useEffect(() => {
+    getSponsorActivities();
+  }, [filterData, selectedYear]);
+
   return (
     <MainLayout>
       <Head>
@@ -256,7 +275,7 @@ export default function SponsorActivities(props: Props) {
                   <MdFilterList size='22' color='#666666' />
                 </button>
                 {isFiltered && (
-                  <div className='fixed -mt-5 ml-6'>
+                  <div className='absolute -mt-5 ml-6'>
                     <MdCircle color='rgb(4 102 140)' size={6} />
                   </div>
                 )}