Index: backend/subjects/management/data/subject_details.json =================================================================== --- backend/subjects/management/data/subject_details.json (revision 8aa983789002e45ac512ac4ef52cc154c24dae6a) +++ backend/subjects/management/data/subject_details.json (revision d9155284a962edc24e500c2b58930a30d0f01616) @@ -4598,5 +4598,5 @@ "credits": 36 }, - "activated": false, + "activated": true, "participants": [0, 0, 0], "mandatory": true, Index: backend/subjects/utils.py =================================================================== --- backend/subjects/utils.py (revision 8aa983789002e45ac512ac4ef52cc154c24dae6a) +++ backend/subjects/utils.py (revision d9155284a962edc24e500c2b58930a30d0f01616) @@ -4,5 +4,4 @@ from pathlib import Path import json -from numpy import average from django.db.models import Q import os @@ -23,4 +22,6 @@ .select_related('subject_info') ) + + if season != 2: if season == 0: @@ -28,4 +29,5 @@ elif season == 1: all_subjects = all_subjects.exclude(subject_info__season='S') + if study_effort < 3: @@ -123,5 +125,5 @@ if student_tags[neighbor] == 1: score += 1 / len(neighbors) * BIAS_SUBJECT_HAS_ONE - return score / tot_count + return score / tot_count if tot_count != 0 else 0 def score_for_preferences(student_vector, eligible_subjects): @@ -151,7 +153,15 @@ study_effort = student_vector["study_effort"] + if 0 < study_effort < 1: + filtered_subjects_vector[subject]['effort'] = (1 - study_effort) * values['isEasy'] + + # ako on se zamara (study_effort == 1) i predmetot ima isEasy e true onda 0 (ne ni e gajle za vakvite), + # ako on ne se zaamra (study_effort == 0) i predmetot ima isEasy e false onda pak 0 (ne ni e gajle za vakvite), + # vo sprotivno 1 deka se zamara i e tezok i obratno ne se zamara i e lesen + else: + filtered_subjects_vector[subject]['effort'] = 1 * (1 - values['isEasy']) - filtered_subjects_vector[subject]['effort'] = (1 - study_effort) * values['isEasy'] - filtered_subjects_vector[subject]['activated'] = values['activated'] + filtered_subjects_vector[subject]['activated'] = 1 + filtered_subjects_vector[subject]['participant_score'] = values['participants'] @@ -159,10 +169,10 @@ WEIGHTS = { - "professors": 0.02, - "technologies": 0.02, - "tags": 0.55, + "professors": 0.04, + "technologies": 0.04, + "tags": 0.5, "evaluation": 0.1, "effort": 0.3, - "activated": 0, + "activated": 0.01, "participant_score": 0.01, } @@ -180,9 +190,8 @@ max_ = max(score, max_) subject_scores[subject] = score - if max_ == 0: return filtered_subjects_vector.keys() for subject in subject_scores: subject_scores[subject] /= max_ - + top_subjects = list(dict(sorted(subject_scores.items(), key=lambda item: item[1], reverse=True)))[:NUMBER_OF_SUGGESTIONS] return top_subjects Index: frontend/src/components/StudentForm/StudentForm.tsx =================================================================== --- frontend/src/components/StudentForm/StudentForm.tsx (revision 8aa983789002e45ac512ac4ef52cc154c24dae6a) +++ frontend/src/components/StudentForm/StudentForm.tsx (revision d9155284a962edc24e500c2b58930a30d0f01616) @@ -1,9 +1,9 @@ import { useEffect, useState } from "react"; import { - EVALUATIONS, - EVALUATIONS_MAP, - STUDY_EFFORT, - STUDY_TRACKS, - YEARS, + EVALUATIONS, + EVALUATIONS_MAP, + STUDY_EFFORT, + STUDY_TRACKS, + YEARS, } from "../../constants/subjects"; import { useAuth } from "../../hooks/useAuth"; @@ -13,644 +13,645 @@ import SubjectsSelector from "./SubjectsSelector"; import { - getPassedSubjectsByID, - LatinToCyrillic, - mapToID, - validateForm, + getPassedSubjectsByID, + LatinToCyrillic, + mapToID, + validateForm, } from "./utils"; interface StudentFormProps { - formData: StudentData | null; - isLoading: boolean; - setIsLoading?: (b: boolean) => void; + formData: StudentData | null; + isLoading: boolean; + setIsLoading?: (b: boolean) => void; } interface DistinctSubjectData { - tags: string[]; - professors: string[]; - technologies: string[]; + tags: string[]; + professors: string[]; + technologies: string[]; } const StudentForm = ({ formData, isLoading }: StudentFormProps) => { - const { accessToken } = useAuth(); - const [isSubmitted, setIsSubmitted] = useState(false); - const [validationErrors, setValidationErrors] = useState<{ - [key: string]: string; - }>({}); - const [index, setIndex] = useState(formData?.index || ""); - const [studyTrack, setStudyTrack] = useState( - (formData?.study_track as StudyTrack) || "" - ); - const [year, setYear] = useState(formData?.current_year || 1); - const [passedSubjectsPerSemester, setPassedSubjectsPerSemester] = useState< - Record - >( - formData?.passed_subjects_per_semester ?? - Object.fromEntries(Array.from({ length: 8 }, (_, i) => [[i + 1], []])) - ); - const [studyEffort, setStudyEffort] = useState(formData?.study_effort || ""); - const [domains, setDomains] = useState(formData?.tags || []); - const [semesterSearchTerms, setSemesterSearchTerms] = useState< - Record - >({}); - const [professorsSearchTerm, setProfessorSearchTerm] = useState(""); - const [technologies, setTechnologies] = useState( - formData?.technologies || [] - ); - const [evaluation, setEvaluation] = useState(formData?.evaluation || []); - const [favoriteProfs, setFavoriteProfs] = useState( - formData?.professors || [] - ); - const [isNemamSelected, setIsNemamSelected] = useState({ - domains: false, - tech: false, - eval: false, - prof: false, - }); - const [formStatus, setFormStatus] = useState<{ - isSubmitting: boolean; - message: string; - isError: boolean; - }>({ - isSubmitting: false, - message: "", - isError: false, - }); - const [showProfessors, setShowProfessors] = useState(false); - const [subjects, setSubjects] = useState([]); - const [distinctSubjectData, setDistinctSubjectData] = - useState({ - tags: [], - professors: [], - technologies: [], - }); - const [hasExtracurricular, setHasExtracurricular] = useState(false); - const [invalidSubjects, setInvalidSubjects] = useState([]); - - // Update form when formData changes (e.g., after fetching user data) - useEffect(() => { - if (formData) { - setIndex(formData.index || ""); - setStudyTrack((formData.study_track as StudyTrack) || ""); - setYear(formData.current_year || 1); - setStudyEffort(formData.study_effort || ""); - - const domains_ = (formData.tags || []).includes("None") - ? [] - : formData.tags || []; - setDomains(domains_); - - const technologies_ = (formData.technologies || []).includes("None") - ? [] - : formData.technologies || []; - setTechnologies(technologies_); - - const eval_ = (formData.evaluation || []).map( - (val: string) => - Object.keys(EVALUATIONS_MAP).find( - (key) => - EVALUATIONS_MAP[key as keyof typeof EVALUATIONS_MAP] === val - ) || val - ); - setEvaluation( - eval_.includes("Немам") || eval_.includes("None") ? [] : eval_ - ); - - const favoriteProfs_ = (formData.professors || []).includes("None") - ? [] - : formData.professors || []; - setFavoriteProfs(favoriteProfs_); - - setPassedSubjectsPerSemester(formData.passed_subjects_per_semester || []); - } - }, [formData]); - - useEffect(() => { - const fetchSubjects = async () => { - try { - const resSubjects = await fetch("http://localhost:8000/subjects"); - if (resSubjects.ok) { - const subJson: Subject[] = await resSubjects.json(); - setSubjects(subJson || []); - const allProfessors: string[] = subJson - .flatMap((subject: Subject) => subject.subject_info.professors) - .filter((p): p is string => typeof p === "string"); - const uniqueProfessors = Array.from(new Set(allProfessors)); - const allProfessors_ = uniqueProfessors - .filter((prof) => prof.trim().toLowerCase() !== "сите професори") - .sort((a, b) => a.localeCompare(b)); - setDistinctSubjectData(() => ({ - tags: Array.from( - new Set(subJson.flatMap((subject) => subject.subject_info.tags)) - ).sort((a, b) => a.localeCompare(b)), - technologies: Array.from( - new Set( - subJson - .flatMap((subject) => subject.subject_info.technologies) - .filter((tech) => tech != "any" && tech != "") - ) - ).sort((a, b) => a.localeCompare(b)), - professors: allProfessors_, - })); - } - } catch (error) { - console.error("Error fetching subjects:", error); - } - }; - - fetchSubjects(); - }, []); - - const toggleSubject = (subject: Subject, semester: number) => { - const exists = (passedSubjectsPerSemester[semester] || []).some( - (s) => s.id === subject.id - ); - if (exists) { - setPassedSubjectsPerSemester({ - ...passedSubjectsPerSemester, - [semester]: passedSubjectsPerSemester[semester].filter( - (s) => s.id != subject.id - ), - }); - } else { - setPassedSubjectsPerSemester({ - ...passedSubjectsPerSemester, - [semester]: [...(passedSubjectsPerSemester[semester] || []), subject], - }); - } - }; - - const handleSubmit = async (e: React.FormEvent) => { - e.preventDefault(); - const totalCredits = { value: -1 }; - const creditsByLevel = { value: [0, 0, 0] }; - const errors = validateForm({ - index, - studyTrack, - year, - studyEffort, - passedSubjectsPerSemester, - hasExtracurricular, - setInvalidSubjects, - totalCredits, - creditsByLevel, - }); - if (Object.keys(errors).length > 0) { - setValidationErrors(errors); - window.scrollTo({ top: 0, behavior: "smooth" }); - if (errors.invalidSubjects) - setFormStatus({ - isSubmitting: false, - message: errors.invalidSubjects, - isError: true, - }); - else - setFormStatus({ - isSubmitting: false, - message: `Пополни ги сите задолжителни полиња`, - isError: true, - }); - return; - } - setValidationErrors({}); - setFormStatus({ - isSubmitting: true, - message: "", - isError: false, - }); - - const payload = { - index, - study_track: studyTrack, - current_year: year, - passed_subjects: getPassedSubjectsByID(passedSubjectsPerSemester), - study_effort: studyEffort, - tags: domains, - technologies: technologies, - evaluation: evaluation.map( - (ev) => EVALUATIONS_MAP[ev as keyof typeof EVALUATIONS_MAP] ?? ev - ), - professors: favoriteProfs, - passed_subjects_per_semester: mapToID(passedSubjectsPerSemester), - has_extracurricular: hasExtracurricular, - total_credits: totalCredits.value, - level_credits: creditsByLevel.value, - }; - try { - // For updating existing form data use PATCH instead of PUT for partial updates - const method = formData?.current_year || isSubmitted ? "PATCH" : "POST"; - const endpoint = "http://localhost:8000/auth/form/"; - const res = await fetch(endpoint, { - method, - headers: { - "Content-Type": "application/json", - Authorization: `Bearer ${accessToken}`, - }, - body: JSON.stringify(payload), - }); - - if (res.ok) { - setFormStatus({ - isSubmitting: false, - message: "Формата е успешно зачувана!", - isError: false, - }); - setTimeout(() => { - setFormStatus((prev) => ({ ...prev, message: "" })); - }, 5000); - } else { - const errorData = await res.json(); - throw new Error(errorData.message || "Error submitting form"); - } - setIsSubmitted(true); - window.scrollTo({ top: 0, behavior: "smooth" }); - } catch (error) { - console.error("Form submission error:", error); - - setFormStatus({ - isSubmitting: false, - message: `Грешка при зачувување: ${(error as Error).message}`, - isError: true, - }); - window.scrollTo({ top: 0, behavior: "smooth" }); - } - }; - - const filteredMandatorySubjects = studyTrack - ? subjects - .filter( - (subj) => - subj.subject_info.mandatory_for.includes(studyTrack) && - subj.subject_info.semester <= year * 2 - ) - .sort((a, b) => a.subject_info.semester - b.subject_info.semester) - : []; - const filteredElectiveSubjects = studyTrack - ? subjects.filter((subj) => - subj.subject_info.elective_for.includes(studyTrack) - ) - : []; - - const filteredProfessors = distinctSubjectData.professors.filter( - (prof) => - professorsSearchTerm == "" || - prof - .toLowerCase() - .includes(LatinToCyrillic(professorsSearchTerm).toLowerCase()) - ); - - if (isLoading) { - return ; - } - - return ( -
-

