Index: backend/subjects/migrations/0007_review_date_posted_alter_evaluationreview_review_and_more.py =================================================================== --- backend/subjects/migrations/0007_review_date_posted_alter_evaluationreview_review_and_more.py (revision b9e613c8422f2b7b3237c9e7e83f77e2595db01e) +++ backend/subjects/migrations/0007_review_date_posted_alter_evaluationreview_review_and_more.py (revision b9e613c8422f2b7b3237c9e7e83f77e2595db01e) @@ -0,0 +1,31 @@ +# Generated by Django 5.1.7 on 2025-07-15 14:00 + +import django.db.models.deletion +import django.utils.timezone +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('subjects', '0006_evaluationreview_signature_condition_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='review', + name='date_posted', + field=models.DateField(auto_now_add=True, default=django.utils.timezone.now), + preserve_default=False, + ), + migrations.AlterField( + model_name='evaluationreview', + name='review', + field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='evaluation_review', to='subjects.review'), + ), + migrations.AlterField( + model_name='otherreview', + name='review', + field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='other_review', to='subjects.review'), + ), + ] Index: backend/subjects/models.py =================================================================== --- backend/subjects/models.py (revision ca289073ac6fa2d847b5281f90237873572b7f7b) +++ backend/subjects/models.py (revision b9e613c8422f2b7b3237c9e7e83f77e2595db01e) @@ -62,4 +62,5 @@ ) review_type = models.CharField(max_length=16, choices=REVIEW_TYPE_CHOICES) + date_posted = models.DateField(auto_now_add=True) def __str__(self): Index: backend/subjects/serializers.py =================================================================== --- backend/subjects/serializers.py (revision ca289073ac6fa2d847b5281f90237873572b7f7b) +++ backend/subjects/serializers.py (revision b9e613c8422f2b7b3237c9e7e83f77e2595db01e) @@ -39,5 +39,5 @@ class Meta: model = Review - fields = ['id', 'student', 'subject', 'is_confirmed', 'votes_score', 'user_has_voted'] + fields = ['id', 'student', 'subject', 'is_confirmed', 'votes_score', 'user_has_voted', 'date_posted'] Index: backend/subjects/views.py =================================================================== --- backend/subjects/views.py (revision ca289073ac6fa2d847b5281f90237873572b7f7b) +++ backend/subjects/views.py (revision b9e613c8422f2b7b3237c9e7e83f77e2595db01e) @@ -8,5 +8,5 @@ from rest_framework.views import APIView from rest_framework.permissions import IsAuthenticated -from django.db.models import Case, When +from django.db.models import Case, When, Count, F, Q from subjects.utils import get_eligible_subjects, get_recommendations_cache_key, get_recommended_subjects, map_to_subjects_vector, score_for_preferences, get_student_vector from .serializers import SubjectSerializer, EvaluationReviewSerializer, OtherReviewSerializer @@ -256,5 +256,5 @@ class ReviewListView(APIView): - permission_classes = [IsAuthenticated, IsAdmin] + permission_classes = [IsAuthenticated] def get(self, request): @@ -274,4 +274,33 @@ review_query_set = review_query_set.filter(is_confirmed=is_confirmed) + subject_code = request.query_params.get("subject_code") + if subject_code: + review_query_set = review_query_set.filter(subject__code=subject_code) + + sort_by = request.query_params.get('sort_by', 'date') + sort_order = request.query_params.get('sort_order', 'desc') + + if sort_by not in ['date', 'votes']: + return Response({"message": "Invalid sort_by param."}, status=status.HTTP_400_BAD_REQUEST) + + if sort_order not in ['asc', 'desc']: + return Response({"message": "Invalid sort_order param."}, status=status.HTTP_400_BAD_REQUEST) + + if sort_by == 'votes': + review_query_set = review_query_set.annotate( + vote_score=Count('votes', filter=Q(reviewvote__vote_type='up')) - + Count('votes', filter=Q(reviewvote__vote_type='down')) + ) + + if sort_order == 'desc': + review_query_set = review_query_set.order_by('-vote_score', '-id') + else: + review_query_set = review_query_set.order_by('vote_score', 'id') + else: + if sort_order == 'desc': + review_query_set = review_query_set.order_by('-id') + else: + review_query_set = review_query_set.order_by('id') + review_query_set = review_query_set.select_related("evaluation_review", "other_review") @@ -282,8 +311,8 @@ for review in paginated_query_set: if review.review_type == 'evaluation' and hasattr(review, "evaluation_review"): - serializer = EvaluationReviewSerializer(review.evaluation_review) + serializer = EvaluationReviewSerializer(review.evaluation_review, context={'request': request}) data.append(serializer.data) elif review.review_type == 'other' and hasattr(review, "other_review"): - serializer = OtherReviewSerializer(review.other_review) + serializer = OtherReviewSerializer(review.other_review, context={'request': request}) data.append(serializer.data) Index: frontend/src/App.tsx =================================================================== --- frontend/src/App.tsx (revision ca289073ac6fa2d847b5281f90237873572b7f7b) +++ frontend/src/App.tsx (revision b9e613c8422f2b7b3237c9e7e83f77e2595db01e) @@ -10,5 +10,4 @@ import "./index.css"; import Account from "./pages/Account"; -import AdminDashboard from "./pages/AdminDashboard"; import Home from "./pages/Home"; import Login from "./pages/Login"; @@ -17,4 +16,5 @@ import Register from "./pages/Register"; import ReviewForm from "./pages/ReviewForm"; +import Reviews from "./pages/Reviews"; import SubjectPreferences from "./pages/SubjectPreferences"; import SubjectView from "./pages/SubjectView"; @@ -89,12 +89,11 @@ }, { - path: "admin", + path: "reviews", element: ( - - + + ), }, - { path: "*", Index: frontend/src/components/Navbar.tsx =================================================================== --- frontend/src/components/Navbar.tsx (revision ca289073ac6fa2d847b5281f90237873572b7f7b) +++ frontend/src/components/Navbar.tsx (revision b9e613c8422f2b7b3237c9e7e83f77e2595db01e) @@ -106,4 +106,23 @@ Сите предмети + {isAuthenticated && user?.user_type === "student" && ( + + Информации од студенти + + )} + {isAuthenticated && user?.user_type === "admin" && ( + + Админ панел + + )} + {isAuthenticated && user?.user_type === "student" && ( + setProfileMenuOpen(false)} + > + Препораки + + )} {isAuthenticated ? (
@@ -118,11 +137,4 @@ {user?.user_type === "admin" ? ( <> - setProfileMenuOpen(false)} - > - Админ панел - -
- - - - -
- {reviews.length === 0 && !loading ? ( -

- Нема резултати за избраните филтри. -

- ) : ( - reviews.map((review) => ( -
-
-
-
- - {review.review.subject.name} ({review.review.subject.code} - ) - - - {/* className={`px-2 py-1 rounded text-xs font-medium ${ - "methods" in review - ? "bg-blue-100 text-blue-800" - : "bg-purple-100 text-purple-800" - }`} - > - */} - {/* make api specify types to prevent this */} - {"methods" in review ? "Полагање" : "Други"} - - {"category" in review && review.category && ( - - { - MAP_REVIEW_CATEGORY_TO_MK[ - review.category as keyof typeof MAP_REVIEW_CATEGORY_TO_MK - ] - } - - )} -
-
- Студент: {review.review.student} - - Гласови:{" "} - {`${ - review.review.votes_score ?? 0 > 0 - ? "+" - : review.review.votes_score ?? 0 < 0 - ? "-" - : "" - }${review.review.votes_score}`} - -
-
-
- - - -
-
- -
- - {review.review.is_confirmed ? "✓ Одобрено" : "✗ Неодобрено"} - -
- - {expandedReview === review.review.id && ( -
- {"methods" in review ? ( -
-

Начини на оценување:

- {review.methods?.map((method, index) => ( -
-

Метод {index + 1}:

- {method.note && ( -

- Забелешка: {method.note} -

- )} -
- - - - - - - - - {method.components.map((component, idx) => ( - - - - - ))} - -
- Активност - - Процент -
- { - EVALUATION_MAP_TO_MK[ - (component.category - .charAt(0) - .toUpperCase() + - component.category.slice( - 1 - )) as keyof typeof EVALUATION_MAP_TO_MK - ] - } - - {component.percentage}% -
-
-
- ))} -
- Услов за потпис:{" "} - {review.signature_condition || "Нема"} -
-
- ) : ( -
-

Содржина:

-

- {"content" in review ? review.content : "Нема содржина"} -

-
- )} -
- )} -
- )) - )} - - {nextUrl && ( -
- -
- )} -
- - {loading && reviews.length === 0 && ( -
-
Се вчитува...
-
- )} - - ); -}; - -export default AdminDashboard; Index: frontend/src/pages/ReviewForm.tsx =================================================================== --- frontend/src/pages/ReviewForm.tsx (revision ca289073ac6fa2d847b5281f90237873572b7f7b) +++ frontend/src/pages/ReviewForm.tsx (revision b9e613c8422f2b7b3237c9e7e83f77e2595db01e) @@ -1,5 +1,5 @@ -import { AlertCircle, Plus, Trash2 } from "lucide-react"; +import { AlertCircle, ArrowLeft, Plus, Trash2 } from "lucide-react"; import { useState } from "react"; -import { useLocation, useNavigate } from "react-router-dom"; +import { useLocation, useNavigate, useParams } from "react-router-dom"; import axiosInstance from "../api/axiosInstance"; import { EvaluationComponent, EvaluationMethod } from "../components/types"; @@ -44,5 +44,7 @@ const subjectName: string = location?.state?.subject_name; const subjectId: number = location?.state?.subject_id; - // const { code } = useParams(); + // const from: string = location.state?.from || "/"; + const { code } = useParams(); + const from = `/subjects/${code}`; const addMethod = () => { @@ -193,11 +195,22 @@ return (
+ +

