Index: frontend/src/components/StudentForm/StudentForm.tsx =================================================================== --- frontend/src/components/StudentForm/StudentForm.tsx (revision 95bb4a49b7d413dc478d173b45cedd54882f2f92) +++ frontend/src/components/StudentForm/StudentForm.tsx (revision cc05ef98e53004cf217e64d56780113f944c905c) @@ -1,3 +1,3 @@ -import { useEffect, useState } from "react"; +import { Dispatch, SetStateAction, useEffect, useState } from "react"; import { EVALUATIONS, @@ -10,4 +10,5 @@ import { Programs, StudentData, Subject } from "../types"; import SkeletonForm from "./SkeletonForm"; +import SubjectsSelector from "./SubjectsSelector"; import { LatinToCyrillic } from "./utils"; @@ -40,5 +41,7 @@ formData?.preferred_domains || [] ); - const [electiveSearchTerm, setElectiveSearchTerm] = useState(""); + const [semesterSearchTerms, setSemesterSearchTerms] = useState< + Record + >({}); const [professorsSearchTerm, setProfessorSearchTerm] = useState(""); const [technologies, setTechnologies] = useState( @@ -51,4 +54,10 @@ formData?.favorite_professors || [] ); + const [isNemamSelected, setIsNemamSelected] = useState({ + domains: false, + tech: false, + eval: false, + prof: false, + }); const [formStatus, setFormStatus] = useState<{ isSubmitting: boolean; @@ -60,5 +69,4 @@ isError: false, }); - const [showElective, setShowElective] = useState(false); const [showProfessors, setShowProfessors] = useState(false); const [subjects, setSubjects] = useState([]); @@ -233,4 +241,46 @@ }; + const FieldButton: React.FC<{ + keyProp: string | number; + state: string[]; + stateSetter: Dispatch>; + field: "prof" | "tech" | "eval" | "domains"; + isSelected: boolean; + isDisabled: boolean; + }> = ({ keyProp, state, stateSetter, field, isSelected, isDisabled }) => { + const handleClick = () => { + if (keyProp === "Немам") { + if (state.includes("Немам")) { + stateSetter([]); + } else { + stateSetter(["Немам"]); + } + setIsNemamSelected((prev) => ({ + ...prev, + [field]: !prev[field], + })); + } else { + const new_ = state.filter((t) => t !== "Немам"); + toggleSelection(keyProp, stateSetter, new_); + } + }; + + return ( + + ); + }; + const filteredMandatorySubjects = studyTrack ? subjects @@ -243,16 +293,10 @@ : []; const filteredElectiveSubjects = studyTrack - ? subjects - .filter( - (subj) => - subj.subject_info.elective_for.includes(studyTrack) && - (electiveSearchTerm == "" || - subj.name - .toLowerCase() - .includes(LatinToCyrillic(electiveSearchTerm).toLowerCase())) - // subj.subject_info.semester <= year * 2 - ) - .sort((a, b) => a.subject_info.semester - b.subject_info.semester) - : []; + ? subjects.filter( + (subj) => subj.subject_info.elective_for.includes(studyTrack) + // subj.subject_info.semester <= year * 2 + ) + : // .sort((a, b) => a.subject_info.semester - b.subject_info.semester) + []; const filteredProfessors = distinctSubjectData.professors.filter( @@ -275,5 +319,4 @@ : "Внеси податоци"} - {formStatus.message && (
-

@@ -347,175 +389,15 @@ )}

- -
- {/*
*/} -

- Положени задолжителни предмети -

- {studyTrack != "" && ( -
- -
- )} - {filteredMandatorySubjects.length > 0 ? ( -
- {filteredMandatorySubjects.map((subject) => { - const isSelected = passedSubjects.some( - (s) => s.id === subject.id - ); - return ( - - ); - })} -
- ) : ( -

- {!studyTrack - ? "Одбери смер и година за да се прикажат предметите." - : "Нема такви задолжителни предмети"} -

- )} - {validationErrors.passedSubjects && ( -

- {validationErrors.passedSubjects} -

- )} -
-
-
-

- Положени изборни предмети -

- {studyTrack != "" && ( - setElectiveSearchTerm(e.target.value)} - value={electiveSearchTerm} - 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="Пребарај предмет" - /> - )} -
- {filteredElectiveSubjects.length > 0 ? ( -
- {filteredElectiveSubjects - .slice(0, showElective ? undefined : 10) - .map((subject) => { - const isSelected = passedSubjects.some( - (s) => s.id === subject.id - ); - return ( - - ); - })} - {filteredElectiveSubjects.length > 10 && ( - - )} -
- ) : ( -

- {!studyTrack - ? "Одбери смер и година за да се прикажат предметите" - : "Нема такви изборни предмети"} -

- )} -
- +

@@ -565,5 +447,4 @@ )}

-

@@ -571,33 +452,18 @@

