From 0133a004d4fba5895d09dd679835aefccffb9dc1 Mon Sep 17 00:00:00 2001 From: Pratik Date: Mon, 18 Nov 2024 03:06:17 +0530 Subject: [PATCH 1/2] feat: Added session expired logout feature --- FusionIIIT/Fusion/settings/common.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/FusionIIIT/Fusion/settings/common.py b/FusionIIIT/Fusion/settings/common.py index d9017dd40..ee1618a24 100644 --- a/FusionIIIT/Fusion/settings/common.py +++ b/FusionIIIT/Fusion/settings/common.py @@ -284,3 +284,8 @@ CORS_ORIGIN_ALLOW_ALL = True ALLOW_PASS_RESET = True + +# session settings +SESSION_COOKIE_AGE = 15 * 60 +SESSION_EXPIRE_AT_BROWSER_CLOSE = True +SESSION_SAVE_EVERY_REQUEST = True \ No newline at end of file From 425a0bcec814c7cb890613130d31cbcb368c996a Mon Sep 17 00:00:00 2001 From: Akash Kumar Sah Date: Tue, 19 Nov 2024 08:07:30 +0530 Subject: [PATCH 2/2] feat(pre-registration): Added delete pre registration data functionality for acad admin --- .../academic_information/forms.py | 14 ++- .../academic_information/views.py | 44 ++++++- FusionIIIT/templates/ais/ais.html | 29 ++++- .../templates/ais/delete_preregistration.html | 110 ++++++++++++++++++ 4 files changed, 191 insertions(+), 6 deletions(-) create mode 100644 FusionIIIT/templates/ais/delete_preregistration.html diff --git a/FusionIIIT/applications/academic_information/forms.py b/FusionIIIT/applications/academic_information/forms.py index ddf7ddcdc..8fde1e589 100755 --- a/FusionIIIT/applications/academic_information/forms.py +++ b/FusionIIIT/applications/academic_information/forms.py @@ -1,6 +1,6 @@ from django import forms -from .models import Exam_timetable, Meeting, Timetable +from .models import Exam_timetable, Meeting, Timetable, Student class MinuteForm(forms.ModelForm): @@ -49,3 +49,15 @@ class ExamTimetableForm(forms.ModelForm): class Meta: model = Exam_timetable fields = ('programme', 'exam_time_table',) + + +class PreRegistrationSearchForm(forms.Form): + roll_no = forms.CharField( + max_length=20, + widget=forms.TextInput(attrs={'class': 'ui input', 'placeholder': 'Enter Roll Number'}), + label="Roll Number" + ) + semester_no = forms.IntegerField( + widget=forms.NumberInput(attrs={'class': 'ui input', 'placeholder': 'Enter Semester No'}), + label="Semester No" + ) \ No newline at end of file diff --git a/FusionIIIT/applications/academic_information/views.py b/FusionIIIT/applications/academic_information/views.py index 2df3833b2..c468c97c5 100755 --- a/FusionIIIT/applications/academic_information/views.py +++ b/FusionIIIT/applications/academic_information/views.py @@ -16,12 +16,13 @@ from django.views.decorators.csrf import csrf_exempt from django.template.loader import render_to_string from django.contrib.auth.decorators import login_required +from django.contrib import messages -from applications.academic_procedures.models import MinimumCredits, Register, InitialRegistration, course_registration, AssistantshipClaim,Assistantship_status,FinalRegistration +from applications.academic_procedures.models import MinimumCredits, Register, InitialRegistration, course_registration, AssistantshipClaim,Assistantship_status,FinalRegistration, StudentRegistrationChecks from applications.globals.models import (Designation, ExtraInfo, HoldsDesignation, DepartmentInfo) -from .forms import AcademicTimetableForm, ExamTimetableForm, MinuteForm +from .forms import AcademicTimetableForm, ExamTimetableForm, MinuteForm, PreRegistrationSearchForm from .models import (Calendar, Course, Exam_timetable, Grades, Curriculum_Instructor,Constants, Meeting, Student, Student_attendance, Timetable,Curriculum) from applications.programme_curriculum.models import (CourseSlot, Course as Courses, Batch, Semester, Programme, Discipline) @@ -129,6 +130,7 @@ def get_context(request): assistant_flag ="" hod_flag = "" account_flag = "" + PreRegistrationsrchform = PreRegistrationSearchForm() for obj in assis_stat: assistant_flag = obj.student_status @@ -178,6 +180,7 @@ def get_context(request): 'hod_flag' : hod_flag, 'account_flag' : account_flag, 'notifications': notifs, + 'preregistrationsrchform': PreRegistrationsrchform, } return context @@ -216,6 +219,8 @@ def homepage(request): if user_check(request): return HttpResponseRedirect('/academic-procedures/') + context = get_context(request) + if request.method == "POST": if 'check_allocation' in request.POST : return check_for_registration_complete(request) @@ -223,7 +228,40 @@ def homepage(request): return allocate(request) if 'view_allocation' in request.POST : return view_alloted_course(request) - context = get_context(request) + if 'search_preregistration' in request.POST or 'delete_preregistration' in request.POST: + form = PreRegistrationSearchForm(request.POST) + if form.is_valid(): + roll_no = form.cleaned_data['roll_no'].upper() + semester_no = form.cleaned_data['semester_no'] + print(roll_no, semester_no) + + # Fetch student object by roll number + # student = get_object_or_404(Student, id=roll_no) + + # Fetch semester by semester number + # semester = get_object_or_404(Semester, semester_no=semester_no) + # print(f"Student -> {student}") + + # Search for all initial registrations and student registration check + initial_registrations = InitialRegistration.objects.filter( + student_id_id=roll_no, semester_id__semester_no=semester_no + ) + student_registration_check = StudentRegistrationChecks.objects.filter( + student_id_id=roll_no, semester_id__semester_no=semester_no + ).first() + if ('delete_preregistration' in request.POST): + print(initial_registrations, student_registration_check) + try: + initial_registrations.delete() + student_registration_check.delete() + messages.success(request, "Student's pre registration data successfully deleted.") + except: + messages.error(request, "An error occured while deleting.") + context['delete_preregistration'] = True + else : + context['initial_registrations'] = initial_registrations + context['student_registration_check'] = student_registration_check + context['delete_preregistration'] = True return render(request, "ais/ais.html", context) diff --git a/FusionIIIT/templates/ais/ais.html b/FusionIIIT/templates/ais/ais.html index 7e248a2ed..b85a1e197 100755 --- a/FusionIIIT/templates/ais/ais.html +++ b/FusionIIIT/templates/ais/ais.html @@ -46,8 +46,12 @@
- + + {% if delete_preregistration %} + + {% else %} + {% endif %} Generate Student List @@ -101,6 +105,15 @@ Config Pre Registration Courses + + {% if delete_preregistration %} + + {% else %} + + {% endif %} + Delete Pre Registration + + Approve Branch Change @@ -149,8 +162,11 @@
- + {% if delete_preregistration %} +
+ {% else %}
+ {% endif %} {% block generateSheet %} {% include 'ais/generateSheet.html' %} {% endblock %} @@ -235,6 +251,15 @@ {% include 'ais/start_elective_allocation.html' %} {% endblock %}
+ {% if delete_preregistration %} +
+ {% else %} +
+ {% endif %} + {% block delete_preregistration %} + {% include 'ais/delete_preregistration.html' %} + {% endblock %} +
{% block allot_swayam %} diff --git a/FusionIIIT/templates/ais/delete_preregistration.html b/FusionIIIT/templates/ais/delete_preregistration.html new file mode 100644 index 000000000..3203e7953 --- /dev/null +++ b/FusionIIIT/templates/ais/delete_preregistration.html @@ -0,0 +1,110 @@ +{% load static %} +{% block delete_preregistration %} + + +{% comment %}The tab menu starts here!{% endcomment %} +
+ {% if messages %} +
+ {% for message in messages %} +
+ {{ message }} +
+ {% endfor %} +
+ {% endif %} +