- {isSubmitted || formData?.current_year - ? "Ажурирај ги податоците" - : "Внеси податоци"} -

- {formStatus.message && ( -
- {formStatus.message} -
- )} -
-
-

Индекс

- setIndex(e.target.value)} - className="w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500" - /> - {validationErrors.index && ( -

- {validationErrors.index} -

- )} -
- -
-

Смер

- - {validationErrors.studyTrack && ( -

- {validationErrors.studyTrack} -

- )} -
-
-
-

- Година на студии - - - - - ? - - - - Ако моментално е јуни/јули/август/септември, за да добиеш препораки одбери дека си твојата година + 1. - Пример ако си 2 година и е јуни, избери дека си 3 година. - - -

- - {validationErrors.year && ( -

- {validationErrors.year} -

- )} -
- -
- -
-
-

- Вложен труд при учење -

-
- {STUDY_EFFORT.map((effort) => ( - - ))} -
- {validationErrors.studyEffort && ( -

- {validationErrors.studyEffort} -

- )} -
-
-

- Полиња на интерес -

-
- {["Немам", ...distinctSubjectData.tags].map((item) => { - const isSelected = - domains.includes(item) || - (item === "Немам" && isNemamSelected["domains"]); - const shouldBeDisabled = - isNemamSelected["domains"] && item !== "Немам"; - return ( - - ); - })} -
- {validationErrors.domains && ( -

- {validationErrors.domains} -

- )} -
-
-