- {distinctSubjectData.tags.map((domain) => { - const isSelected = domains.includes(domain); - const isNemamSelected = domains.includes("Немам"); - const shouldBeDisabled = isNemamSelected && domain !== "Немам"; + {["Немам", ...distinctSubjectData.tags].map((item) => { + const isSelected = domains.includes(item); + const shouldBeDisabled = + isNemamSelected["domains"] && item !== "Немам"; return ( - + ); })} @@ -609,5 +475,4 @@ )}
-

@@ -615,33 +480,18 @@

- {distinctSubjectData.technologies.map((tech) => { - const isSelected = technologies.includes(tech); - const isNemamSelected = technologies.includes("Немам"); - const shouldBeDisabled = isNemamSelected && tech !== "Немам"; + {["Немам", ...distinctSubjectData.technologies].map((item) => { + const isSelected = technologies.includes(item); + const shouldBeDisabled = + isNemamSelected["tech"] && item !== "Немам"; return ( - + ); })} @@ -653,5 +503,4 @@ )}
-

@@ -659,36 +508,18 @@

- {EVALUATIONS.map((ev) => { - const isSelected = evaluation.includes(ev); - const isNemamSelected = evaluation.includes("Немам"); - const shouldBeDisabled = isNemamSelected && ev !== "Немам"; + {["Немам", ...EVALUATIONS].map((item) => { + const isSelected = evaluation.includes(item); + const shouldBeDisabled = + isNemamSelected["eval"] && item !== "Немам"; return ( - + ); })} @@ -700,5 +531,4 @@ )}
-
@@ -710,4 +540,5 @@ onChange={(e) => 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" @@ -717,22 +548,22 @@
- {filteredProfessors + {["Немам", ...filteredProfessors] .slice(0, showProfessors ? undefined : 10) - .map((prof) => ( - - ))} + .map((item) => { + const isSelected = favoriteProfs.includes(item); + const shouldBeDisabled = + isNemamSelected["prof"] && item !== "Немам"; + return ( + + ); + })} {filteredProfessors.length == 0 && (

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

@@ -748,5 +579,4 @@
-
+ ); + })} +
+
+ )} + + {electiveSlots > 0 && ( +
+
+ Изборни предмети ( + {selectedElectivesForSemester.length}/{electiveSlots}) +
+ + { + setSemesterSearchTerms((prev: any) => ({ + ...prev, + [semester]: e.target.value, + })); + }} + /> + + {selectedElectivesForSemester.length > 0 && ( +
+
+ {selectedElectivesForSemester.map((subject) => ( + + ))} +
+
+ )} + + {selectedElectivesForSemester.length < + electiveSlots && ( +
+

+ Избери од достапните: +

+
+ {semesterElectives + .filter( + (subject) => + !selectedElectivesForSemester.some( + (selected) => selected.id === subject.id + ) && + ((semesterSearchTerms[semester] || "") === + "" || + subject.name + .toLowerCase() + .includes( + ( + LatinToCyrillic( + semesterSearchTerms[semester] + ) || "" + ).toLowerCase() + )) + ) + .slice(0, 8) + .map((subject) => ( + + ))} +
+
+ )} +
+ )} +
+
+ ); + }); + })()} +
+ ) : ( +

+ Одбери смер и година за да се прикажат предметите. +

+ )} + + {validationErrors.passedSubjects && ( +

+ {validationErrors.passedSubjects} +

+ )} + + ); +} + +export default SubjectsSelector; Index: frontend/src/components/SubjectCatalog/SubjectModal.tsx =================================================================== --- frontend/src/components/SubjectCatalog/SubjectModal.tsx (revision 95bb4a49b7d413dc478d173b45cedd54882f2f92) +++ frontend/src/components/SubjectCatalog/SubjectModal.tsx (revision cc05ef98e53004cf217e64d56780113f944c905c) @@ -3,204 +3,201 @@ interface SubjectModalProps { - selectedSubject: Subject; - subjectPrerequisites: string[] | number | "Нема предуслов"; - closeModal: () => void; + selectedSubject: Subject; + subjectPrerequisites: string[] | number | "Нема предуслов"; + closeModal: () => void; } function SubjectModal({ - selectedSubject, - closeModal, - subjectPrerequisites, + selectedSubject, + closeModal, + subjectPrerequisites, }: SubjectModalProps) { - const [isExpanded, setIsExpanded] = useState(false); - - const WORD_LIMIT = 40; - - const truncateText = (text: string) => { - if (!text) return ""; - const words = text.split(/\s+/); - console.log(words.slice(0, WORD_LIMIT).join(" ") + "..."); - return words.length <= WORD_LIMIT - ? text - : words.slice(0, WORD_LIMIT).join(" ") + "..."; - }; - - const canToggle = selectedSubject.abstract.split(/\s+/).length > WORD_LIMIT; - const abstractText = isExpanded - ? selectedSubject.abstract - : truncateText(selectedSubject.abstract); - return ( - <> -
-
-
-
-
-

{selectedSubject.name}

-

{selectedSubject.code}

-
- -
- -
- - {abstractText} - {canToggle && ( - - )} - -
- -
-

Професори:

-

- {selectedSubject.subject_info.professors.length == 0 - ? "Нема одредени професори" - : selectedSubject.subject_info.professors.join(", ")} -

-
-
-

Асистенти:

-

- {selectedSubject.subject_info.assistants.length == 0 - ? "Нема одредени асистенти" - : selectedSubject.subject_info.assistants.join(", ")} -

-
- -
-

- Информации за предметот -

- -
-
-
-
-

- Препорачан семестар -

-

- {selectedSubject.subject_info.semester} -

-
-
-
-
-

Зимски / Летен

-

- {selectedSubject.subject_info.season == "S" - ? "Летен" - : "Зимски"} -

-
-
-
-
-

Ниво

-

- L{selectedSubject.subject_info.level} -

-
-
-
-
-
-
-

Задолжителен за:

-

- {selectedSubject.subject_info.mandatory_for.length == 0 - ? "Не е задолжителен предмет" - : selectedSubject.subject_info.mandatory_for - .map((s) => s.replace(/\d+$/, "")) - .join(", ")} -

-
-
-
-
-

Изборен за:

-

- {selectedSubject.subject_info.elective_for.length == 0 - ? "Не е изборен предмет" - : selectedSubject.subject_info.elective_for - .map((s) => s.replace(/\d+$/, "")) - .join(", ")} -

-
-
-
-
-

Предуслови:

-

- {Array.isArray(subjectPrerequisites) - ? subjectPrerequisites.join(" или ") - : typeof subjectPrerequisites === "number" - ? `${subjectPrerequisites} кредити` - : subjectPrerequisites} -

-
-
-
-
-
-
- {selectedSubject.subject_info.participants[0] == 0 ? ( -
- Овој предмет не бил активиран минатиот семестар. -
- ) : ( -

{`Овој предмет минатиот семестар бил запишан од + const [isExpanded, setIsExpanded] = useState(false); + + const WORD_LIMIT = 40; + + const truncateText = (text: string) => { + if (!text) return ""; + const words = text.split(/\s+/); + console.log(words.slice(0, WORD_LIMIT).join(" ") + "..."); + return words.length <= WORD_LIMIT + ? text + : words.slice(0, WORD_LIMIT).join(" ") + "..."; + }; + + const canToggle = selectedSubject.abstract.split(/\s+/).length > WORD_LIMIT; + const abstractText = isExpanded + ? selectedSubject.abstract + : truncateText(selectedSubject.abstract); + return ( + <> +

+
+
+
+
+

{selectedSubject.name}

+

{selectedSubject.code}

+
+ +
+ +
+ + {abstractText} + {canToggle && ( + + )} + +
+ +
+

Професори:

+

+ {selectedSubject.subject_info.professors.length == 0 + ? "Нема одредени професори" + : selectedSubject.subject_info.professors.join(", ")} +

+
+
+

Асистенти:

+

+ {selectedSubject.subject_info.assistants.length == 0 + ? "Нема одредени асистенти" + : selectedSubject.subject_info.assistants.join(", ")} +

+
+ +
+

+ Информации за предметот +

+ +
+
+
+
+

+ Препорачан семестар +

+

+ {selectedSubject.subject_info.semester} +

+
+
+
+
+

Зимски / Летен

+

+ {selectedSubject.subject_info.season == "S" + ? "Летен" + : "Зимски"} +

+
+
+
+
+

Ниво

+

+ L{selectedSubject.subject_info.level} +

+
+
+
+
+
+
+

Задолжителен за:

+

+ {selectedSubject.subject_info.mandatory_for.length == 0 + ? "Не е задолжителен предмет" + : selectedSubject.subject_info.mandatory_for + .map((s) => s.replace(/\d+$/, "")) + .join(", ")} +

+
+
+
+
+

Изборен за:

+

+ {selectedSubject.subject_info.elective_for.length == 0 + ? "Не е изборен предмет" + : selectedSubject.subject_info.elective_for + .map((s) => s.replace(/\d+$/, "")) + .join(", ")} +

+
+
+
+
+

Предуслови:

+

+ {Array.isArray(subjectPrerequisites) + ? subjectPrerequisites.join(" или ") + : typeof subjectPrerequisites === "number" + ? `${subjectPrerequisites} кредити` + : subjectPrerequisites} +

+
+
+
+
+
+
+ {selectedSubject.subject_info.participants[0] == 0 ? ( +
+ Овој предмет не бил активиран минатиот семестар. +
+ ) : ( +

{`Овој предмет минатиот семестар бил запишан од ${selectedSubject.subject_info.participants[0]} студенти.`}

- )} -
-
-

Тагови

-
- {/* TODO: change this when real tags are added in the database*/} - {["Web Development", "Machine Learning", "Data Science"].map( - (tag) => ( - - {tag} - - ) - )} -
-
- -
- - {/* + {/*
-
-
-
- - ); +
+
+
+
+ + ); } export default SubjectModal;