Сподели информација

- {subjectName && ( + {(subjectName || code) && (

Додавате информација за предмет:{" "} - {subjectName} + {subjectName || code}

Index: frontend/src/pages/Reviews.tsx =================================================================== --- frontend/src/pages/Reviews.tsx (revision b9e613c8422f2b7b3237c9e7e83f77e2595db01e) +++ frontend/src/pages/Reviews.tsx (revision b9e613c8422f2b7b3237c9e7e83f77e2595db01e) @@ -0,0 +1,538 @@ +import { CheckCircle, Eye, Trash2, XCircle } from "lucide-react"; +import { useEffect, useRef, useState } from "react"; +import { useLocation } from "react-router-dom"; +import axiosInstance from "../api/axiosInstance"; +import { fetchSubjects } from "../api/subjects"; +import Votes from "../components/Reviews/Votes"; +import { LatinToCyrillic } from "../components/StudentForm/utils"; +import { MAP_REVIEW_CATEGORY_TO_MK } from "../components/SubjectCatalog/utils"; +import { EvaluationReview, OtherReview } from "../components/types"; +import { EVALUATION_MAP_TO_MK } from "../constants/subjects"; +import { useSubjects } from "../context/SubjectsContext"; +import { useAuth } from "../hooks/useAuth"; + +type ReviewsList = (OtherReview | EvaluationReview)[]; + +interface ApiResponse { + count: number; + next: string | null; + previous: string | null; + results: ReviewsList; +} + +const Reviews = () => { + const [reviews, setReviews] = useState([]); + const [loading, setLoading] = useState(false); + const [nextUrl, setNextUrl] = useState(null); + const [filters, setFilters] = useState({ + type: "all", // all, evaluation, other + subject: "all", // all | + approved: "all", // all, approved, unapproved + sort_by: "date", // date, votes + sort_order: "desc", // asc, desc + }); + const [subjects, setSubjects] = useSubjects(); + const { user } = useAuth(); + const location = useLocation(); + const [subjectSearch, setSubjectSearch] = useState(""); + const [showSubjectDropdown, setShowSubjectDropdown] = useState(false); + const [selectedSubject, setSelectedSubject] = useState<{ + name: string; + } | null>(null); + const [collapsedReviews, setCollapsedReviews] = useState>( + new Set() + ); + const [hasSearched, setHasSearched] = useState(false); + const dropdownRef = useRef(null); + const code = location.state?.code || ""; + useEffect(() => { + const handleClickOutside = (event: MouseEvent) => { + if ( + dropdownRef.current && + !dropdownRef.current.contains(event.target as Node) + ) { + setShowSubjectDropdown(false); + } + }; + document.addEventListener("mousedown", handleClickOutside); + return () => { + document.removeEventListener("mousedown", handleClickOutside); + }; + }, []); + + useEffect(() => { + if (code) { + setFilters((prev) => ({ ...prev, subject: code })); + const subject = subjects.find((s) => s.code === code); + if (subject) { + setSelectedSubject({ name: subject.name }); + } + } + }, [code, subjects]); + + useEffect(() => { + fetchSubjects(setSubjects); + }, []); + + const fetchReviews = async (url?: string, reset = false) => { + setLoading(true); + setHasSearched(true); + try { + const params = new URLSearchParams(); + if (filters.type !== "all") params.append("type", filters.type); + if (filters.subject !== "all") + params.append("subject_code", filters.subject); + if (filters.approved !== "all") { + params.append( + "is_confirmed", + filters.approved === "approved" ? "true" : "false" + ); + } + params.append("sort_by", filters.sort_by); + params.append("sort_order", filters.sort_order); + + const requestUrl = + url || `/subjects/subjects-reviews-list/?${params.toString()}`; + const response = await axiosInstance.get(requestUrl); + if (reset) { + setReviews(response.data.results); + } else { + setReviews((prev) => [...prev, ...response.data.results]); + } + setNextUrl(response.data.next); + } catch (error) { + console.error("Error fetching reviews:", error); + } finally { + setLoading(false); + } + }; + + const toggleApproval = async (reviewId: number, currentStatus: boolean) => { + try { + await axiosInstance.patch(`/subjects/admin-subject-review/${reviewId}/`, { + is_confirmed: !currentStatus, + }); + setReviews((prev) => + prev.map((review) => + review.review.id === reviewId + ? { + ...review, + review: { ...review.review, is_confirmed: !currentStatus }, + } + : review + ) + ); + } catch (error) { + console.error("Error updating review approval:", error); + } + }; + + const deleteReview = async (reviewId: number) => { + if (!confirm("Дали сте сигурни дека сакате да избришете?")) { + return; + } + + try { + await axiosInstance.delete(`/subjects/admin-subject-review/${reviewId}/`); + setReviews((prev) => + prev.filter((review) => review.review.id !== reviewId) + ); + } catch (error) { + console.error("Error deleting review:", error); + } + }; + + const handleSearch = () => { + fetchReviews(undefined, true); + }; + + const loadMore = () => { + if (nextUrl && !loading) { + fetchReviews(nextUrl); + } + }; + + const isAdmin = user?.user_type === "admin"; + + return ( +
+

+ {isAdmin ? "Администраторски панел" : "Информации од студенти"} +

+ + {/* filters */} +
+
+
+
+
+ +
+ {selectedSubject === null && ( + { + setSubjectSearch(e.target.value); + setShowSubjectDropdown(true); + }} + onFocus={() => setShowSubjectDropdown(true)} + placeholder={`${ + selectedSubject === null ? "Пребарај предмет..." : "" + }`} + disabled={selectedSubject !== null} + className={`w-64 px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 ${ + selectedSubject ? "bg-gray-100 cursor-not-allowed" : "" + }`} + /> + )} + {showSubjectDropdown && !selectedSubject && ( +
+ {subjects + .filter( + (subject) => + subject.name + .toLowerCase() + .includes(subjectSearch.toLowerCase()) || + subject.name + .toLowerCase() + .includes( + LatinToCyrillic( + subjectSearch.toLowerCase() + ).toLowerCase() + ) + ) + .slice(0, 5) + .map((subject) => ( +
{ + setSelectedSubject({ + name: subject.name, + }); + setFilters((prev) => ({ + ...prev, + subject: subject.code, + })); + setSubjectSearch(""); + setShowSubjectDropdown(false); + }} + > + {subject.name} +
+ ))} +
+ )} +
+ + {selectedSubject && ( +
+ { + setSelectedSubject(null); + setFilters((prev) => ({ ...prev, subject: "all" })); + setSubjectSearch(""); + }} + className="inline-flex items-center px-3 py-2 bg-blue-100 text-blue-800 rounded-full text-sm cursor-pointer hover:bg-blue-200 transition-colors" + > + {selectedSubject.name} + + × + + +
+ )} +
+
+ + +
+
+ + +
+
+ +
+ + +
+
+
+
+ +
+
+
+
+ +
+ {hasSearched && reviews.length === 0 && !loading ? ( +

+ Нема резултати за избраните филтри. +

+ ) : ( + reviews.map((review) => ( +
+
+
+
+ + {review.review.subject.name} ({review.review.subject.code} + ) + + + {"methods" in review ? "Полагање" : "Други"} + + {"category" in review && review.category && ( + + { + MAP_REVIEW_CATEGORY_TO_MK[ + review.category as keyof typeof MAP_REVIEW_CATEGORY_TO_MK + ] + } + + )} +
+
+ {review.review.date_posted} + Студент: {review.review.student} + + Гласови:{" "} + {`${ + review.review.votes_score ?? 0 > 0 + ? "+" + : review.review.votes_score ?? 0 < 0 + ? "-" + : "" + }${review.review.votes_score}`} + +
+
+
+ {!isAdmin && } + + {isAdmin && ( + <> + + + + )} +
+
+ +
+ + {review.review.is_confirmed ? "✓ Одобрено" : "✗ Неодобрено"} + +
+ + {!collapsedReviews.has(review.review.id!) && ( +
+ {"methods" in review ? ( +
+

Начини на оценување:

+ {review.methods?.map((method, index) => ( +
+

Метод {index + 1}:

+ {method.note && ( +

+ Забелешка: {method.note} +

+ )} +
+ + + + + + + + + {method.components.map((component, idx) => ( + + + + + ))} + +
+ Активност + + Процент +
+ { + EVALUATION_MAP_TO_MK[ + (component.category + .charAt(0) + .toUpperCase() + + component.category.slice( + 1 + )) as keyof typeof EVALUATION_MAP_TO_MK + ] + } + + {component.percentage}% +
+
+
+ ))} +
+ Услов за потпис:{" "} + {review.signature_condition || "Нема"} +
+
+ ) : ( +
+

Содржина:

+

+ {"content" in review ? review.content : "Нема содржина"} +

+
+ )} +
+ )} +
+ )) + )} + + {nextUrl && ( +
+ +
+ )} +
+ + {loading && reviews.length === 0 && ( +
+
Се вчитува...
+
+ )} +
+ ); +}; + +export default Reviews; Index: frontend/src/pages/SubjectView.tsx =================================================================== --- frontend/src/pages/SubjectView.tsx (revision ca289073ac6fa2d847b5281f90237873572b7f7b) +++ frontend/src/pages/SubjectView.tsx (revision b9e613c8422f2b7b3237c9e7e83f77e2595db01e) @@ -1,18 +1,8 @@ -import { - ArrowLeft, - Tag, - // ThumbsDown, - // ThumbsUp, - Users, -} from "lucide-react"; +import { ArrowLeft, Tag, Users } from "lucide-react"; import { useEffect, useMemo, useState } from "react"; 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"; @@ -24,5 +14,4 @@ >("Нема предуслов"); const [isExpanded, setIsExpanded] = useState(false); - const [reviews, setReviews] = useState({} as Reviews); const [filteredTechonologies, setFilteredTechnologies] = useState( [] @@ -38,18 +27,4 @@ return subjects.find((subject) => subject.code === code); }, [subjects, code]); - - useEffect(() => { - if (!selectedSubject) return; - (async () => { - try { - const response = await axiosInstance.get( - `subjects/subject-review/${selectedSubject?.code}` - ); - setReviews(response.data); - } catch (err) { - console.error("Error: ", err); - } - })(); - }, [selectedSubject]); useEffect(() => { @@ -95,10 +70,8 @@ }, [selectedSubject, subjects]); - // We are "loading" if the global subjects context hasn't populated yet. if (subjects.length === 0) { return ; } - // Handle case where the subject code is not found in our global list if (!selectedSubject) { return ( @@ -145,4 +118,43 @@

+ + {/* Action buttons */} +
+ {user?.user_type === "student" ? ( + <> + + + + ) : user?.user_type === "admin" ? ( + + ) : null} +
@@ -273,43 +285,4 @@ - - {/* reviews section */} -
- {!reviews || - !reviews.evaluation || - !reviews.other ? null : reviews.evaluation?.methods?.length == - 0 && reviews.other.length == 0 ? ( -

Нема информации од студенти за овој предмет.

- ) : ( - <> -

- Информации од студенти -

- {reviews.evaluation.methods.length > 0 && ( - - )} - {reviews.other.length > 0 && ( - - )} - - )} - {user?.user_type == "student" && ( -
- -
- )} -