Index: backend/auth_form/migrations/0016_student_assistants.py =================================================================== --- backend/auth_form/migrations/0016_student_assistants.py (revision dc161479c763185986bcc2afdae011784218d05f) +++ backend/auth_form/migrations/0016_student_assistants.py (revision dc161479c763185986bcc2afdae011784218d05f) @@ -0,0 +1,19 @@ +# Generated by Django 5.1.7 on 2025-06-10 10:09 + +import django.contrib.postgres.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth_form', '0015_rename_preferred_evaluation_student_evaluation_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='student', + name='assistants', + field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=64), blank=True, null=True, size=None), + ), + ] Index: backend/auth_form/models.py =================================================================== --- backend/auth_form/models.py (revision 62f88df413485677e36b0f2afb6b6c4dc9b2bb63) +++ backend/auth_form/models.py (revision dc161479c763185986bcc2afdae011784218d05f) @@ -63,4 +63,5 @@ evaluation = ArrayField(models.CharField(max_length=16), null=True, blank=True) professors = ArrayField(models.CharField(max_length=64), null=True, blank=True) + assistants = ArrayField(models.CharField(max_length=64), null=True, blank=True) passed_subjects = models.ManyToManyField('subjects.subject', related_name="passed_subjects", blank=True) has_extracurricular = models.BooleanField(default=False, null=True) Index: backend/subjects/consts.py =================================================================== --- backend/subjects/consts.py (revision 62f88df413485677e36b0f2afb6b6c4dc9b2bb63) +++ backend/subjects/consts.py (revision dc161479c763185986bcc2afdae011784218d05f) @@ -3,5 +3,6 @@ WEIGHTS = { - "professors": 0.065, + "professors": 0.0325, + "assistants": 0.0325, "technologies": 0.065, "tags": 0.4, @@ -12,3 +13,14 @@ } +# WEIGHTS = { +# "professors": 0.065, +# "assistants": 0, +# "technologies": 0.065, +# "tags": 0.4, +# "evaluation": 0.15, +# "effort": 0.3, +# "activated": 0.01, +# "participant_score": 0.01, +# } + NUMBER_OF_SUGGESTIONS = 6 Index: backend/subjects/utils.py =================================================================== --- backend/subjects/utils.py (revision 62f88df413485677e36b0f2afb6b6c4dc9b2bb63) +++ backend/subjects/utils.py (revision dc161479c763185986bcc2afdae011784218d05f) @@ -76,5 +76,4 @@ student_vector['index'] = student.index for key in vocabulary: - if key == "assistants": continue student_values = getattr(student, key, []) Index: frontend/src/components/StudentForm/FieldButton.tsx =================================================================== --- frontend/src/components/StudentForm/FieldButton.tsx (revision 62f88df413485677e36b0f2afb6b6c4dc9b2bb63) +++ frontend/src/components/StudentForm/FieldButton.tsx (revision dc161479c763185986bcc2afdae011784218d05f) @@ -6,5 +6,5 @@ state: string[]; stateSetter: Dispatch>; - field: "prof" | "tech" | "eval" | "domains"; + field: "prof" | "tech" | "eval" | "domains" | "ass"; isSelected: boolean; isDisabled: boolean; @@ -15,4 +15,5 @@ eval: boolean; prof: boolean; + ass: boolean; }> >; Index: frontend/src/components/StudentForm/StudentForm.tsx =================================================================== --- frontend/src/components/StudentForm/StudentForm.tsx (revision 62f88df413485677e36b0f2afb6b6c4dc9b2bb63) +++ frontend/src/components/StudentForm/StudentForm.tsx (revision dc161479c763185986bcc2afdae011784218d05f) @@ -7,4 +7,5 @@ YEARS, } from "../../constants/subjects"; +import useAxiosAuth from "../../hooks/useAxiosAuth"; import { StudentData, StudyTrack, Subject } from "../types"; import FieldButton from "./FieldButton"; @@ -17,5 +18,4 @@ validateForm, } from "./utils"; -import useAxiosAuth from "../../hooks/useAxiosAuth"; interface StudentFormProps { @@ -28,4 +28,5 @@ tags: string[]; professors: string[]; + assistants: string[]; technologies: string[]; } @@ -54,4 +55,5 @@ >({}); const [professorsSearchTerm, setProfessorSearchTerm] = useState(""); + const [assistantsSearchTerm, setAssistantsSearchTerm] = useState(""); const [technologies, setTechnologies] = useState( formData?.technologies || [] @@ -61,4 +63,7 @@ formData?.professors || [] ); + const [favoriteAssistants, setFavoriteAssistants] = useState( + formData?.assistants || [] + ); const [isNemamSelected, setIsNemamSelected] = useState({ domains: false, @@ -66,4 +71,5 @@ eval: false, prof: false, + ass: false, }); const [formStatus, setFormStatus] = useState<{ @@ -77,4 +83,5 @@ }); const [showProfessors, setShowProfessors] = useState(false); + const [showAssistants, setShowAssistants] = useState(false); const [subjects, setSubjects] = useState([]); const [distinctSubjectData, setDistinctSubjectData] = @@ -82,4 +89,5 @@ tags: [], professors: [], + assistants: [], technologies: [], }); @@ -121,4 +129,9 @@ setFavoriteProfs(favoriteProfs_); + const favoriteAssistants_ = (formData.assistants || []).includes("None") + ? [] + : formData.assistants || []; + setFavoriteAssistants(favoriteAssistants_); + setPassedSubjectsPerSemester(formData.passed_subjects_per_semester || []); } @@ -132,4 +145,5 @@ const subJson: Subject[] = await resSubjects.json(); setSubjects(subJson || []); + const allProfessors: string[] = subJson .flatMap((subject: Subject) => subject.subject_info.professors) @@ -138,4 +152,12 @@ const allProfessors_ = uniqueProfessors .filter((prof) => prof.trim().toLowerCase() !== "сите професори") + .sort((a, b) => a.localeCompare(b)); + + const allAssistants: string[] = subJson + .flatMap((subject: Subject) => subject.subject_info.assistants) + .filter((p): p is string => typeof p === "string"); + const uniqueAssistants = Array.from(new Set(allAssistants)); + const allAssistants_ = uniqueAssistants + .filter((ass) => ass.trim().toLowerCase() !== "сите асистенти") .sort((a, b) => a.localeCompare(b)); setDistinctSubjectData(() => ({ @@ -151,4 +173,5 @@ ).sort((a, b) => a.localeCompare(b)), professors: allProfessors_, + assistants: allAssistants_, })); } @@ -239,4 +262,5 @@ ), professors: favoriteProfs, + assistants: favoriteAssistants, passed_subjects_per_semester: mapToID(passedSubjectsPerSemester), has_extracurricular: hasExtracurricular, @@ -303,4 +327,24 @@ .toLowerCase() .includes(LatinToCyrillic(professorsSearchTerm).toLowerCase())) + ) + .sort((a, b) => a.localeCompare(b)), + ]; + + const filteredAssistants = [ + ...favoriteAssistants.filter( + (ass) => + assistantsSearchTerm === "" || + ass + .toLowerCase() + .includes(LatinToCyrillic(assistantsSearchTerm).toLowerCase()) + ), + ...distinctSubjectData.assistants + .filter( + (ass) => + !favoriteAssistants.includes(ass) && + (assistantsSearchTerm === "" || + ass + .toLowerCase() + .includes(LatinToCyrillic(assistantsSearchTerm).toLowerCase())) ) .sort((a, b) => a.localeCompare(b)), @@ -610,4 +654,60 @@ + +
+
+