- Преферирани технологии -

-
- {["Немам", ...distinctSubjectData.technologies].map((item) => { - const isSelected = - technologies.includes(item) || - (item === "Немам" && isNemamSelected["tech"]); - const shouldBeDisabled = - isNemamSelected["tech"] && item !== "Немам"; - return ( - - ); - })} -
- {validationErrors.technologies && ( -

- {validationErrors.technologies} -

- )} -
-
-

- Преферирани начин на оценување -

-
- {["Немам", ...EVALUATIONS].map((item) => { - const isSelected = - evaluation.includes(item) || - (item === "Немам" && isNemamSelected["eval"]); - const shouldBeDisabled = - isNemamSelected["eval"] && item !== "Немам"; - return ( - - ); - })} -
- {validationErrors.evaluation && ( -

- {validationErrors.evaluation} -

- )} -
-
-
-

- Омилени професори -

- { - setProfessorSearchTerm(e.target.value)} - value={professorsSearchTerm} - disabled={isNemamSelected["prof"]} - type="text" - className="w-60 px-3 py-2.5 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 text-gray-900 text-sm" - placeholder="Пребарај професор" - /> - } -
-
- {["Немам", ...filteredProfessors] - .slice(0, showProfessors ? undefined : 10) - .map((item) => { - // hides "Nemam" when searching - if (item == "Немам" && professorsSearchTerm !== "") return; - const isSelected = - favoriteProfs.includes(item) || - (item === "Немам" && isNemamSelected["prof"]); - const shouldBeDisabled = - isNemamSelected["prof"] && item !== "Немам"; - return ( - - ); - })} - {filteredProfessors.length == 0 && ( -

Нема таков професор

- )} - {filteredProfessors.length > 10 && ( - - )} -
-
-
- -
- - ); + const { accessToken } = useAuth(); + const [isSubmitted, setIsSubmitted] = useState(false); + const [validationErrors, setValidationErrors] = useState<{ + [key: string]: string; + }>({}); + const [index, setIndex] = useState(formData?.index || ""); + const [studyTrack, setStudyTrack] = useState( + (formData?.study_track as StudyTrack) || "" + ); + const [year, setYear] = useState(formData?.current_year || 1); + const [passedSubjectsPerSemester, setPassedSubjectsPerSemester] = useState< + Record + >( + formData?.passed_subjects_per_semester ?? + Object.fromEntries(Array.from({ length: 8 }, (_, i) => [[i + 1], []])) + ); + const [studyEffort, setStudyEffort] = useState(formData?.study_effort || ""); + const [domains, setDomains] = useState(formData?.tags || []); + const [semesterSearchTerms, setSemesterSearchTerms] = useState< + Record + >({}); + const [professorsSearchTerm, setProfessorSearchTerm] = useState(""); + const [technologies, setTechnologies] = useState( + formData?.technologies || [] + ); + const [evaluation, setEvaluation] = useState(formData?.evaluation || []); + const [favoriteProfs, setFavoriteProfs] = useState( + formData?.professors || [] + ); + const [isNemamSelected, setIsNemamSelected] = useState({ + domains: false, + tech: false, + eval: false, + prof: false, + }); + const [formStatus, setFormStatus] = useState<{ + isSubmitting: boolean; + message: string; + isError: boolean; + }>({ + isSubmitting: false, + message: "", + isError: false, + }); + const [showProfessors, setShowProfessors] = useState(false); + const [subjects, setSubjects] = useState([]); + const [distinctSubjectData, setDistinctSubjectData] = + useState({ + tags: [], + professors: [], + technologies: [], + }); + const [hasExtracurricular, setHasExtracurricular] = useState(false); + const [invalidSubjects, setInvalidSubjects] = useState([]); + + // Update form when formData changes (e.g., after fetching user data) + useEffect(() => { + if (formData) { + setIndex(formData.index || ""); + setStudyTrack((formData.study_track as StudyTrack) || ""); + setYear(formData.current_year || 1); + setStudyEffort(formData.study_effort || ""); + + const domains_ = (formData.tags || []).includes("None") + ? [] + : formData.tags || []; + setDomains(domains_); + + const technologies_ = (formData.technologies || []).includes("None") + ? [] + : formData.technologies || []; + setTechnologies(technologies_); + + const eval_ = (formData.evaluation || []).map( + (val: string) => + Object.keys(EVALUATIONS_MAP).find( + (key) => + EVALUATIONS_MAP[key as keyof typeof EVALUATIONS_MAP] === val + ) || val + ); + setEvaluation( + eval_.includes("Немам") || eval_.includes("None") ? [] : eval_ + ); + + const favoriteProfs_ = (formData.professors || []).includes("None") + ? [] + : formData.professors || []; + setFavoriteProfs(favoriteProfs_); + + setPassedSubjectsPerSemester(formData.passed_subjects_per_semester || []); + } + }, [formData]); + + useEffect(() => { + const fetchSubjects = async () => { + try { + const resSubjects = await fetch("http://localhost:8000/subjects"); + if (resSubjects.ok) { + const subJson: Subject[] = await resSubjects.json(); + setSubjects(subJson || []); + const allProfessors: string[] = subJson + .flatMap((subject: Subject) => subject.subject_info.professors) + .filter((p): p is string => typeof p === "string"); + const uniqueProfessors = Array.from(new Set(allProfessors)); + const allProfessors_ = uniqueProfessors + .filter((prof) => prof.trim().toLowerCase() !== "сите професори") + .sort((a, b) => a.localeCompare(b)); + setDistinctSubjectData(() => ({ + tags: Array.from( + new Set(subJson.flatMap((subject) => subject.subject_info.tags)) + ).sort((a, b) => a.localeCompare(b)), + technologies: Array.from( + new Set( + subJson + .flatMap((subject) => subject.subject_info.technologies) + .filter((tech) => tech != "any" && tech != "") + ) + ).sort((a, b) => a.localeCompare(b)), + professors: allProfessors_, + })); + } + } catch (error) { + console.error("Error fetching subjects:", error); + } + }; + + fetchSubjects(); + }, []); + + const toggleSubject = (subject: Subject, semester: number) => { + const exists = (passedSubjectsPerSemester[semester] || []).some( + (s) => s.id === subject.id + ); + if (exists) { + setPassedSubjectsPerSemester({ + ...passedSubjectsPerSemester, + [semester]: passedSubjectsPerSemester[semester].filter( + (s) => s.id != subject.id + ), + }); + } else { + setPassedSubjectsPerSemester({ + ...passedSubjectsPerSemester, + [semester]: [...(passedSubjectsPerSemester[semester] || []), subject], + }); + } + }; + + const handleSubmit = async (e: React.FormEvent) => { + e.preventDefault(); + const totalCredits = { value: -1 }; + const creditsByLevel = { value: [0, 0, 0] }; + const errors = validateForm({ + index, + studyTrack, + year, + studyEffort, + passedSubjectsPerSemester, + hasExtracurricular, + setInvalidSubjects, + totalCredits, + creditsByLevel, + }); + if (Object.keys(errors).length > 0) { + setValidationErrors(errors); + window.scrollTo({ top: 0, behavior: "smooth" }); + if (errors.invalidSubjects) + setFormStatus({ + isSubmitting: false, + message: errors.invalidSubjects, + isError: true, + }); + else + setFormStatus({ + isSubmitting: false, + message: `Пополни ги сите задолжителни полиња`, + isError: true, + }); + return; + } + setValidationErrors({}); + setFormStatus({ + isSubmitting: true, + message: "", + isError: false, + }); + + const payload = { + index, + study_track: studyTrack, + current_year: year, + passed_subjects: getPassedSubjectsByID(passedSubjectsPerSemester), + study_effort: studyEffort, + tags: domains, + technologies: technologies, + evaluation: evaluation.map( + (ev) => EVALUATIONS_MAP[ev as keyof typeof EVALUATIONS_MAP] ?? ev + ), + professors: favoriteProfs, + passed_subjects_per_semester: mapToID(passedSubjectsPerSemester), + has_extracurricular: hasExtracurricular, + total_credits: totalCredits.value, + level_credits: creditsByLevel.value, + }; + try { + // For updating existing form data use PATCH instead of PUT for partial updates + const method = formData?.current_year || isSubmitted ? "PATCH" : "POST"; + const endpoint = "http://localhost:8000/auth/form/"; + const res = await fetch(endpoint, { + method, + headers: { + "Content-Type": "application/json", + Authorization: `Bearer ${accessToken}`, + }, + body: JSON.stringify(payload), + }); + + if (res.ok) { + setFormStatus({ + isSubmitting: false, + message: "Формата е успешно зачувана!", + isError: false, + }); + setTimeout(() => { + setFormStatus((prev) => ({ ...prev, message: "" })); + }, 5000); + } else { + const errorData = await res.json(); + throw new Error(errorData.message || "Error submitting form"); + } + setIsSubmitted(true); + window.scrollTo({ top: 0, behavior: "smooth" }); + } catch (error) { + console.error("Form submission error:", error); + + setFormStatus({ + isSubmitting: false, + message: `Грешка при зачувување: ${(error as Error).message}`, + isError: true, + }); + window.scrollTo({ top: 0, behavior: "smooth" }); + } + }; + + const filteredMandatorySubjects = studyTrack + ? subjects + .filter( + (subj) => + subj.subject_info.mandatory_for.includes(studyTrack) && + subj.subject_info.semester <= year * 2 + ) + .sort((a, b) => a.subject_info.semester - b.subject_info.semester) + : []; + const filteredElectiveSubjects = studyTrack + ? subjects.filter((subj) => + subj.subject_info.elective_for.includes(studyTrack) + ) + : []; + + const filteredProfessors = distinctSubjectData.professors.filter( + (prof) => + professorsSearchTerm == "" || + prof + .toLowerCase() + .includes(LatinToCyrillic(professorsSearchTerm).toLowerCase()) + ); + + if (isLoading) { + return ; + } + + return ( +
+

