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.

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

add partial approve related logic in funding detail frame #1403

Merged
merged 2 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
105 changes: 105 additions & 0 deletions packages/web/src/common/components/PartialApproveReasonToast.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
import React from "react";

import styled from "styled-components";

import colors from "@sparcs-clubs/web/styles/themes/colors";
import { formatDotDetailDate } from "@sparcs-clubs/web/utils/Date/formatDate";

import FlexWrapper from "./FlexWrapper";
import Icon from "./Icon";

import Typography from "./Typography";

interface Reason {
datetime: Date;
reason: React.ReactNode;
}

interface PartialApproveReasonToastProps {
title: string;
reasons: Reason[];
}

const ForceBorderRadius = styled.div`
position: sticky;
top: 0px;
border-radius: 8px;
width: 100%;
overflow: hidden;
border: 1px solid ${({ theme }) => theme.colors.GREEN[600]};
background: ${({ theme }) => theme.colors.GREEN[100]};
z-index: ${({ theme }) => theme.zIndices.toast};
`;

const PartialApproveReasonToastInner = styled.div`
color: ${({ theme }) => theme.colors.BLACK};
display: flex;
flex-direction: column;
align-items: flex-start;
gap: 8px;
width: 100%;
max-height: 300px;
overflow-y: auto;

.PartialApproveReasonToast-title {
padding: 12px 16px 0 16px;

position: sticky;
top: 0;
display: flex;
align-items: center;
gap: 8px;
background: ${({ theme }) => theme.colors.GREEN[100]};
z-index: ${({ theme }) => theme.zIndices.toast + 1};
}

.PartialApproveReasonToast-reasons {
display: flex;
width: 100%;
padding: 0 16px 12px 44px;
flex-direction: column;
gap: 8px;
flex: 1 0 0;
}

.PartialApproveReasonToast-sticky-title {
position: sticky;
top: 0;
background: ${({ theme }) => theme.colors.GREEN[100]};
z-index: ${({ theme }) => theme.zIndices.toast + 1};
}
`;

const PartialApproveReasonToast: React.FC<PartialApproveReasonToastProps> = ({
title,
reasons,
}) => (
<ForceBorderRadius>
<PartialApproveReasonToastInner>
<div className="PartialApproveReasonToast-title">
<Icon type="error" size={20} color={colors.GREEN[600]} />
<Typography fs={16} lh={24} fw="MEDIUM">
{title}
</Typography>
</div>
<div className="PartialApproveReasonToast-reasons">
{reasons.map(reason => (
<FlexWrapper
direction="column"
gap={4}
key={formatDotDetailDate(reason.datetime)}
>
<Typography fs={14} lh={16} fw="REGULAR" color="GRAY.600">
{formatDotDetailDate(reason.datetime)}
</Typography>
<Typography fs={16} lh={24} fw="REGULAR">
{reason.reason}
</Typography>
</FlexWrapper>
))}
</div>
</PartialApproveReasonToastInner>
</ForceBorderRadius>
);

