Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
19 changes: 19 additions & 0 deletions src/app/api/sprint/sprintApi.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,22 @@ export const fetchSprintIdTitle = async (projectId) => {
throw new Error(message);
}
};

// μŠ€ν”„λ¦°νŠΈλ³„ μ°Έμ—¬μž λͺ©λ‘ & ν”Όλ“œλ°± μ—¬λΆ€ 쑰회
export const fetchSprintParticipantsFeedback = async (projectId, sprintId) => {
try {
const res = await axiosWithAuthorization.get(`/feedbacks/${sprintId}/participants`, {
params: {
projectId: projectId,
lastProjectParticipantId: null,
size: 10
}
});
console.log("μŠ€ν”„λ¦°νŠΈλ³„ μ°Έμ—¬μž λͺ©λ‘ & ν”Όλ“œλ°± μ—¬λΆ€ 쑰회:", res.data);
return res.data.data;
} catch (error) {
const message = error?.response?.data?.data?.message ?? "μŠ€ν”„λ¦°νŠΈλ³„ μ°Έμ—¬μž λͺ©λ‘ & ν”Όλ“œλ°± μ—¬λΆ€λ₯Ό μ‘°νšŒν•  수 μ—†μŠ΅λ‹ˆλ‹€.";
throw new Error(message);
}
};

32 changes: 29 additions & 3 deletions src/app/project/project.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import MeetingModal from "./meeting_modal";
import ProjectModal from "../team/project_modal";

import { fetchProjectData, fetchProjectUser, fetchProjectMemberList, fetchSprintContributions } from "@/app/api/project/projectApi";
import { fetchSprintTaskData } from "@/app/api/sprint/sprintApi";
import { fetchSprintTaskData, fetchSprintParticipantsFeedback } from "@/app/api/sprint/sprintApi";

import Image from "next/image";

Expand Down Expand Up @@ -60,6 +60,9 @@ export default function Project({projectId}) {
// μŠ€ν”„λ¦°νŠΈλ³„ 기여도 λž­ν‚Ή 쑰회
const [sprintContributions, setSprintContributions] = useState({});

// λ™λ£Œν‰κ°€ μƒνƒœ
const [feedbackStatusMap, setFeedbackStatusMap] = useState({});

//meeting
const [hasMoreMeetings, setHasMoreMeetings] = useState(false);
const [lastMeetingtId, setLastMeetingId] = useState(null);
Expand Down Expand Up @@ -463,6 +466,27 @@ export default function Project({projectId}) {
return null; // λ˜λŠ” λ‘œλ”© UIλ₯Ό 보여쀄 μˆ˜λ„ 있음
}

useEffect(() => {
const fetchFeedbackStatuses = async () => {
if (!currentSprint?.sprint_id) return;
try {
const feedbackData = await fetchSprintParticipantsFeedback(ProjectId, currentSprint.sprint_id);

const map = {};
feedbackData.content.forEach((participant) => {
map[participant.projectParticipantId] = participant.feedbackStatus;
});

setFeedbackStatusMap(map);
} catch (err) {
showAlert("error", err.message);
console.log(err.message);
}
};

fetchFeedbackStatuses();
}, [currentSprint?.sprint_id]);


const fetchMeetingList = async (sprintId, lastId = null) => {
try {
Expand Down Expand Up @@ -559,7 +583,6 @@ export default function Project({projectId}) {
const reduceMemberName = (name) => {
return name.length > 4 ? name.slice(0, 4) + ".." : name;
};


return (
<>
Expand Down Expand Up @@ -747,7 +770,10 @@ currentSprint?.sprint_end === today && isExternalUser === true && (
}}
>
{projectUser.errorClassName !== "PROJECT_PARTICIPATION_REQUIRED" && (
<P.FeedbackButton hidden={!isFeedbackDay}>
<P.FeedbackButton
hidden={!isFeedbackDay}
disabled={feedbackStatusMap[member.id] === "COMPLETED"}
>
λ™λ£Œ 평가
</P.FeedbackButton>
)}
Expand Down
6 changes: 6 additions & 0 deletions src/app/project/project_s.js
Original file line number Diff line number Diff line change
Expand Up @@ -327,4 +327,10 @@ export const FeedbackButton = styled.button`
&:hover {
background-color: #3b2ea3;
}

&:disabled {
background-color: #ccc;
cursor: not-allowed;
color: #888;
}
`;