+ Омилени асистенти +

+ { + setAssistantsSearchTerm(e.target.value)} + value={assistantsSearchTerm} + disabled={isNemamSelected["ass"]} + 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="Пребарај асистент" + /> + } +
+
+ {["Немам", ...filteredAssistants] + .slice(0, showAssistants ? undefined : 10) + .map((item) => { + if (item === "None") return; + // hides "Nemam" when searching + if (item == "Немам" && assistantsSearchTerm !== "") return; + const isSelected = + favoriteAssistants.includes(item) || + (item === "Немам" && isNemamSelected["ass"]); + const shouldBeDisabled = + isNemamSelected["ass"] && item !== "Немам"; + return ( + + ); + })} + {filteredAssistants.length == 0 && ( +

Нема таков асистент

+ )} + {filteredAssistants.length > 10 && ( + + )} +
+
-
+ {/*
{selectedSubject.subject_info.participants[0] == 0 ? (
@@ -144,7 +144,13 @@ ${selectedSubject.subject_info.participants[0]} студенти.`}

)} +
*/} + +
+

+ Отвори го предметот за да ги видиш сите информации +

-
+
+ +
+

+ Начин на евалуација +

+

+ {selectedSubject.subject_info.evaluation.length + ? selectedSubject.subject_info.evaluation + .map( + (ev) => + EVALUATION_MAP_TO_MK[ + ev as keyof typeof EVALUATION_MAP_TO_MK + ] + ) + .join(", ") + : "Нема одредена евалуација"}