export default PartialApproveReasonToast;
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ const getFundingProgress = (
},
],
};
// TODO. 부분 승인 케이스 수정 필요
case FundingStatusEnum.Partial:
return {
labels: ["신청 완료", "동아리 연합회 부분 승인"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import Card from "@sparcs-clubs/web/common/components/Card";
import FlexWrapper from "@sparcs-clubs/web/common/components/FlexWrapper";
import Modal from "@sparcs-clubs/web/common/components/Modal";
import CancellableModalContent from "@sparcs-clubs/web/common/components/Modal/CancellableModalContent";
import PartialApproveReasonToast from "@sparcs-clubs/web/common/components/PartialApproveReasonToast";
import ProgressStatus from "@sparcs-clubs/web/common/components/ProgressStatus";
import RejectReasonToast from "@sparcs-clubs/web/common/components/RejectReasonToast";

Expand Down Expand Up @@ -135,7 +136,6 @@ const FundingDetailFrame: React.FC<FundingDetailFrameProps> = ({ clubId }) => {
<FlexWrapper direction="column" gap={40}>
<Card outline>
{!isPastFunding && (
// TODO. 부분 승인 케이스 추가
<ProgressStatus
labels={
getFundingProgress(
Expand All @@ -153,15 +153,24 @@ const FundingDetailFrame: React.FC<FundingDetailFrameProps> = ({ clubId }) => {
}
optional={
funding.comments &&
funding.comments.length > 0 && (
funding.comments.length > 0 &&
(funding.fundingStatusEnum === FundingStatusEnum.Partial ? (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

funding.comments[].fundingStatusEnum을 봐야하지 않을까요?
댓글이 여러개일때 어떤건 반려, 어떤건 부분승인 일수 있을거 같음. 그리고 지원금 쪽은 승인도 댓글 달 수 있을걸.? @Gerbera3090 확인 필요

<PartialApproveReasonToast
title="부분 승인 사유"
reasons={funding.comments.map(comment => ({
datetime: comment.createdAt,
reason: comment.content,
}))}
/>
) : (
<RejectReasonToast
title="반려 사유"
reasons={funding.comments.map(comment => ({
datetime: comment.createdAt,
reason: comment.content,
}))}
/>
)
))
}
/>
)}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import apiFnd002, {
ApiFnd002ResponseOk,
} from "@sparcs-clubs/interface/api/funding/endpoint/apiFnd002";
import { FundingStatusEnum } from "@sparcs-clubs/interface/common/enum/funding.enum";
import { useQuery } from "@tanstack/react-query";

import {
Expand All @@ -26,5 +27,96 @@ export const useGetFunding = (fundingId: number) =>
});

defineAxiosMock(mock => {
mock.onGet(apiFnd002.url(1)).reply(() => [200, {}]);
const fundingStatus = FundingStatusEnum.Partial;
const mockFundingDetail = {
id: 1,
club: {
id: 112,
},
activityD: {
id: 5,
},
fundingStatusEnum: fundingStatus,
purposeActivity: {
id: 3335,
activityStatusEnum: 2,
activityTypeEnum: 1,
club: {
id: 112,
name: "술박스",
},
name: "ffsgdgfd",
commentedAt: null,
editedAt: "2025-01-22T23:07:21.000Z",
updatedAt: "2025-01-25T04:35:48.000Z",
},
name: "ㅁㄹㅁㄴㅇㄹㅁㄴㅇㄹ",
expenditureDate: "2024-08-07T09:00:00.000Z",
expenditureAmount: 234234,
approvedAmount: 0,
tradeEvidenceFiles: [
{
id: "b5884fb8-672d-45cf-a4de-5d1ce34a35f4",
name: "websiteplanet-dummy-540X400.png",
extension: "png",
size: 8141,
userId: 8608,
url: "https://ar-002-clubs-v2-dev.s3.ap-northeast-2.amazonaws.com/file/8608.1737884920000.websiteplanet-dummy-540X400.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=AKIAZWM3SVKMLN74ARWD%2F20250130%2Fap-northeast-2%2Fs3%2Faws4_request&X-Amz-Date=20250130T133654Z&X-Amz-Expires=600&X-Amz-Signature=210bbac945b25b631498baca8ac0efa1df5cf06768c9287aa4f1d79a04541e9a&X-Amz-SignedHeaders=host&x-id=GetObject",
},
],
tradeDetailFiles: [
{
id: "c0c3fe89-66bd-441f-89e1-069ec53cdfbc",
name: "websiteplanet-dummy-540X400 (1).png",
extension: "png",
size: 8110,
userId: 8608,
url: "https://ar-002-clubs-v2-dev.s3.ap-northeast-2.amazonaws.com/file/8608.1737884926000.websiteplanet-dummy-540X400%20%281%29.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=AKIAZWM3SVKMLN74ARWD%2F20250130%2Fap-northeast-2%2Fs3%2Faws4_request&X-Amz-Date=20250130T133654Z&X-Amz-Expires=600&X-Amz-Signature=2cb8499190a6de332edc28793c08f7702e84a596ba033a0bbf1044eab8ffc2e8&X-Amz-SignedHeaders=host&x-id=GetObject",
},
],
tradeDetailExplanation: "ㅇㅎㅇㅎㄹㅇㅎ",
isFixture: false,
isTransportation: false,
isNonCorporateTransaction: false,
isFoodExpense: false,
isLaborContract: true,
laborContract: {
explanation: "ㅇㄴㄹㅇ",
files: [
{
id: "4c991eb5-a5d9-4df9-a5cc-9dbf87d1c67a",
name: "websiteplanet-dummy-540X400 (1).png",
extension: "png",
size: 8110,
userId: 8608,
url: "https://ar-002-clubs-v2-dev.s3.ap-northeast-2.amazonaws.com/file/8608.1737884935000.websiteplanet-dummy-540X400%20%281%29.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=AKIAZWM3SVKMLN74ARWD%2F20250130%2Fap-northeast-2%2Fs3%2Faws4_request&X-Amz-Date=20250130T133654Z&X-Amz-Expires=600&X-Amz-Signature=0d291445afba29cc48a30136ca4d9b52ee89a4f4102df8418e4a6002e95ad7c4&X-Amz-SignedHeaders=host&x-id=GetObject",
},
],
},
isExternalEventParticipationFee: false,
isPublication: false,
isProfitMakingActivity: false,
isJointExpense: false,
isEtcExpense: false,
editedAt: "2025-01-26T18:48:59.000Z",
commentedAt: new Date(),
createdAt: "2025-01-26T18:48:59.000Z",
updatedAt: "2025-01-29T22:41:08.000Z",
comments: [
{
id: 1,
funding: { id: 1 },
chargedExecutive: { id: 123 },
content: "대충 어떤 부분 승인 사유",
fundingStatusEnum: fundingStatus,
approvedAmount: 1230,
createdAt: new Date(),
},
],
};

const baseUrl = `/student/fundings/funding/`;
mock
.onGet(new RegExp(`^${baseUrl}\\d+$`))
.reply(() => [200, mockFundingDetail]);
});
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ defineAxiosMock(mock => {
mock.onGet(apiFnd007.url()).reply(() => [
200,
{
targetTerm: {
targetDuration: {
id: 1,
year: 2023,
name: "여름가을",
Expand All @@ -31,7 +31,7 @@ defineAxiosMock(mock => {
},
deadline: {
id: 1,
activityDeadlineEnum: FundingDeadlineEnum.Revision,
deadlineEnum: FundingDeadlineEnum.Revision,
startDate: new Date("2024-07-01"),
endDate: new Date("2024-12-30"),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ import apiFnd006, {
ApiFnd006RequestQuery,
ApiFnd006ResponseOk,
} from "@sparcs-clubs/interface/api/funding/endpoint/apiFnd006";
import {
ActivityStatusEnum,
ActivityTypeEnum,
} from "@sparcs-clubs/interface/common/enum/activity.enum";
import { FundingStatusEnum } from "@sparcs-clubs/interface/common/enum/funding.enum";
import { useQuery } from "@tanstack/react-query";

Expand Down Expand Up @@ -35,7 +39,7 @@ const useGetTermFundingList = (

export default useGetTermFundingList;

const baseUrl = `/student/fundings/semesters/semester/`;
const baseUrl = `/student/fundings/activity-durations/activity-duration/`;

defineAxiosMock(mock => {
mock.onGet(new RegExp(`^${baseUrl}\\d+$`)).reply(() => [
Expand All @@ -48,47 +52,41 @@ defineAxiosMock(mock => {
name: "개발개발한 어떠한 활동",
expenditureAmount: 300000,
approvedAmount: 200000,
purposeActivity: { id: 1, name: "지출목적" },
purposeActivity: {
id: 1,
name: "지출목적",
activityStatusEnum: ActivityStatusEnum.Applied,
activityTypeEnum: ActivityTypeEnum.matchedExternalActivity,
club: { id: 1 },
},
},
{
id: 2,
fundingStatusEnum: FundingStatusEnum.Applied,
name: "개발개발한 어떠한 활동",
expenditureAmount: 300000,
approvedAmount: 200000,
purposeActivity: { id: 1, name: "지출목적" },
purposeActivity: {
id: 1,
name: "지출목적",
activityStatusEnum: ActivityStatusEnum.Applied,
activityTypeEnum: ActivityTypeEnum.matchedExternalActivity,
club: { id: 1 },
},
},
{
id: 3,
fundingStatusEnum: FundingStatusEnum.Applied,
name: "개발개발한 어떠한 활동",
expenditureAmount: 300000,
approvedAmount: 200000,
purposeActivity: { id: 1, name: "지출목적" },
},
{
id: 4,
fundingStatusEnum: FundingStatusEnum.Rejected,
name: "개발개발한 어떠한 활동",
expenditureAmount: 300000,
approvedAmount: 200000,
purposeActivity: { id: 1, name: "지출목적" },
},
{
id: 5,
fundingStatusEnum: FundingStatusEnum.Rejected,
name: "개발개발한 어떠한 활동",
expenditureAmount: 300000,
approvedAmount: 200000,
purposeActivity: { id: 1, name: "지출목적" },
},
{
id: 6,
fundingStatusEnum: FundingStatusEnum.Approved,
name: "개발개발한 어떠한 활동",
expenditureAmount: 300000,
approvedAmount: 200000,
purposeActivity: { id: 1, name: "지출목적" },
purposeActivity: {
id: 1,
name: "지출목적",
activityStatusEnum: ActivityStatusEnum.Applied,
activityTypeEnum: ActivityTypeEnum.matchedExternalActivity,
club: { id: 1 },
},
},
],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,14 @@ const mockupManageFunding: NewFundingData[] = [
expenditureAmount: 300000,
approvedAmount: 100000,
},
{
id: 6,
fundingStatusEnum: FundingStatusEnum.Partial,
name: "개발개발한 어떠한 활동",
activityName: "모니터",
expenditureAmount: 300000,
approvedAmount: 100000,
},
];

const mockupPastManageFunding: Funding[] = [
Expand Down