last temp

Author: anchithAcharya

api/academics/urls.py

@@ -1,8 +1,9 @@
-from academics.views import MarksViewSet, AttendanceViewSet
+from academics.views import MarksViewSet, AttendanceViewSet, get_branch_names
 
 from django.urls import path
 
 urlpatterns = [
+	path('metadata/branches', get_branch_names, name='get_branch_names'),
 	path('marks/', MarksViewSet.as_view({
 		'get': 'list',
 		'post': 'create'

api/academics/views.py

@@ -1,11 +1,19 @@
-from rest_framework import viewsets
-from academics.models import Marks, Attendance
+from rest_framework.decorators import api_view
+from rest_framework import viewsets, status
+from academics.models import Marks, Attendance, Branch
 from academics.serializers import MarksSerializer, AttendanceSerializer
 from rest_framework.response import Response
 from django.shortcuts import get_object_or_404
 from core.permissions import isAdmin, isStaff, isOwner
 
 
+@api_view(['GET'])
+def get_branch_names(request):
+	branches = Branch.objects.all()
+	branches = [(branch.code, branch.name) for branch in branches]
+	return Response(branches, status.HTTP_200_OK)
+
+
 class MarksViewSet(viewsets.ModelViewSet):
 	queryset = Marks.objects.all()
 	serializer_class = MarksSerializer

api/api/settings.py

@@ -159,4 +159,9 @@
 EMAIL_HOST_PASSWORD = secrets.EMAIL_HOST_PASSWORD
 
 MEDIA_ROOT = Path(BASE_DIR) / 'media'
-MEDIA_URL = '/media/'
+MEDIA_URL = '/media/'
+
+
+# Client URLs to be sent in verification and password reset emails
+CHANGE_PASSWORD_URL = 'http://localhost:8000/type/forgot-password'
+RESET_PASSWORD_URL = 'http://localhost:8000/type/reset-password'

api/core/views.py

@@ -101,19 +101,17 @@ def core_change_password(request, user_type='Admin'):
 
 
 	# send email
-	# change_password_url = request.get_host() + reverse(f"{self.basename}-{self.change_password.url_name}")
-	# reset_password_url = request.get_host() + reverse(f"{self.basename}-{self.password_reset.url_name}")
-	change_password_url = 'dummy'
-	reset_password_url = 'dummy'
+	change_password_url = settings.CHANGE_PASSWORD_URL.replace('type', user.user_type.lower())
+	reset_password_url = f"{settings.RESET_PASSWORD_URL.replace('type', user.user_type.lower())}?token={req.key}"
 
 	send_mail(
 		f"BIT Online Portal password account verification" if first_time else f"BIT Online Portal password reset",
 		f'''An account has been created for you in the {user_type} Portal of the BIT website.\n\n
-		Please click on the following link to verify the account by setting your password: {reset_password_url}?token={req.key}\n\n
+		Please click on the following link to verify the account by setting your password: {reset_password_url}\n\n
 		This link is only valid for the next 48 hours. In order to issue a password-reset request again, visit {change_password_url}
 		If you are not {user.name}, then please ignore this email.'''.replace('\t\t', '') if first_time else
 		f'''We have received a request to reset the password for your account in the {user_type} Portal of the BIT website.
-		Please click on the following link to reset your password: {reset_password_url}?token={req.key}\n\n
+		Please click on the following link to reset your password: {reset_password_url}\n\n
 		This link is only valid for the next 30 minutes. In order to issue a password-reset request again, visit {change_password_url}
 		If you did not request a password reset, please ignore this email.'''.replace('\t\t', ''),
 		"superuser.bit@gmail.com",

api/db.sqlite3

@@ -95,9 +95,12 @@ def update(self, request, *args, **kwargs):
 
 	def destroy(self, request, *args, **kwargs):
 		instance = self.get_object()
+		user_id = instance.user.id
+
 		self.perform_destroy(instance.user)
 		self.perform_destroy(instance)
-		return Response(status=status.HTTP_200_OK)
+
+		return Response({'success': f"User {user_id} deleted successfully."}, status=status.HTTP_200_OK)
 
 	def get_serializer_class(self):
 		if self.action == 'update' or self.action == 'partial_update':

api/staff/views.py

@@ -111,9 +111,12 @@ def update(self, request, *args, **kwargs):
 
 	def destroy(self, request, *args, **kwargs):
 		instance = self.get_object()
+		user_id = instance.user.id
+
 		self.perform_destroy(instance.user)
 		self.perform_destroy(instance)
-		return Response({'success': f"User {instance.user.id} deleted successfully."}, status=status.HTTP_200_OK)
+
+		return Response({'success': f"User {user_id} deleted successfully."}, status=status.HTTP_200_OK)
 
 	def get_serializer_class(self):
 		if self.action == 'update' or self.action == 'partial_update':

api/student/views.py

@@ -66,3 +66,11 @@ def delete_atendance(token, student_id, subject_id):
 	response = requests.delete(headers={'Authorization': 'Token ' + token}, url=f"{root}/atendance/{student_id}-{subject_id}/")
 	dict = json.loads(response.text)
 	return dict, response.status_code
+
+
+
+# Metadata:
+def get_branch_names():
+	response = requests.get(url=f"{root}/metadata/branches")
+	dict = json.loads(response.text)
+	return dict, response.status_code

client/common.py

@@ -12,7 +12,8 @@ Permissions:
 
 
 WEBSITE:
-- create student, send verification email after
 - create content blocks in templates
 - logout button
-- student and staff portals
+- create user button
+- student and staff portals
+- batch create users

todo.txt

@@ -10,6 +10,31 @@ class LoginForm(forms.Form):
 		widget=forms.PasswordInput(render_value = True, attrs={'placeholder': 'Enter your password'}),
 		label='Password')
 
+
+class CreateStudentForm(forms.Form):
+	def __init__(self, *args, **kwargs):
+		choices = kwargs.pop('branch_choices', ())
+		super().__init__(*args, **kwargs)
+		self.fields['branch'].choices = choices
+
+	id = forms.CharField(max_length=15, label='USN')
+	email = forms.EmailField(max_length = 254, label='Email')
+	name = forms.CharField(max_length=100, label='Name')
+	branch = forms.ChoiceField(choices=(), label='Branch')
+	current_sem = forms.IntegerField(initial=1, min_value=1, label='Student Semester')
+
+class CreateStaffForm(forms.Form):
+	def __init__(self, *args, **kwargs):
+		choices = kwargs.pop('branch_choices', ())
+		super().__init__(*args, **kwargs)
+		self.fields['branch'].choices = choices
+
+	id = forms.CharField(max_length=15, label='USN')
+	email = forms.EmailField(max_length = 254, label='Email')
+	name = forms.CharField(max_length=100, label='Name')
+	branch = forms.ChoiceField(choices=(), label='Branch')
+
+
 class EditStudentForm(forms.Form):
 	name = forms.CharField(max_length=254, label='Name')
 	# email = forms.EmailField(max_length=254, label='Email')
@@ -19,6 +44,7 @@ class EditStudentForm(forms.Form):
 	branch = forms.CharField(max_length=64, label='Branch')
 	current_sem = forms.IntegerField(label='Current Semester')
 
+
 class EditStaffForm(forms.Form):
 	name = forms.CharField(max_length=254, label='Name')
 	branch = forms.CharField(max_length=64, label='Branch')