Index: backend/auth_form/models.py =================================================================== --- backend/auth_form/models.py (revision 856614139a2f3cef61699dfca3ee440426d96a94) +++ backend/auth_form/models.py (revision f2d7ae4f4df05cd3b524962bea6ce7affdb8d337) @@ -7,5 +7,5 @@ def create_user(self, email, password=None, full_name=None, **extra_fields): if not email: - raise ValueError('The Email field but be set') + raise ValueError('The Email field must be set') email = self.normalize_email(email) extra_fields.setdefault('username', email) @@ -47,10 +47,10 @@ STUDY_TRACK_CHOICES = [ - ('SIIS23', 'SIIS'), - ('IE23', 'IE'), - ('KI23', 'KI'), - ('KN23', 'KN'), - ('IMB23', 'IMB'), - ('PIT23', 'PIT'), + ('SIIS23', 'SIIS23'), + ('IE23', 'IE23'), + ('KI23', 'KI23'), + ('KN23', 'KN23'), + ('IMB23', 'IMB23'), + ('PIT23', 'PIT23'), ] study_track = models.CharField(max_length=20, choices=STUDY_TRACK_CHOICES, null=True, blank=True) Index: frontend/src/components/StudentForm.tsx =================================================================== --- frontend/src/components/StudentForm.tsx (revision 856614139a2f3cef61699dfca3ee440426d96a94) +++ frontend/src/components/StudentForm.tsx (revision f2d7ae4f4df05cd3b524962bea6ce7affdb8d337) @@ -1,12 +1,10 @@ -import { useState, useEffect } from "react"; +import { useEffect, useState } from "react"; import { useAuth } from "../hooks/useAuth"; -import { StudentData } from "./types"; -import { Subject } from "./types"; -import { Programs } from "./types"; +import { Programs, StudentData, Subject } from "./types"; interface StudentFormProps { - formData: StudentData | null; - subjects: Subject[]; - professors: string[]; + formData: StudentData | null; + subjects: Subject[]; + professors: string[]; } @@ -19,544 +17,567 @@ const StudentForm = ({ formData, subjects, professors }: 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 Programs) || "" - ); - const [year, setYear] = useState(formData?.current_year || 1); - const [passedSubjects, setPassedSubjects] = useState( - formData?.passed_subjects || [] - ); - const [studyEffort, setStudyEffort] = useState(formData?.study_effort || ""); - const [domains, setDomains] = useState( - formData?.preferred_domains || [] - ); - const [technologies, setTechnologies] = useState( - formData?.preferred_technologies || [] - ); - const [evaluation, setEvaluation] = useState( - formData?.preferred_evaluation?.[0] || "" - ); - const [favoriteProfs, setFavoriteProfs] = useState( - formData?.favorite_professors || [] - ); - const [formStatus, setFormStatus] = useState<{ - isSubmitting: boolean; - message: string; - isError: boolean; - }>({ - isSubmitting: false, - message: "", - isError: false, - }); - - // Update form when formData changes (e.g., after fetching user data) - useEffect(() => { - if (formData) { - setIndex(formData.index || ""); - setStudyTrack((formData.study_track as Programs) || ""); - setYear(formData.current_year || 1); - setPassedSubjects(formData.passed_subjects || []); - setStudyEffort(formData.study_effort || ""); - setDomains(formData.preferred_domains || []); - setTechnologies(formData.preferred_technologies || []); - setEvaluation(formData.preferred_evaluation?.[0] || ""); - setFavoriteProfs(formData.favorite_professors || []); - } - }, [formData]); - - const validateForm = () => { - const errors: { [key: string]: string } = {}; - - if (!index.trim()) { - errors.index = "Индексот e задолжителен."; - } else if (!/^\d{6}$/.test(index)) { - errors.index = "Индексот треба да има точно 6 цифри."; - } - if (!studyTrack) errors.studyTrack = "Избери насока."; - if (!year) errors.year = "Избери година."; - if (!studyEffort) errors.studyEffort = "Избери пожелен вложен труд."; - if (passedSubjects.length === 0) - errors.passedSubjects = "Избери барем еден предмет."; - if (domains.length === 0) errors.domains = "Избери барем едно поле."; - if (technologies.length === 0) - errors.technologies = "Избери барем една технологија."; - if (!evaluation) errors.evaluation = "Избери тип на оценување."; - return errors; - }; - - const toggleSelection = ( - value: string | number, - setter: React.Dispatch>, - current: any[] - ) => { - if (current.includes(value)) { - setter(current.filter((v) => v !== value)); - } else { - setter([...current, value]); - } - }; - - const toggleSubject = (subject: Subject) => { - const exists = passedSubjects.some((s) => s.id === subject.id); - if (exists) { - setPassedSubjects(passedSubjects.filter((s) => s.id !== subject.id)); - } else { - setPassedSubjects([...passedSubjects, subject]); - } - }; - - const handleSubmit = async (e: React.FormEvent) => { - e.preventDefault(); - - const errors = validateForm(); - if (Object.keys(errors).length > 0) { - setValidationErrors(errors); - return; - } - setValidationErrors({}); - setFormStatus({ - isSubmitting: true, - message: "", - isError: false, - }); - - const payload = { - index, - study_track: studyTrack, - current_year: year, - passed_subjects: passedSubjects.map((subject) => subject.id), - study_effort: studyEffort, - preferred_domains: domains, - preferred_technologies: technologies, - preferred_evaluation: [evaluation], - favorite_professors: favoriteProfs, - }; - - try { - // For updating existing form data use PATCH instead of PUT for partial updates - const method = formData?.current_year ? "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); - } catch (error) { - console.error("Form submission error:", error); - setFormStatus({ - isSubmitting: false, - message: `Грешка при зачувување: ${(error as Error).message}`, - isError: true, - }); - } - }; - - const filteredMandatorySubjects = studyTrack - ? subjects.filter( - (subj) => - subj.subject_info.mandatory_for.includes(studyTrack) && - subj.subject_info.semester <= year * 2 - ) - : []; - const filteredElectiveSubjects = studyTrack - ? subjects.filter( - (subj) => - subj.subject_info.elective_for.includes(studyTrack) && - subj.subject_info.semester <= year * 2 - ) - : []; - - 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} -

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

