Refactor fetchWeeklyReport function, updated submit button text, week fetched by params
This commit is contained in:
parent
d0d0e311e5
commit
5803c7b29b
1 changed files with 35 additions and 34 deletions
|
@ -16,42 +16,43 @@ export default function GetWeeklyReport(): JSX.Element {
|
||||||
const token = localStorage.getItem("accessToken") ?? "";
|
const token = localStorage.getItem("accessToken") ?? "";
|
||||||
const username = localStorage.getItem("username") ?? "";
|
const username = localStorage.getItem("username") ?? "";
|
||||||
const { projectName } = useParams();
|
const { projectName } = useParams();
|
||||||
|
const { fetchedWeek } = useParams();
|
||||||
|
|
||||||
|
const fetchWeeklyReport = async (): Promise<void> => {
|
||||||
|
const response = await api.getWeeklyReport(
|
||||||
|
username,
|
||||||
|
projectName ?? "",
|
||||||
|
fetchedWeek?.toString() ?? "0",
|
||||||
|
token,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response.success) {
|
||||||
|
const report: NewWeeklyReport = response.data ?? {
|
||||||
|
projectName: "",
|
||||||
|
week: 0,
|
||||||
|
developmentTime: 0,
|
||||||
|
meetingTime: 0,
|
||||||
|
adminTime: 0,
|
||||||
|
ownWorkTime: 0,
|
||||||
|
studyTime: 0,
|
||||||
|
testingTime: 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
setWeek(report.week);
|
||||||
|
setDevelopmentTime(report.developmentTime);
|
||||||
|
setMeetingTime(report.meetingTime);
|
||||||
|
setAdminTime(report.adminTime);
|
||||||
|
setOwnWorkTime(report.ownWorkTime);
|
||||||
|
setStudyTime(report.studyTime);
|
||||||
|
setTestingTime(report.testingTime);
|
||||||
|
} else {
|
||||||
|
console.error("Failed to fetch weekly report:", response.message);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const fetchWeeklyReport = async (): Promise<void> => {
|
|
||||||
const response = await api.getWeeklyReport(
|
|
||||||
username,
|
|
||||||
projectName ?? "",
|
|
||||||
week.toString(),
|
|
||||||
token,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (response.success) {
|
|
||||||
const report: NewWeeklyReport = response.data ?? {
|
|
||||||
projectName: "",
|
|
||||||
week: 0,
|
|
||||||
developmentTime: 0,
|
|
||||||
meetingTime: 0,
|
|
||||||
adminTime: 0,
|
|
||||||
ownWorkTime: 0,
|
|
||||||
studyTime: 0,
|
|
||||||
testingTime: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
setWeek(report.week);
|
|
||||||
setDevelopmentTime(report.developmentTime);
|
|
||||||
setMeetingTime(report.meetingTime);
|
|
||||||
setAdminTime(report.adminTime);
|
|
||||||
setOwnWorkTime(report.ownWorkTime);
|
|
||||||
setStudyTime(report.studyTime);
|
|
||||||
setTestingTime(report.testingTime);
|
|
||||||
} else {
|
|
||||||
console.error("Failed to fetch weekly report:", response.message);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
void fetchWeeklyReport();
|
void fetchWeeklyReport();
|
||||||
}, [projectName, token, username, week]);
|
});
|
||||||
|
|
||||||
const handleNewWeeklyReport = async (): Promise<void> => {
|
const handleNewWeeklyReport = async (): Promise<void> => {
|
||||||
const newWeeklyReport: NewWeeklyReport = {
|
const newWeeklyReport: NewWeeklyReport = {
|
||||||
|
@ -233,7 +234,7 @@ export default function GetWeeklyReport(): JSX.Element {
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<Button
|
<Button
|
||||||
text="Submit"
|
text="Submit changes"
|
||||||
onClick={(): void => {
|
onClick={(): void => {
|
||||||
return;
|
return;
|
||||||
}}
|
}}
|
||||||
|
|
Loading…
Add table
Reference in a new issue