+ {isSubmitted || formData?.current_year + ? "Ажурирај ги податоците" + : "Внеси податоци"} +

+ {formStatus.message && ( +
+ {formStatus.message} +
+ )} +
+
+

Индекс

+ setIndex(e.target.value)} + className="w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500" + /> + {validationErrors.index && ( +

+ {validationErrors.index} +

+ )} +
+ +
+

Смер

+ + {validationErrors.studyTrack && ( +

+ {validationErrors.studyTrack} +

+ )} +
+
+
+

+ Година на студии + + + + + ? + + + + Ако моментално е јуни/јули/август/септември, за да добиеш + препораки одбери дека си твојата година + 1. Пример ако си 2 + година и е јуни, одбери дека си 3 година. + + +

+ + {validationErrors.year && ( +

+ {validationErrors.year} +

+ )} +
+ +
+ +
+
+

+ Вложен труд при учење +

+
+ {STUDY_EFFORT.map((effort) => ( + + ))} +
+ {validationErrors.studyEffort && ( +

+ {validationErrors.studyEffort} +

+ )} +
+
+

+ Полиња на интерес +

+
+ {["Немам", ...distinctSubjectData.tags].map((item) => { + const isSelected = + domains.includes(item) || + (item === "Немам" && isNemamSelected["domains"]); + const shouldBeDisabled = + isNemamSelected["domains"] && item !== "Немам"; + return ( + + ); + })} +
+ {validationErrors.domains && ( +

+ {validationErrors.domains} +

+ )} +
+
+

