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 #1688

Merged
merged 30 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
901ca06
fix(registration): Fixed bug in final registration and allot courses …
Akashsah2003 Dec 28, 2024
6db3791
Merge pull request #1677 from Akashsah2003/latest_staging
dvjsharma Dec 28, 2024
669346d
changes to upload previous sem grades data
Lone24wolf Dec 30, 2024
4d987d6
Merge remote-tracking branch 'upstream/latest_staging' into ac-7-exam…
Lone24wolf Dec 30, 2024
95b1470
Merge pull request #1678 from Lone24wolf/ac-7-examination
dvjsharma Dec 30, 2024
2de8cc0
Changed the academic year view logic
hrithik-09 Jan 1, 2025
7d45b9c
Merge pull request #1679 from hrithik-09/latest_staging
ramG-reddy Jan 1, 2025
58678f2
form view changed for course instructor
hrithik-09 Jan 1, 2025
04208f6
Merge branch 'latest_staging' of https://github.com/FusionIIIT/Fusion…
hrithik-09 Jan 1, 2025
66508e7
implemented forgot password feature.
harshuln123 Jan 1, 2025
6d8ac3f
added working year in allot_courses html
prabhatsuman Jan 2, 2025
c1e23b8
Merge branch 'latest_staging' of github.com:prabhatsuman/Fusion into …
prabhatsuman Jan 2, 2025
833dacf
made correction in allot_courses
prabhatsuman Jan 2, 2025
6a80c19
Merge pull request #1681 from prabhatsuman/latest_staging
ramG-reddy Jan 2, 2025
6bbeb08
changed email host user
harshuln123 Jan 2, 2025
fa6a26f
Merge pull request #1680 from hn2006/latest_staging
dvjsharma Jan 2, 2025
b720a02
feat(courseInstructor): Functionality to add course instructor using …
Akashsah2003 Jan 2, 2025
b193a0d
Merge branch 'FusionIIIT:latest_staging' into latest_staging
Akashsah2003 Jan 2, 2025
0f17e91
Merge pull request #1682 from Akashsah2003/latest_staging
dvjsharma Jan 2, 2025
070e3de
list view in sorted order
hrithik-09 Jan 2, 2025
7f35837
Merge pull request #1683 from hrithik-09/latest_staging
dvjsharma Jan 2, 2025
7904791
feat(swayam_register): Setup date fetching and basic UI for swayam re…
Akashsah2003 Jan 10, 2025
c1451f1
fix(academics): Removed backlog from api responses.
Akashsah2003 Jan 13, 2025
271b2d8
changes for stuentAcadAdmin
grvup Jan 13, 2025
9efeb74
Merge pull request #1686 from grvup/latest_staging
dvjsharma Jan 13, 2025
3d9bd97
Merge pull request #1685 from Akashsah2003/latest_staging
dvjsharma Jan 13, 2025
8e821ac
fix(academics): Removed miscellaneous tab in academics for student
Akashsah2003 Jan 13, 2025
e56ce06
Merge pull request #1684 from Akashsah2003/latest_staging
dvjsharma Jan 13, 2025
7e01c17
changes for studentacadadmin in aims and academic procedures
grvup Jan 14, 2025
012b338
Merge pull request #1687 from grvup/latest_staging
ramG-reddy Jan 14, 2025
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
4 changes: 2 additions & 2 deletions FusionIIIT/Fusion/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]'

Expand Down
32 changes: 32 additions & 0 deletions FusionIIIT/Fusion/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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)
4 changes: 4 additions & 0 deletions FusionIIIT/applications/academic_information/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
2 changes: 1 addition & 1 deletion FusionIIIT/applications/academic_procedures/api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
38 changes: 19 additions & 19 deletions FusionIIIT/applications/academic_procedures/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)



Expand Down
Loading
Loading