Index: frontend/src/api/subjects.ts =================================================================== --- frontend/src/api/subjects.ts (revision 8ba18400835e3bf5d7e72a00230cdbcb5606d5f5) +++ frontend/src/api/subjects.ts (revision 22463abb0ce76a33d80a0bf318fecd95935af16e) @@ -2,9 +2,7 @@ import { Subject } from "../components/types"; -interface fetchSubjectsProps { - setSubjects: Dispatch>; -} - -export const fetchSubjects = async ({ setSubjects }: fetchSubjectsProps) => { +export const fetchSubjects = async ( + setSubjects: Dispatch> +) => { try { const resSubjects = await fetch("http://localhost:8000/subjects/all/"); Index: frontend/src/components/Reviews/EvaluationReviews.tsx =================================================================== --- frontend/src/components/Reviews/EvaluationReviews.tsx (revision 22463abb0ce76a33d80a0bf318fecd95935af16e) +++ frontend/src/components/Reviews/EvaluationReviews.tsx (revision 22463abb0ce76a33d80a0bf318fecd95935af16e) @@ -0,0 +1,110 @@ +import { EVALUATION_MAP_TO_MK } from "../../constants/subjects"; +import { Reviews } from "../types"; +import Votes from "./Votes"; + +interface EvaluationReviewsProps { + reviews: Reviews; +} + +const EvaluationReviews = ({ reviews }: EvaluationReviewsProps) => { + return ( + <> + {reviews.evaluation?.methods?.length > 0 && ( +
+

+ Информации за полагање +

+
+ {reviews && + reviews.evaluation && + (reviews.evaluation?.methods?.length > 0 ? ( +
+
+
+ + Индекс: {reviews.evaluation?.review.student} + + {reviews.evaluation?.review.is_confirmed ? ( +
+ {/* */} + Потврдено +
+ ) : ( +
+ + Непотврдено + +
+ Администратор сè уште не ја потврдил точноста на + оваа информација. +
+
+ )} +
+ +
+ {reviews.evaluation?.methods?.map((method, index) => ( +
+
+
+

+ Начин на оценување {index + 1}: +

+
+ + + + + + + + + {method.components.map((component, index) => ( + + + + + ))} + +
+ Активност + + Процент од оценка +
+ { + EVALUATION_MAP_TO_MK[ + (component.category + .charAt(0) + .toUpperCase() + + component.category.slice( + 1 + )) as keyof typeof EVALUATION_MAP_TO_MK + ] + } + + {component.percentage}% +
+
+
+
+
+ ))} +

+ Услов за потпис:{" "} + + {reviews.evaluation.signature_condition && + reviews.evaluation.signature_condition != "None" + ? reviews.evaluation.signature_condition + : "Нема"} + +

+
+ ) : null)} +
+
+ )} + + ); +}; + +export default EvaluationReviews; Index: frontend/src/components/Reviews/OtherReviews.tsx =================================================================== --- frontend/src/components/Reviews/OtherReviews.tsx (revision 22463abb0ce76a33d80a0bf318fecd95935af16e) +++ frontend/src/components/Reviews/OtherReviews.tsx (revision 22463abb0ce76a33d80a0bf318fecd95935af16e) @@ -0,0 +1,54 @@ +import { MAP_REVIEW_CATEGORY_TO_MK } from "../SubjectCatalog/utils"; +import { Reviews } from "../types"; +import Votes from "./Votes"; + +interface OtherReviewsProps { + reviews: Reviews; +} + +const OtherReviews = ({ reviews }: OtherReviewsProps) => { + return ( +
+

+ Останати информации +

+ +
+ {reviews.other.map((review) => ( +
+
+
+ + Индекс: {review.review.student} + + + {MAP_REVIEW_CATEGORY_TO_MK[review.category]} + + {reviews.evaluation?.review.is_confirmed ? ( +
+ {/* */} + Потврдено +
+ ) : ( +
+ + Непотврдено + +
+ Администратор сè уште не ја потврдил точноста на оваа + информација. +
+
+ )} +
+ +
+

{review.content}

+
+ ))} +
+
+ ); +}; + +export default OtherReviews; Index: frontend/src/components/Reviews/Votes.tsx =================================================================== --- frontend/src/components/Reviews/Votes.tsx (revision 22463abb0ce76a33d80a0bf318fecd95935af16e) +++ frontend/src/components/Reviews/Votes.tsx (revision 22463abb0ce76a33d80a0bf318fecd95935af16e) @@ -0,0 +1,46 @@ +import { ArrowDown, ArrowUp } from "lucide-react"; +import { useAuth } from "../../hooks/useAuth"; +import { Reviews } from "../types"; + +interface VotesProps { + reviews: Reviews; + review_id?: number; +} + +const Votes = ({ reviews }: VotesProps) => { + const { isAuthenticated } = useAuth(); + const handleClick = (action: "up" | "down") => { + console.log(action); + }; + + return ( +
+ + + {reviews.evaluation?.review.votes_count} + + +
+ ); +}; + +export default Votes; Index: frontend/src/components/StudentForm/StudentForm.tsx =================================================================== --- frontend/src/components/StudentForm/StudentForm.tsx (revision 8ba18400835e3bf5d7e72a00230cdbcb5606d5f5) +++ frontend/src/components/StudentForm/StudentForm.tsx (revision 22463abb0ce76a33d80a0bf318fecd95935af16e) @@ -138,5 +138,5 @@ useEffect(() => { if (!subjects || subjects.length === 0) { - fetchSubjects({ setSubjects }); + fetchSubjects(setSubjects); } const token = localStorage.getItem("access"); Index: frontend/src/components/SubjectCatalog/SubjectCatalog.tsx =================================================================== --- frontend/src/components/SubjectCatalog/SubjectCatalog.tsx (revision 8ba18400835e3bf5d7e72a00230cdbcb5606d5f5) +++ frontend/src/components/SubjectCatalog/SubjectCatalog.tsx (revision 22463abb0ce76a33d80a0bf318fecd95935af16e) @@ -94,5 +94,5 @@ useEffect(() => { if (!subjects || subjects.length === 0) { - fetchSubjects({ setSubjects }); + fetchSubjects(setSubjects); } }, []); Index: frontend/src/components/SubjectCatalog/utils.ts =================================================================== --- frontend/src/components/SubjectCatalog/utils.ts (revision 8ba18400835e3bf5d7e72a00230cdbcb5606d5f5) +++ frontend/src/components/SubjectCatalog/utils.ts (revision 22463abb0ce76a33d80a0bf318fecd95935af16e) @@ -1,5 +1,5 @@ import { EVALUATION_MAP_TO_MK } from "../../constants/subjects"; import { LatinToCyrillic } from "../StudentForm/utils"; -import { Filters, StudyTrack, Subject } from "../types"; +import { Filters, OtherReview, StudyTrack, Subject } from "../types"; interface filteredSubjectsParams { @@ -195,2 +195,11 @@ return "Нема предуслов"; }; + +export const MAP_REVIEW_CATEGORY_TO_MK: Record< + OtherReview["category"], + string +> = { + material: "Материјал", + staff: "Кадар", + other: "Друго", +}; Index: frontend/src/components/types.ts =================================================================== --- frontend/src/components/types.ts (revision 8ba18400835e3bf5d7e72a00230cdbcb5606d5f5) +++ frontend/src/components/types.ts (revision 22463abb0ce76a33d80a0bf318fecd95935af16e) @@ -67,2 +67,42 @@ export type StudyTrack = (typeof STUDY_TRACKS)[number]; + +export interface EvaluationComponent { + category: + | "project" + | "theory" + | "practical" + | "homework" + | "attendance" + | "presentation"; + percentage: number; +} + +export interface EvaluationMethod { + note?: string; + components: EvaluationComponent[]; +} + +export interface EvaluationReview { + review: Review; + methods: EvaluationMethod[]; + signature_condition: string; +} + +export interface OtherReview { + review: Review; + category: "material" | "staff" | "other"; + content: string; +} + +export interface Review { + id?: number; + student?: string; + is_confirmed?: boolean; + votes_count?: number; +} + +export interface Reviews { + evaluation: EvaluationReview; // only one evaluation review per subject + other: OtherReview[]; +} Index: frontend/src/pages/Recommendations.tsx =================================================================== --- frontend/src/pages/Recommendations.tsx (revision 8ba18400835e3bf5d7e72a00230cdbcb5606d5f5) +++ frontend/src/pages/Recommendations.tsx (revision 22463abb0ce76a33d80a0bf318fecd95935af16e) @@ -35,5 +35,5 @@ useEffect(() => { if (!subjects || subjects.length === 0) { - fetchSubjects({ setSubjects }); + fetchSubjects(setSubjects); } }, [subjects, setSubjects]); Index: frontend/src/pages/SubjectPreferences.tsx =================================================================== --- frontend/src/pages/SubjectPreferences.tsx (revision 8ba18400835e3bf5d7e72a00230cdbcb5606d5f5) +++ frontend/src/pages/SubjectPreferences.tsx (revision 22463abb0ce76a33d80a0bf318fecd95935af16e) @@ -34,5 +34,5 @@ useEffect(() => { if (!subjects || subjects.length === 0) { - fetchSubjects({ setSubjects }); + fetchSubjects(setSubjects); } }, []); Index: frontend/src/pages/SubjectView.tsx =================================================================== --- frontend/src/pages/SubjectView.tsx (revision 8ba18400835e3bf5d7e72a00230cdbcb5606d5f5) +++ frontend/src/pages/SubjectView.tsx (revision 22463abb0ce76a33d80a0bf318fecd95935af16e) @@ -1,6 +1,4 @@ import { - ArrowDown, ArrowLeft, - ArrowUp, Tag, // ThumbsDown, @@ -11,46 +9,12 @@ import { Link, useLocation, useNavigate, useParams } from "react-router-dom"; import axiosInstance from "../api/axiosInstance"; +import { fetchSubjects } from "../api/subjects"; +import EvaluationReviews from "../components/Reviews/EvaluationReviews"; +import OtherReviews from "../components/Reviews/OtherReviews"; import { getSubjectPrerequisites } from "../components/SubjectCatalog/utils"; import SkeletonSubjectView from "../components/SubjectView/SkeletonSubjectView"; +import { Reviews } from "../components/types"; import { EVALUATION_MAP_TO_MK } from "../constants/subjects"; import { useSubjects } from "../context/SubjectsContext"; - -interface EvaluationComponent { - category: - | "project" - | "theory" - | "practical" - | "homework" - | "attendance" - | "presentation"; - percentage: number; -} - -interface EvaluationMethod { - note?: string; - components: EvaluationComponent[]; -} - -interface EvaluationReview { - review: Review; - methods: EvaluationMethod[]; -} - -interface OtherReview { - review: Review; - category: "material" | "staff" | "other"; - content: string; -} - -interface Review { - student?: string; - is_confirmed?: boolean; - votes_count?: number; -} - -interface Reviews { - evaluation: EvaluationReview; // only one evaluation review per subject - other: OtherReview[]; -} function SubjectView() { @@ -67,5 +31,5 @@ const location = useLocation(); - const [subjects] = useSubjects(); + const [subjects, setSubjects] = useSubjects(); // useMemo makes this efficient, so it only re-calculates when subjects or code changes. @@ -87,4 +51,8 @@ })(); }, [selectedSubject]); + + useEffect(() => { + fetchSubjects(setSubjects); + }, []); const WORD_LIMIT = 40; @@ -317,157 +285,8 @@ {reviews.evaluation.methods.length > 0 && ( - <> - {reviews.evaluation?.methods?.length > 0 && ( -
-

- Информации за полагање -

-
- {reviews && - reviews.evaluation && - (reviews.evaluation?.methods?.length > 0 ? ( -
-
-
- - Индекс:{" "} - {reviews.evaluation?.review.student} - - {reviews.evaluation?.review - .is_confirmed ? ( -
- {/* */} - - Потврдено - -
- ) : ( -
- - Непотврдено - -
- )} -
-
- - - {reviews.evaluation?.review.votes_count} - - -
-
- {reviews.evaluation?.methods?.map( - (method, index) => ( -
-
-
-

- Начин на положување {index + 1}: -

-
- - - - - - - - - {method.components.map( - (component, cidx) => ( - - - - - ) - )} - -
- Активност - - Процент од оценка -
- { - EVALUATION_MAP_TO_MK[ - (component.category - .charAt(0) - .toUpperCase() + - component.category.slice( - 1 - )) as keyof typeof EVALUATION_MAP_TO_MK - ] - } - - {component.percentage} - % -
-
-
-
-
- ) - )} -

- Услов за потпис: TODO -

-
- ) : null)} -
-
- )} - + )} {reviews.other.length > 0 && ( -
-

- Останати информации -

- -
- {reviews.other.map((review) => ( -
-
-
- - Индекс: {review.review.student} - - - {review.category} - - {reviews.evaluation?.review.is_confirmed ? ( -
- {/* */} - Потврдено -
- ) : ( -
- Непотврдено -
- )} -
-
- - - {review.review.votes_count} - - -
-
-

- {review.content} -

-
- ))} -
-
+ )}