Merge pull request #1688 from FusionIIIT/latest_staging

chore(Release): Dashboard Client sync with Latest Staging

FusionIIIT/Fusion/settings/common.py

@@ -50,7 +50,7 @@
 
 # email of sender
 
-EMAIL_HOST_USER = 'fusionmailservice@iiitdmj.ac.in'
+EMAIL_HOST_USER = 'fusion@iiitdmj.ac.in'
 
 EMAIL_PORT = 587
 ACCOUNT_EMAIL_REQUIRED = True
@@ -68,7 +68,7 @@
 
 ACCOUNT_EMAIL_SUBJECT_PREFIX = 'Fusion: '
 
-DEFAULT_FROM_EMAIL = 'Fusion IIIT <fusionmailservice@iiitdmj.ac.in>'
+DEFAULT_FROM_EMAIL = 'Fusion IIIT <fusion@iiitdmj.ac.in>'
 
 SERVER_EMAIL = '[email protected]'
 

FusionIIIT/Fusion/urls.py

@@ -21,6 +21,9 @@
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
+from django.urls import path
+
+from applications.globals.views import RateLimitedPasswordResetView
 
 
 urlpatterns = [
@@ -62,4 +65,33 @@
     url(r'^recruitment/', include('applications.recruitment.urls')),
     url(r'^examination/', include('applications.examination.urls')),
     url(r'^otheracademic/', include('applications.otheracademic.urls')),
+
+    path(
+        'password-reset/',
+        RateLimitedPasswordResetView.as_view(
+            template_name='registration/password_reset_form.html',
+        ),
+        name='reset_password',
+    ),
+    path(
+        'password-reset/done/',
+        auth_views.PasswordResetDoneView.as_view(
+            template_name='registration/password_reset_done.html'
+        ),
+        name='password_reset_done',
+    ),
+    path(
+        'reset/<uidb64>/<token>/',
+        auth_views.PasswordResetConfirmView.as_view(
+            template_name='registration/password_reset_confirm.html',
+        ),
+        name='password_reset_confirm',
+    ),
+    path(
+        'reset/done/',
+        auth_views.PasswordResetCompleteView.as_view(
+            template_name='registration/password_reset_complete.html'
+        ),
+        name='password_reset_complete',
+    ),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

FusionIIIT/applications/academic_information/views.py

@@ -2136,6 +2136,10 @@ def view_all_student_data(request):
     """ views all the students """
 
 
+    if request.session.get('currentDesignationSelected') in ["studentacadadmin"]:
+        return HttpResponseRedirect('/aims/')
+
+
     data = []
     #students = Student.objects.select_related('batch_id', 'id__user', 'batch_id__discipline', 'id') .filter(batch=2019).order_by('id').all().only('batch', 'id__id', 'id__user', 'programme', 'batch_id__discipline__acronym', 'specialization', 'id__sex', 'category', 'id__phone_no', 'id__date_of_birth', 'id__user__first_name', 'id__user__last_name', 'id__user__email', 'father_name', 'mother_name', 'id__address')[0:20]
 

FusionIIIT/applications/academic_procedures/api/urls.py

@@ -9,7 +9,7 @@
     url(r'^stu/add_one_course/' , views.add_one_course , name = 'add_one_course'),
     url(r'^stu/view_registration' , views.student_view_registration , name = 'view_registration'),
     url(r'^stu/view_offered_courses' , views.view_offered_courses , name = 'student_view_offered_courses'),
-    url(r'^stu/backlog_courses', views.student_backlog_courses , name = 'student_backlog_courses'),
+    # url(r'^stu/backlog_courses', views.student_backlog_courses , name = 'student_backlog_courses'),
     url(r'^stu/add_course' , views.add_course , name ='add_course') ,
     url(r'^stu/drop_course' , views.drop_course , name = 'drop_course'),
     # url(r'^stu/replaceCourse' , views.replaceCourse , name = 'replaceCourse')

FusionIIIT/applications/academic_procedures/api/views.py

@@ -362,7 +362,7 @@ def academic_procedures_student(request):
             'next_sem_registration_courses': next_sem_courses,
             'next_sem_branch_registration_courses' : next_sem_branch_registration_courses_data,
             'final_registration_choices' : final_registration_choices_data,
-            'backlogCourseList': auto_backlog_courses_list,
+            # 'backlogCourseList': auto_backlog_courses_list,
 
             'student_flag' : student_flag,
             'ug_flag' : ug_flag,
@@ -732,25 +732,25 @@ def student_final_registration(request):
 
 
 # with this api student can get his backlog courses list
-@api_view(['GET'])
-def student_backlog_courses(request):
-    try : 
-        stu_id = Student.objects.select_related('id','id__user','id__department').get(id=request.user.username)
-        backlogCourseList = []
-        backlogCourses = backlog_course.objects.select_related('course_id' , 'student_id' , 'semester_id' ).filter(student_id=stu_id)
-        for i in backlogCourses:
-            obj = {
-                "course_id" : i.course_id.id,
-                "course_name" : i.course_id.course_name,
-                "faculty" : i.course_id.course_details,
-                "semester" : i.semester_id.semester_no,
-                "is_summer_course" : i.is_summer_course
-            }
-            backlogCourseList.append(obj)
+# @api_view(['GET'])
+# def student_backlog_courses(request):
+#     try : 
+#         stu_id = Student.objects.select_related('id','id__user','id__department').get(id=request.user.username)
+#         backlogCourseList = []
+#         backlogCourses = backlog_course.objects.select_related('course_id' , 'student_id' , 'semester_id' ).filter(student_id=stu_id)
+#         for i in backlogCourses:
+#             obj = {
+#                 "course_id" : i.course_id.id,
+#                 "course_name" : i.course_id.course_name,
+#                 "faculty" : i.course_id.course_details,
+#                 "semester" : i.semester_id.semester_no,
+#                 "is_summer_course" : i.is_summer_course
+#             }
+#             backlogCourseList.append(obj)
 
-        return Response(backlogCourseList, status=status.HTTP_200_OK)
-    except Exception as e:
-            return Response(data = str(e) , status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+#         return Response(backlogCourseList, status=status.HTTP_200_OK)
+#     except Exception as e:
+#             return Response(data = str(e) , status=status.HTTP_500_INTERNAL_SERVER_ERROR)