Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

協賛活動、学内募金の表示をupdated_atの降順にした #783

Merged
merged 2 commits into from
Jun 27, 2024
Merged

協賛活動、学内募金の表示をupdated_atの降順にした #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50e74e8
[fix] updated_atの降順で取得するように変更
hikahana Jun 17, 2024
96ffc56
[fix] フィルターのデフォルトを更新日時降順に修正
hikahana Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/externals/repository/activity_repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion api/externals/repository/fund_information_repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
34 changes: 17 additions & 17 deletions view/next-project/src/pages/sponsoractivities/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
Expand Down Expand Up @@ -278,12 +278,12 @@ export default function SponsorActivities(props: Props) {
defaultValue={'default'}
onChange={(e) => setSelectedSort(e.target.value)}
>
<option value='default'>作成日時昇順</option>
<option value='createDesSort'>作成日時降順</option>
<option value='default'>更新日時降順</option>
<option value='updateSort'>更新日時昇順</option>
<option value='updateDesSort'>更新日時降順</option>
<option value='priceSort'>協賛金昇順</option>
<option value='createDesSort'>作成日時降順</option>
<option value='createSort'>作成日時昇順</option>
<option value='priceDesSort'>協賛金降順</option>
<option value='priceSort'>協賛金昇順</option>
</select>
<PrimaryButton
className='hidden md:block'
Expand Down
Loading