Search and Manage Registrations

+ + +
+ {% csrf_token %} + +
+ + +
+ + +
+ + +
+ + + + {% if initial_registration or student_registration_check %} +
+

Search Results

+ + {% if initial_registrations %} +

Initial Registration(s)

+
+ {% for registration in initial_registrations %} +
+ Student Roll No: {{ registration.student_id }} +
+ Semester: {{ registration.semester_id }} +
+ Course: {{ registration.course_id }} +
+ Course Slot: {{ registration.course_slot_id }} +
+ Timestamp: {{ registration.timestamp }} +
+ Priority: {{ registration.priority }} +

+
+ {% endfor %} +
+ {% else %} +
+
No Initial Registration found.
+
+ {% endif %} + + {% if student_registration_check %} +

Student Registration Check

+
+
+ Student Roll No: {{ student_registration_check.student_id }} +
+
+ Pre-Registration Flag: {{ student_registration_check.pre_registration_flag }} +
+
+ Final Registration Flag: {{ student_registration_check.final_registration_flag }} +
+
+ {% else %} +
+
No Student Registration Check found.
+
+ {% endif %} + + + +
+ {% else %} + {% if delete_preregistration and not messages %} +
+
Student's Pre Registration Data not found.
+
+ {% endif %} + {% endif %} +
+ + + +{% endblock %} \ No newline at end of file