Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(Release): Dashboard Client sync with Latest Staging #1676

Merged
merged 44 commits into from
Dec 27, 2024
Merged
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
51e42a9
feat(course_registration): Added option to add course for any sem
Akashsah2003 Dec 1, 2024
c84074a
Merge pull request #1660 from Akashsah2003/latest_staging
ramG-reddy Dec 1, 2024
819f102
fix: added default option for Academic year label
ramG-reddy Dec 1, 2024
5fcb6f1
Merge pull request #1661 from ramG-reddy/latest_staging
dvjsharma Dec 1, 2024
6fd02c0
authentication added and minor bug fixes
Lone24wolf Dec 1, 2024
263159f
bug fixes
Lone24wolf Dec 1, 2024
0c85022
fix(add_course): Show only relevant semesters in the add course form
Akashsah2003 Dec 1, 2024
35653f1
Merge pull request #1663 from Akashsah2003/latest_staging
dvjsharma Dec 1, 2024
655464e
Merge pull request #1662 from Lone24wolf/ac-7-examination
dvjsharma Dec 1, 2024
8adc86c
fix(add_course): Fixed bug in add course button
Akashsah2003 Dec 2, 2024
4b4c3bc
fix(drop_course): Fixed drop course functionality and added unique co…
Akashsah2003 Dec 2, 2024
8f1a221
declaration added
Lone24wolf Dec 2, 2024
80cd0d1
Merge pull request #1665 from Lone24wolf/ac-7-examination
dvjsharma Dec 2, 2024
dc84e74
fix(add_course): Added Course Slot Input in the form
Akashsah2003 Dec 2, 2024
bc50c33
Merge pull request #1664 from Akashsah2003/latest_staging
dvjsharma Dec 2, 2024
06416e3
final commit
Lone24wolf Dec 4, 2024
9f61999
Merge pull request #1666 from Lone24wolf/ac-7-examination
dvjsharma Dec 4, 2024
9e0e3ac
minor change
Lone24wolf Dec 4, 2024
ebc7b1f
fix: commented unwanted urls
ramG-reddy Dec 4, 2024
d189421
Merge remote-tracking branch 'upstream/latest_staging' into ac-7-exam…
Lone24wolf Dec 4, 2024
7ffa055
Merge remote-tracking branch 'upstream/latest_staging' into ac-7-exam…
Lone24wolf Dec 4, 2024
830d835
fix(elective allocation): Sort result of elective allocation while di…
Akashsah2003 Dec 4, 2024
40e3920
minor change
Lone24wolf Dec 4, 2024
5892211
Merge pull request #1667 from Akashsah2003/latest_staging
dvjsharma Dec 4, 2024
998cf49
Merge pull request #1668 from Lone24wolf/ac-7-examination
dvjsharma Dec 4, 2024
74422d5
one liner
Lone24wolf Dec 4, 2024
4320baa
Update views.py
ramG-reddy Dec 4, 2024
b6626d9
Merge pull request #1669 from ramG-reddy/latest_staging
ramG-reddy Dec 4, 2024
8642028
fix(UI): changed template
ramG-reddy Dec 4, 2024
a1611a2
Merge pull request #1670 from ramG-reddy/latest_staging
ramG-reddy Dec 4, 2024
fc3026a
Merge remote-tracking branch 'upstream/latest_staging' into ac-7-exam…
Lone24wolf Dec 4, 2024
ab4ad45
minor changes
Lone24wolf Dec 4, 2024
394dca1
Merge pull request #1671 from Lone24wolf/ac-7-examination
ramG-reddy Dec 4, 2024
5dc77d2
changes in examination
Lone24wolf Dec 4, 2024
8d73f26
Merge pull request #1672 from Lone24wolf/ac-7-examination
dvjsharma Dec 4, 2024
1e9138c
added names in template
Lone24wolf Dec 7, 2024
aa48897
Merge remote-tracking branch 'upstream/latest_staging' into ac-7-exam…
Lone24wolf Dec 7, 2024
921e33b
Merge pull request #1673 from Lone24wolf/ac-7-examination
ramG-reddy Dec 7, 2024
7ee186f
interface for students
Lone24wolf Dec 24, 2024
c653f3a
templates for student in examination
Dec 24, 2024
fff5428
Merge remote-tracking branch 'upstream/latest_staging' into ac-7-exam…
Lone24wolf Dec 24, 2024
3ac1abb
Merge pull request #1674 from Lone24wolf/ac-7-examination
ramG-reddy Dec 25, 2024
68a3caf
fix(registration): bug fixes in allocate fn to handle backlog courses
grvup Dec 27, 2024
f75d298
Merge pull request #1675 from ramG-reddy/latest_staging
ramG-reddy Dec 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
changes in examination
  • Loading branch information
Lone24wolf committed Dec 4, 2024
commit 5dc77d2b97347d1302b3f261ff653a3ba7d69e4e
6 changes: 3 additions & 3 deletions FusionIIIT/applications/examination/views.py
Original file line number Diff line number Diff line change
@@ -1522,10 +1522,10 @@ def generate_pdf(request):
academic_year = request.POST.get('academic_year')
course_info = get_object_or_404(Courses, id=course_id)
grades = Student_grades.objects.filter(course_id_id=course_id, year=academic_year).order_by("roll_no")
course=CourseInstructor.objects.get(course_id_id=course_id,year=academic_year)
course=CourseInstructor.objects.filter(course_id_id=course_id,year=academic_year,instructor_id_id=request.user.username)
if not course:
return JsonResponse({"success": False, "error": "course not found."}, status=404)
semester=course.semester_no
semester=course.first().semester_no

all_grades = ["O", "A+", "A", "B+", "B", "C+", "C", "D+", "D", "F", "I", "S", "X"]
grade_counts = {grade: grades.filter(grade=grade).count() for grade in all_grades}
@@ -1713,7 +1713,7 @@ def generate_result(request):
).first()
if not semester_info:
return JsonResponse({'error': 'Semester not found'}, status=404)

# print(batch, branch)
course_slots = CourseSlot.objects.filter(semester_id=semester_info)
course_ids = course_slots.values_list('courses', flat=True)
courses = Courses.objects.filter(id__in=course_ids)