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

[회비 납부] 미납 횟수 순서 정렬 추가 #161

Merged
merged 3 commits into from
Apr 7, 2024
Merged

[회비 납부] 미납 횟수 순서 정렬 추가 #161

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da3a33c
feat: 미납 횟수순 정렬 추가
dooohun Apr 6, 2024
764cb0e
style: 오름차순 내림차순 화살표 방향을 반대로 수정
dooohun Apr 6, 2024
23f7d9d
Merge branch 'main' into feature/#152-sort-by-missed-payments
dooohun Apr 7, 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
87 changes: 77 additions & 10 deletions src/page/DuesManagement/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ import { useGetMembers } from 'query/members';
import { useSnackBar } from 'ts/useSnackBar';
import * as S from './style';

interface SortAnchorEl {
name: null | HTMLElement;
unpaidCount: null | HTMLElement;
}

function DefaultTable() {
const navigate = useNavigate();
const page = useQueryParam('page', 'number') as number | null;
Expand All @@ -35,7 +40,10 @@ function DefaultTable() {
const [name, setName] = useState('');
const [detail, setDetail] = useState<DuesDetail>({ month: 0, status: null });
const [memoAnchorEl, setMemoAnchorEl] = useState<null | HTMLElement>(null);
const [sortAnchorEl, setSortAnchorEl] = useState<null | HTMLElement>(null);
const [sortAnchorEl, setSortAnchorEl] = useState<SortAnchorEl>({
name: null,
unpaidCount: null,
});
const memoPopOverOpen = Boolean(memoAnchorEl);
const {
value: isFilterModalOpen,
Expand Down Expand Up @@ -91,12 +99,36 @@ function DefaultTable() {

const sortInAscendingOrderByName = () => {
setFilteredValue((prevValue) => prevValue.sort((a, b) => a.name.localeCompare(b.name)));
setSortAnchorEl(null);
setSortAnchorEl((prev) => ({ ...prev, name: null }));
};

const sortInDescendingOrderByName = () => {
setFilteredValue((prevValue) => prevValue.sort((a, b) => b.name.localeCompare(a.name)));
setSortAnchorEl(null);
setSortAnchorEl((prev) => ({ ...prev, name: null }));
};

const sortInAscendingOrderByUnpaidCount = () => {
setFilteredValue((prevValue) => prevValue.sort((a, b) => {
if (a.unpaidCount > b.unpaidCount) return 1;
if (a.unpaidCount < b.unpaidCount) return -1;

if (a.name.localeCompare(b.name) > 0) return 1;
if (a.name.localeCompare(b.name) < 0) return -1;
return 0;
}));
dooohun marked this conversation as resolved.
Show resolved Hide resolved
setSortAnchorEl((prev) => ({ ...prev, unpaidCount: null }));
};

const sortInDescendingOrderByUnpaidCount = () => {
setFilteredValue((prevValue) => prevValue.sort((a, b) => {
if (a.unpaidCount < b.unpaidCount) return 1;
if (a.unpaidCount > b.unpaidCount) return -1;

if (a.name.localeCompare(b.name) > 0) return 1;
if (a.name.localeCompare(b.name) < 0) return -1;
return 0;
}));
setSortAnchorEl((prev) => ({ ...prev, unpaidCount: null }));
};

const handleMemoClick = (e: React.MouseEvent<HTMLTableCellElement>, dueDetail: DuesDetail) => {
Expand Down Expand Up @@ -199,22 +231,57 @@ function DefaultTable() {
</Modal>
</div>
</TableCell>
<TableCell css={S.tableHeader}>미납 횟수</TableCell>
<TableCell css={S.tableHeader}>
<span>미납 횟수</span>
<Button
type="button"
onClick={(e) => setSortAnchorEl((prev) => ({ ...prev, unpaidCount: e.currentTarget }))}
css={S.filterModalButton}
>
<Sort css={S.sortLogo} />
</Button>
<Popover
id="simple-popover"
open={Boolean(sortAnchorEl.unpaidCount)}
anchorEl={sortAnchorEl.unpaidCount}
onClose={() => setSortAnchorEl((prev) => ({ ...prev, unpaidCount: null }))}
anchorOrigin={{
vertical: 'bottom',
horizontal: 'left',
}}
>
<div css={S.sortPopover}>
<h3>
미납 횟수순 정렬
</h3>
<div css={S.sortPopoverButtonGroup}>
<Button variant="contained" color="primary" onClick={sortInAscendingOrderByUnpaidCount}>
<ArrowUpward />
오름차순
</Button>
<Button variant="contained" color="primary" onClick={sortInDescendingOrderByUnpaidCount}>
<ArrowDownward />
내림차순
</Button>
</div>
</div>
</Popover>
</TableCell>
<TableCell css={S.tableHeader}>
<div css={S.nameTableCell}>
<span>이름</span>
<Button
type="button"
onClick={(e) => setSortAnchorEl(e.currentTarget)}
onClick={(e) => setSortAnchorEl((prev) => ({ ...prev, name: e.currentTarget }))}
css={S.filterModalButton}
>
<Sort css={S.sortLogo} />
</Button>
<Popover
id="simple-popover"
open={Boolean(sortAnchorEl)}
anchorEl={sortAnchorEl}
onClose={() => setSortAnchorEl(null)}
open={Boolean(sortAnchorEl.name)}
anchorEl={sortAnchorEl.name}
onClose={() => setSortAnchorEl((prev) => ({ ...prev, name: null }))}
anchorOrigin={{
vertical: 'bottom',
horizontal: 'left',
Expand All @@ -226,11 +293,11 @@ function DefaultTable() {
</h3>
<div css={S.sortPopoverButtonGroup}>
<Button variant="contained" color="primary" onClick={sortInAscendingOrderByName}>
<ArrowDownward />
<ArrowUpward />
오름차순
</Button>
<Button variant="contained" color="primary" onClick={sortInDescendingOrderByName}>
<ArrowUpward />
<ArrowDownward />
내림차순
</Button>
</div>
Expand Down
88 changes: 78 additions & 10 deletions src/page/EditDues/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ import * as S from './style';

type Status = 'PAID' | 'NOT_PAID' | 'SKIP' | 'NONE';

interface SortAnchorEl {
name: null | HTMLElement;
unpaidCount: null | HTMLElement;
}

function DefaultTable() {
const navigate = useNavigate();
const page = useQueryParam('page', 'number') as number | null;
Expand All @@ -55,7 +60,10 @@ function DefaultTable() {
memo: '',
});
const [status, setStatus] = useState<Status>('PAID');
const [sortAnchorEl, setSortAnchorEl] = useState<null | HTMLElement>(null);
const [sortAnchorEl, setSortAnchorEl] = useState<SortAnchorEl>({
name: null,
unpaidCount: null,
});

const openSnackBar = useSnackBar();

Expand Down Expand Up @@ -188,15 +196,40 @@ function DefaultTable() {
setFilteredValue((prev) => {
return prev.sort((a, b) => a.name.localeCompare(b.name));
});
setSortAnchorEl(null);
setSortAnchorEl((prev) => ({ ...prev, name: null }));
};

const sortInDescendingOrderByName = () => {
setFilteredValue((prev) => {
return prev.sort((a, b) => b.name.localeCompare(a.name));
});
setSortAnchorEl(null);
setSortAnchorEl((prev) => ({ ...prev, name: null }));
};

const sortInAscendingOrderByUnpaidCount = () => {
setFilteredValue((prevValue) => prevValue.sort((a, b) => {
if (a.unpaidCount > b.unpaidCount) return 1;
if (a.unpaidCount < b.unpaidCount) return -1;

if (a.name.localeCompare(b.name) > 0) return 1;
if (a.name.localeCompare(b.name) < 0) return -1;
return 0;
}));
setSortAnchorEl((prev) => ({ ...prev, unpaidCount: null }));
};

const sortInDescendingOrderByUnpaidCount = () => {
setFilteredValue((prevValue) => prevValue.sort((a, b) => {
if (a.unpaidCount < b.unpaidCount) return 1;
if (a.unpaidCount > b.unpaidCount) return -1;

if (a.name.localeCompare(b.name) > 0) return 1;
if (a.name.localeCompare(b.name) < 0) return -1;
return 0;
}));
setSortAnchorEl((prev) => ({ ...prev, unpaidCount: null }));
};

return (
<>
<div css={S.searchAndPagination}>
Expand Down Expand Up @@ -264,22 +297,57 @@ function DefaultTable() {
</Modal>
</div>
</TableCell>
<TableCell css={S.tableHeader}>미납 횟수</TableCell>
<TableCell css={S.tableHeader}>
<span>미납 횟수</span>
<Button
type="button"
onClick={(e) => setSortAnchorEl((prev) => ({ ...prev, unpaidCount: e.currentTarget }))}
css={S.filterModalButton}
>
<Sort css={S.sortLogo} />
</Button>
<Popover
id="simple-popover"
open={Boolean(sortAnchorEl.unpaidCount)}
anchorEl={sortAnchorEl.unpaidCount}
onClose={() => setSortAnchorEl((prev) => ({ ...prev, unpaidCount: null }))}
anchorOrigin={{
vertical: 'bottom',
horizontal: 'left',
}}
>
<div css={S.sortPopover}>
<h3>
미납 횟수순 정렬
</h3>
<div css={S.sortPopoverButtonGroup}>
<Button variant="contained" color="primary" onClick={sortInAscendingOrderByUnpaidCount}>
<ArrowUpward />
오름차순
</Button>
<Button variant="contained" color="primary" onClick={sortInDescendingOrderByUnpaidCount}>
<ArrowDownward />
내림차순
</Button>
</div>
</div>
</Popover>
</TableCell>
<TableCell css={S.tableHeader}>
<div css={S.nameTableCell}>
<span>이름</span>
<Button
type="button"
onClick={(e) => setSortAnchorEl(e.currentTarget)}
onClick={(e) => setSortAnchorEl((prev) => ({ ...prev, name: e.currentTarget }))}
css={S.filterModalButton}
>
<Sort css={S.sortLogo} />
</Button>
<Popover
id="simple-popover"
open={Boolean(sortAnchorEl)}
anchorEl={sortAnchorEl}
onClose={() => setSortAnchorEl(null)}
open={Boolean(sortAnchorEl.name)}
anchorEl={sortAnchorEl.name}
onClose={() => setSortAnchorEl((prev) => ({ ...prev, name: null }))}
anchorOrigin={{
vertical: 'bottom',
horizontal: 'left',
Expand All @@ -291,11 +359,11 @@ function DefaultTable() {
</h3>
<div css={S.sortPopoverButtonGroup}>
<Button variant="contained" color="primary" onClick={sortInAscendingOrderByName}>
<ArrowDownward />
<ArrowUpward />
오름차순
</Button>
<Button variant="contained" color="primary" onClick={sortInDescendingOrderByName}>
<ArrowUpward />
<ArrowDownward />
내림차순
</Button>
</div>
Expand Down
Loading