+ Преферирани технологии +

+
+ {["Немам", ...distinctSubjectData.technologies].map((item) => { + const isSelected = + technologies.includes(item) || + (item === "Немам" && isNemamSelected["tech"]); + const shouldBeDisabled = + isNemamSelected["tech"] && item !== "Немам"; + return ( + + ); + })} +
+ {validationErrors.technologies && ( +

+ {validationErrors.technologies} +

+ )} +
+
+

+ Преферирани начин на оценување +

+
+ {["Немам", ...EVALUATIONS].map((item) => { + const isSelected = + evaluation.includes(item) || + (item === "Немам" && isNemamSelected["eval"]); + const shouldBeDisabled = + isNemamSelected["eval"] && item !== "Немам"; + return ( + + ); + })} +
+ {validationErrors.evaluation && ( +

+ {validationErrors.evaluation} +

+ )} +
+
+
+

+ Омилени професори +

+ { + setProfessorSearchTerm(e.target.value)} + value={professorsSearchTerm} + disabled={isNemamSelected["prof"]} + type="text" + className="w-60 px-3 py-2.5 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 text-gray-900 text-sm" + placeholder="Пребарај професор" + /> + } +
+
+ {["Немам", ...filteredProfessors] + .slice(0, showProfessors ? undefined : 10) + .map((item) => { + // hides "Nemam" when searching + if (item == "Немам" && professorsSearchTerm !== "") return; + const isSelected = + favoriteProfs.includes(item) || + (item === "Немам" && isNemamSelected["prof"]); + const shouldBeDisabled = + isNemamSelected["prof"] && item !== "Немам"; + return ( + + ); + })} + {filteredProfessors.length == 0 && ( +

Нема таков професор

+ )} + {filteredProfessors.length > 10 && ( + + )} +
+
+
+ +
+ + ); }; Index: frontend/src/pages/Account.tsx =================================================================== --- frontend/src/pages/Account.tsx (revision 8aa983789002e45ac512ac4ef52cc154c24dae6a) +++ frontend/src/pages/Account.tsx (revision d9155284a962edc24e500c2b58930a30d0f01616) @@ -5,10 +5,10 @@ import useAxiosAuth from "../hooks/useAxiosAuth"; import { toast } from "react-toastify"; - +import { useAuth } from "../hooks/useAuth"; const Account = () => { const axiosAuth = useAxiosAuth(); const navigate = useNavigate(); - + const { logout } = useAuth(); const [formData, setFormData] = useState(null); const [isLoading, setIsLoading] = useState(true); @@ -22,4 +22,5 @@ console.error("Error fetching form data:", error); toast.error("Could not fetch form data after retries."); + logout() navigate("/login"); } finally { Index: frontend/src/pages/Recommendations.tsx =================================================================== --- frontend/src/pages/Recommendations.tsx (revision 8aa983789002e45ac512ac4ef52cc154c24dae6a) +++ frontend/src/pages/Recommendations.tsx (revision d9155284a962edc24e500c2b58930a30d0f01616) @@ -50,5 +50,5 @@ map.set(subject.id, subject.name); }); - return map; + return map; }, [subjectData]); @@ -68,7 +68,5 @@ const openSubjectDetails = (subject: Subject) => { - setSelectedSubject( - subjectData.find((item) => item.id == subject.id) ?? null - ); + setSelectedSubject(subject); setShowModal(true); }; @@ -96,5 +94,9 @@

Препораки

- Откријте ги вашите идеални предмети! + Предметите што ќе ги добиете од алгоритамот се базирани на она што + сте го пополниле во формата. +
+ Тие се подредени според тоа колку вашите интереси се совпаѓаат со + она што го нудат предметите.

@@ -151,5 +153,6 @@
+ {/* Badge Logic: Prioritizes the warning, and shows the selected badge only on hover. */} + + {/* 1. First, check for the most critical warning. */} + {subject.subject_info.activated === false ? ( +
+ + ⚠️ Никогаш не бил активиран! + +
+ ) : index === 0 ? ( + // 2. Only if the first check is false, check for the "best fit" condition. +
+ + ⭐ Најсоодветен! + +
+ ) : null} +