Index: backend/subjects/models.py =================================================================== --- backend/subjects/models.py (revision e637952bd9f1e6ff1b3d5cd472e5bcc0e0e0d834) +++ backend/subjects/models.py (revision 8ba18400835e3bf5d7e72a00230cdbcb5606d5f5) @@ -72,4 +72,8 @@ def downvote_count(self): return self.votes.filter(review_votes__reviewvote__vote_type='down').count() + @property + def votes_count(self): + return self.votes.count() + class ReviewVote(models.Model): @@ -96,5 +100,5 @@ # option B: theory: 35%, practical: 35%, labs: 10%, project: 20% # each of these (option A - project, option A - labs, option B - project etc. is a EvaluationComponent) - evaluation_review = models.ForeignKey(EvaluationReview, on_delete=models.CASCADE) + evaluation_review = models.ForeignKey(EvaluationReview, on_delete=models.CASCADE, related_name='methods') note = models.CharField(max_length=64, null=True, blank=True, help_text="additional info about this particular evaluation method.") @@ -110,5 +114,5 @@ # todo: check if there are more ] - evaluation_method = models.ForeignKey(EvaluationMethod, on_delete=models.CASCADE) + evaluation_method = models.ForeignKey(EvaluationMethod, on_delete=models.CASCADE, related_name='components') category = models.CharField(max_length=16, choices=CATEGORY_TYPE_CHOICES) percentage = models.IntegerField(validators=[MinValueValidator(0), MaxValueValidator(100)]) Index: backend/subjects/serializers.py =================================================================== --- backend/subjects/serializers.py (revision e637952bd9f1e6ff1b3d5cd472e5bcc0e0e0d834) +++ backend/subjects/serializers.py (revision 8ba18400835e3bf5d7e72a00230cdbcb5606d5f5) @@ -1,4 +1,4 @@ from rest_framework import serializers -from .models import Subject, Subject_Info, EvaluationMethod, EvaluationComponent, EvaluationReview, OtherReview +from .models import Subject, Subject_Info, EvaluationMethod, EvaluationComponent, EvaluationReview, OtherReview, Review class SubjectInfoSerializer(serializers.ModelSerializer): @@ -22,4 +22,5 @@ 'is_easy' ] + class SubjectSerializer(serializers.ModelSerializer): subject_info = SubjectInfoSerializer() @@ -30,22 +31,18 @@ ] +class ReviewMetaSerializer(serializers.ModelSerializer): + student = serializers.SerializerMethodField() + + class Meta: + model = Review + fields = ['student', 'is_confirmed', 'votes_count'] + + def get_student(self, obj): + return obj.student.index + class EvaluationComponentSerializer(serializers.ModelSerializer): class Meta: model = EvaluationComponent fields = ['category', 'percentage'] - - # def validate(self, data): - # try: - # category = data['category'] - # percentage = data['percentage'] - # try: - # percentage = int(percentage) - # except ValueError: - # raise ValidationError("percentage should be an integer.") - # except: - # raise ValidationError("invalid data for evaluation component.") - # - # return data - @@ -75,8 +72,9 @@ class EvaluationReviewSerializer(serializers.ModelSerializer): methods = EvaluationMethodSerializer(many=True) + review = ReviewMetaSerializer() class Meta: model = EvaluationReview - fields = ['methods'] + fields = ['review', 'methods'] def validate(self, data): @@ -91,12 +89,15 @@ evaluation_review = EvaluationReview.objects.create(review=review) for method_data in methods_data: - method_data['evaluation_review'] = evaluation_review - self.fields['methods'].create(method_data) + validated_method_data = self.fields['methods'].child.run_validation(method_data) + validated_method_data['evaluation_review'] = evaluation_review + self.fields['methods'].child.create(validated_method_data) return evaluation_review class OtherReviewSerializer(serializers.ModelSerializer): + review = ReviewMetaSerializer() + class Meta: model = OtherReview - fields = ['category', 'content'] + fields = ['review', 'category', 'content'] def create(self, validated_data): Index: backend/subjects/urls.py =================================================================== --- backend/subjects/urls.py (revision e637952bd9f1e6ff1b3d5cd472e5bcc0e0e0d834) +++ backend/subjects/urls.py (revision 8ba18400835e3bf5d7e72a00230cdbcb5606d5f5) @@ -1,4 +1,4 @@ from django.urls import path -from .views import ToggleSubjectPreferences, PreferencesView, all_subjects, get_recommendations, SubjectReview +from .views import ToggleSubjectPreferences, PreferencesView, all_subjects, get_recommendations, SubjectReview, ReviewsForSubject urlpatterns = [ path('all/', all_subjects, name='all_subjects'), @@ -6,4 +6,5 @@ path('preferences/', PreferencesView.as_view(), name='student-preferences'), path('toggle-subject-pref/', ToggleSubjectPreferences.as_view(), name='student-toggle-preferences'), - path('subject-review', SubjectReview.as_view(), name='subject-review') + path('subject-review', SubjectReview.as_view(), name='subject-review'), + path('subject-review/', ReviewsForSubject.as_view(), name='subject-review') ] Index: backend/subjects/views.py =================================================================== --- backend/subjects/views.py (revision e637952bd9f1e6ff1b3d5cd472e5bcc0e0e0d834) +++ backend/subjects/views.py (revision 8ba18400835e3bf5d7e72a00230cdbcb5606d5f5) @@ -10,5 +10,5 @@ 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 -from .models import Subject, Review, EvaluationReview +from .models import Subject, Review, EvaluationReview, OtherReview def index(request): @@ -158,9 +158,6 @@ ) - existing_evaluation = EvaluationReview.objects.filter( - review__subject_id=subject_id - ).exists() - - if existing_evaluation: + if review_type == 'evaluation' and \ + EvaluationReview.objects.filter(review__subject_id=subject_id).exists(): return Response( {"error": "An evaluation review for this subject already exists."}, @@ -189,2 +186,22 @@ review.delete() return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + +class ReviewsForSubject(APIView): + def get(self, request, code): + subject = Subject.objects.filter(code=code) + if not subject.exists(): + return Response({'error': 'Subject not found.'}, status=status.HTTP_404_NOT_FOUND) + + reviews = Review.objects.filter(subject__code=code) + + evaluation_reviews = EvaluationReview.objects.filter(review__in=reviews).first() + other_reviews = OtherReview.objects.filter(review__in=reviews) + + + evaluation_serializer = EvaluationReviewSerializer(evaluation_reviews) + other_serializer = OtherReviewSerializer(other_reviews, many=True) + + return Response({ + "evaluation": evaluation_serializer.data, + "other": other_serializer.data + }, status=status.HTTP_200_OK) Index: frontend/src/constants/subjects.ts =================================================================== --- frontend/src/constants/subjects.ts (revision e637952bd9f1e6ff1b3d5cd472e5bcc0e0e0d834) +++ frontend/src/constants/subjects.ts (revision 8ba18400835e3bf5d7e72a00230cdbcb5606d5f5) @@ -30,3 +30,7 @@ Code: "Код", Project: "Проект", + Homework: "Домашни", + Labs: "Лабораториски", + Attendance: "Присуство", + Presentation: "Презентација", }; Index: frontend/src/pages/SubjectView.tsx =================================================================== --- frontend/src/pages/SubjectView.tsx (revision e637952bd9f1e6ff1b3d5cd472e5bcc0e0e0d834) +++ frontend/src/pages/SubjectView.tsx (revision 8ba18400835e3bf5d7e72a00230cdbcb5606d5f5) @@ -1,9 +1,56 @@ -import { ArrowLeft, Tag, Users } from "lucide-react"; +import { + ArrowDown, + ArrowLeft, + ArrowUp, + Tag, + // ThumbsDown, + // ThumbsUp, + 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 { getSubjectPrerequisites } from "../components/SubjectCatalog/utils"; import SkeletonSubjectView from "../components/SubjectView/SkeletonSubjectView"; import { EVALUATION_MAP_TO_MK } from "../constants/subjects"; import { useSubjects } from "../context/SubjectsContext"; + +interface EvaluationComponent { + category: + | "project" + | "theory" + | "practical" + | "homework" + | "attendance" + | "presentation"; + percentage: number; +} + +interface EvaluationMethod { + note?: string; + components: EvaluationComponent[]; +} + +interface EvaluationReview { + review: Review; + methods: EvaluationMethod[]; +} + +interface OtherReview { + review: Review; + category: "material" | "staff" | "other"; + content: string; +} + +interface Review { + student?: string; + is_confirmed?: boolean; + votes_count?: number; +} + +interface Reviews { + evaluation: EvaluationReview; // only one evaluation review per subject + other: OtherReview[]; +} function SubjectView() { @@ -12,4 +59,5 @@ >("Нема предуслов"); const [isExpanded, setIsExpanded] = useState(false); + const [reviews, setReviews] = useState({} as Reviews); const [filteredTechonologies, setFilteredTechnologies] = useState( [] @@ -25,4 +73,18 @@ 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]); const WORD_LIMIT = 40; @@ -242,4 +304,179 @@ + +
+ {!reviews || + !reviews.evaluation || + !reviews.other ? null : reviews.evaluation?.methods?.length == + 0 && reviews.other.length == 0 ? ( +

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

+ ) : ( + <> +

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

+ {reviews.evaluation.methods.length > 0 && ( + <> + {reviews.evaluation?.methods?.length > 0 && ( +
+

+ Информации за полагање +

+
+ {reviews && + reviews.evaluation && + (reviews.evaluation?.methods?.length > 0 ? ( +
+
+
+ + Индекс:{" "} + {reviews.evaluation?.review.student} + + {reviews.evaluation?.review + .is_confirmed ? ( +
+ {/* */} + + Потврдено + +
+ ) : ( +
+ + Непотврдено + +
+ )} +
+
+ + + {reviews.evaluation?.review.votes_count} + + +
+
+ {reviews.evaluation?.methods?.map( + (method, index) => ( +
+
+
+

+ Начин на положување {index + 1}: +

+
+ + + + + + + + + {method.components.map( + (component, cidx) => ( + + + + + ) + )} + +
+ Активност + + Процент од оценка +
+ { + EVALUATION_MAP_TO_MK[ + (component.category + .charAt(0) + .toUpperCase() + + component.category.slice( + 1 + )) as keyof typeof EVALUATION_MAP_TO_MK + ] + } + + {component.percentage} + % +
+
+
+
+
+ ) + )} +

+ Услов за потпис: TODO +

+
+ ) : null)} +
+
+ )} + + )} + {reviews.other.length > 0 && ( +
+

+ Останати информации +

+ +
+ {reviews.other.map((review) => ( +
+
+
+ + Индекс: {review.review.student} + + + {review.category} + + {reviews.evaluation?.review.is_confirmed ? ( +
+ {/* */} + Потврдено +
+ ) : ( +
+ Непотврдено +
+ )} +
+
+ + + {review.review.votes_count} + + +
+
+

+ {review.content} +

+
+ ))} +
+
+ )} + + )} +
+ +
+
@@ -339,12 +576,4 @@ )} - {/* -
-
- -
-
*/}