Skip to content

운영서버 내용 최신화 #296

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

Merged
smb0123 merged 2 commits into from
Jul 24, 2025
Merged

운영서버 내용 최신화 #296

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
4728ad7
refactor: 신청 목록의 순서를 보여주는 방식 수정
smb0123 Jul 14, 2025
5f3fb57
refactor: 신청 목록의 순서를 보여주는 방식 수정 (#295)
smb0123 Jul 24, 2025
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
69 changes: 36 additions & 33 deletions service-manager/src/components/apply-list/ApplyList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,30 @@ export const ApplyList = ({ eventId }: ApplyListProps) => {
const { sectorSettingData } = useSectorQueryById(eventId);
const { onEmailTransmit } = useTransmitEmail(eventId);

const sectorFilteredRegistrations = registrations.filter(
(registration) => registration.sectorNum === selectedSector,
);

const exportXLSX = async () => {
const data = sectorSettingData
.map((sector) =>
registrations
.filter(
(registration) => registration.sectorNum === sector.sectorNumber,
)
.map((registration) =>
EXCEL_HEADERS.reduce(
(acc, header) => ({
...acc,
...getExcelCellValue(header, registration, registrations),
}),
{},
),
.map((sector) => {
const currentSectorRegistrations = registrations.filter(
(registration) => registration.sectorNum === sector.sectorNumber,
);
return currentSectorRegistrations.map((registration) =>
EXCEL_HEADERS.reduce(
(acc, header) => ({
...acc,
...getExcelCellValue(
header,
registration,
currentSectorRegistrations,
),
}),
{},
),
)
);
})
.flat();

const XLSX = await import('xlsx');
Expand Down Expand Up @@ -97,25 +104,21 @@ export const ApplyList = ({ eventId }: ApplyListProps) => {
</tr>
</thead>
<tbody className="text-center">
{registrations
.filter(
(registration) => registration.sectorNum === selectedSector,
)
.map((registration) => {
return (
<tr key={registration.id}>
{TABLE_HEADERS.map((header) => (
<td key={header.key}>
{getTableCellValue(
header.key,
registration,
registrations,
)}
</td>
))}
</tr>
);
})}
{sectorFilteredRegistrations.map((registration) => {
return (
<tr key={registration.id}>
{TABLE_HEADERS.map((header) => (
<td key={header.key}>
{getTableCellValue(
header.key,
registration,
sectorFilteredRegistrations,
)}
</td>
))}
</tr>
);
})}
</tbody>
</table>
</div>
Expand Down
20 changes: 14 additions & 6 deletions service-manager/src/functions/apply.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@ import { EXCEL_HEADERS, TABLE_HEADERS } from '../constants/apply';
const getCellValue = (
headerKey: (typeof EXCEL_HEADERS)[number]['key'],
userInfo: RegistrationResponse,
registrations: RegistrationResponse[],
sectorFilteredRegistrations: RegistrationResponse[],
) => {
switch (headerKey) {
case 'sector':
return userInfo.sectorNum;
case 'order':
return registrations.findIndex((data) => data.id === userInfo.id) + 1;
return (
sectorFilteredRegistrations.findIndex(
(data) => data.id === userInfo.id,
) + 1
);
case 'name':
return userInfo.name;
case 'affiliation':
Expand Down Expand Up @@ -38,17 +42,21 @@ const getCellValue = (
export const getTableCellValue = (
headerKey: (typeof TABLE_HEADERS)[number]['key'],
userInfo: RegistrationResponse,
registrations: RegistrationResponse[],
sectorFilteredRegistrations: RegistrationResponse[],
) => {
return getCellValue(headerKey, userInfo, registrations);
return getCellValue(headerKey, userInfo, sectorFilteredRegistrations);
};

export const getExcelCellValue = (
headerKey: (typeof EXCEL_HEADERS)[number],
userInfo: RegistrationResponse,
registrations: RegistrationResponse[],
sectorFilteredRegistrations: RegistrationResponse[],
) => {
const value = getCellValue(headerKey.key, userInfo, registrations);
const value = getCellValue(
headerKey.key,
userInfo,
sectorFilteredRegistrations,
);
return {
[headerKey.label]: value,
};
Expand Down