From 50e74e8a995052fd9d9e15444f7e4da8c41380ef Mon Sep 17 00:00:00 2001
From: hikahana <22.h.hanada.nutfes@gmail.com>
Date: Mon, 17 Jun 2024 04:48:02 +0000
Subject: [PATCH 1/2] =?UTF-8?q?[fix]=20updated=5Fat=E3=81=AE=E9=99=8D?=
=?UTF-8?q?=E9=A0=86=E3=81=A7=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8B=E3=82=88?=
=?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/externals/repository/activity_repository.go | 2 +-
api/externals/repository/fund_information_repository.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/api/externals/repository/activity_repository.go b/api/externals/repository/activity_repository.go
index 304208bc8..e70a9a002 100644
--- a/api/externals/repository/activity_repository.go
+++ b/api/externals/repository/activity_repository.go
@@ -181,7 +181,7 @@ func (ar *activityRepository) AllDetailsByPeriod(c context.Context, year string)
year_periods.year_id = years.id
WHERE
years.year = ` + year +
- " ORDER BY activities.id"
+ " ORDER BY activities.updated_at DESC"
return ar.crud.Read(c, query)
}
diff --git a/api/externals/repository/fund_information_repository.go b/api/externals/repository/fund_information_repository.go
index 8eb67305c..561ac3ae6 100644
--- a/api/externals/repository/fund_information_repository.go
+++ b/api/externals/repository/fund_information_repository.go
@@ -198,6 +198,6 @@ func (fir *fundInformationRepository) AllDetailsByPeriod(c context.Context, year
year_periods.year_id = years.id
WHERE
years.year = ` + year +
- " ORDER BY fund_informations.id;"
+ " ORDER BY fund_informations.updated_at DESC;"
return fir.crud.Read(c, query)
}
From 96ffc56bc124723a3145dfaeb0c6c608feb91b6e Mon Sep 17 00:00:00 2001
From: hikahana <22.h.hanada.nutfes@gmail.com>
Date: Mon, 17 Jun 2024 05:24:05 +0000
Subject: [PATCH 2/2] =?UTF-8?q?[fix]=20=E3=83=95=E3=82=A3=E3=83=AB?=
=?UTF-8?q?=E3=82=BF=E3=83=BC=E3=81=AE=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB?=
=?UTF-8?q?=E3=83=88=E3=82=92=E6=9B=B4=E6=96=B0=E6=97=A5=E6=99=82=E9=99=8D?=
=?UTF-8?q?=E9=A0=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/pages/sponsoractivities/index.tsx | 34 +++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/view/next-project/src/pages/sponsoractivities/index.tsx b/view/next-project/src/pages/sponsoractivities/index.tsx
index ec8d8d164..90e33e0d7 100644
--- a/view/next-project/src/pages/sponsoractivities/index.tsx
+++ b/view/next-project/src/pages/sponsoractivities/index.tsx
@@ -144,36 +144,36 @@ export default function SponsorActivities(props: Props) {
}
switch (selectedSort) {
- case 'createDesSort':
+ case 'updateSort':
if (!Array.isArray(filteredActivities)) {
return [];
}
return [...filteredActivities].sort(
(firstObject: SponsorActivityView, secondObject: SponsorActivityView) =>
- new Date(firstObject.sponsorActivity.createdAt || 0).getTime() >
- new Date(secondObject.sponsorActivity.createdAt || 0).getTime()
- ? -1
- : 1,
+ new Date(firstObject.sponsorActivity.updatedAt || 0).getTime() >
+ new Date(secondObject.sponsorActivity.updatedAt || 0).getTime()
+ ? 1
+ : -1,
);
- case 'updateSort':
+ case 'createSort':
if (!Array.isArray(filteredActivities)) {
return [];
}
return [...filteredActivities].sort(
(firstObject: SponsorActivityView, secondObject: SponsorActivityView) =>
- new Date(firstObject.sponsorActivity.updatedAt || 0).getTime() >
- new Date(secondObject.sponsorActivity.updatedAt || 0).getTime()
- ? 1
- : -1,
+ new Date(firstObject.sponsorActivity.createdAt || 0).getTime() <
+ new Date(secondObject.sponsorActivity.createdAt || 0).getTime()
+ ? -1
+ : 1,
);
- case 'updateDesSort':
+ case 'createDesSort':
if (!Array.isArray(filteredActivities)) {
return [];
}
return [...filteredActivities].sort(
(firstObject: SponsorActivityView, secondObject: SponsorActivityView) =>
- new Date(firstObject.sponsorActivity.updatedAt || 0).getTime() >
- new Date(secondObject.sponsorActivity.updatedAt || 0).getTime()
+ new Date(firstObject.sponsorActivity.createdAt || 0).getTime() >
+ new Date(secondObject.sponsorActivity.createdAt || 0).getTime()
? -1
: 1,
);
@@ -278,12 +278,12 @@ export default function SponsorActivities(props: Props) {
defaultValue={'default'}
onChange={(e) => setSelectedSort(e.target.value)}
>
-
-
+
-
-
+
+
+