- {validationErrors.year} -

- )} -
- -
-

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

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

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

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

- {validationErrors.passedSubjects} -

- )} -
- -
-

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

- {filteredElectiveSubjects.length > 0 ? ( -
- {filteredElectiveSubjects.map((subject) => { - const isSelected = passedSubjects.some( - (s) => s.id === subject.id - ); - return ( - + ); + })} +
+ ) : ( +

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

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

+ {validationErrors.passedSubjects} +

+ )} +
+ +
+

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

+ {filteredElectiveSubjects.length > 0 ? ( +
+ {filteredElectiveSubjects.map((subject) => { + const isSelected = passedSubjects.some( + (s) => s.id === subject.id + ); + return ( + - ); - })} -
- ) : ( -

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

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

- {validationErrors.studyEffort} -

- )} -
- -
-

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

-
- {DOMAINS.map((domain) => { - const isSelected = domains.includes(domain); - const isNemamSelected = domains.includes("Немам"); - const shouldBeDisabled = isNemamSelected && domain !== "Немам"; - return ( - - ); - })} -
- {validationErrors.domains && ( -

- {validationErrors.domains} -

- )} -
- -
-

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

-
- {TECHNOLOGIES.map((tech) => { - const isSelected = technologies.includes(tech); - const isNemamSelected = technologies.includes("Немам"); - const shouldBeDisabled = isNemamSelected && tech !== "Немам"; - return ( - - ); - })} -
- {validationErrors.technologies && ( -

- {validationErrors.technologies} -

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

- {validationErrors.evaluation} -

- )} -
- -
-

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

-
- {professors.map((prof) => ( - - ))} -
-
- -
- -
-
- ); + isSelected + ? "bg-green-500 text-white border-green-600 shadow-md" + : "bg-white text-gray-800 border-gray-300 hover:bg-gray-100" + }`} + aria-pressed={isSelected} + > + {isSelected && ( + + + + )} + {subject.name} + + ); + })} + + ) : ( +

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

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

+ {validationErrors.studyEffort} +

+ )} +
+ +
+

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

+
+ {DOMAINS.map((domain) => { + const isSelected = domains.includes(domain); + const isNemamSelected = domains.includes("Немам"); + const shouldBeDisabled = isNemamSelected && domain !== "Немам"; + return ( + + ); + })} +
+ {validationErrors.domains && ( +

+ {validationErrors.domains} +

+ )} +
+ +
+

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

+
+ {TECHNOLOGIES.map((tech) => { + const isSelected = technologies.includes(tech); + const isNemamSelected = technologies.includes("Немам"); + const shouldBeDisabled = isNemamSelected && tech !== "Немам"; + return ( + + ); + })} +
+ {validationErrors.technologies && ( +

+ {validationErrors.technologies} +

+ )} +
+ +
+

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

+
+ {EVALUATIONS.map((ev) => { + const isSelected = evaluation.includes(ev); + const isNemamSelected = evaluation.includes("Немам"); + const shouldBeDisabled = isNemamSelected && ev !== "Немам"; + return ( + + ); + })} +
+ {validationErrors.evaluation && ( +

+ {validationErrors.evaluation} +

+ )} +
+ +
+

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

+
+ {professors.map((prof) => ( + + ))} +
+
+ +
+ +
+ + ); };