diff --git a/.gitignore b/.gitignore index cfd86e7bf..75223adc8 100644 --- a/.gitignore +++ b/.gitignore @@ -72,4 +72,5 @@ node_modules/ FusionIIIT/static/ package-lock.json -migrations/ \ No newline at end of file + +migrations/ diff --git a/FusionIIIT/Fusion/settings/development.py b/FusionIIIT/Fusion/settings/development.py index 6acc214c1..4cd393879 100644 --- a/FusionIIIT/Fusion/settings/development.py +++ b/FusionIIIT/Fusion/settings/development.py @@ -53,3 +53,7 @@ DEBUG_TOOLBAR_CONFIG = { 'INTERCEPT_REDIRECTS': False, } + + +MEDIA_URL = "/media/" +MEDIA_ROOT=os.path.join(BASE_DIR,"media/") \ No newline at end of file diff --git a/FusionIIIT/applications/central_mess/forms.py b/FusionIIIT/applications/central_mess/forms.py index 9f835c959..652eb4eac 100644 --- a/FusionIIIT/applications/central_mess/forms.py +++ b/FusionIIIT/applications/central_mess/forms.py @@ -1,6 +1,7 @@ from django import forms from .models import Mess_minutes +from .models import Registration_Request class MinuteForm(forms.ModelForm): @@ -15,3 +16,9 @@ class MessInfoForm(forms.Form, ): ] mess_option = forms.CharField(label='Mess Option', widget=forms.Select( choices=MESS_CHOICES, attrs={'style': 'border-radius:1rem;padding:7px;'})) + + +class RegistrationRequest(forms.ModelForm): + class Meta: + model = Registration_Request + fields = ('Txn_no','amount','img') diff --git a/FusionIIIT/applications/central_mess/urls.py b/FusionIIIT/applications/central_mess/urls.py index c3417fc47..09e3838c1 100644 --- a/FusionIIIT/applications/central_mess/urls.py +++ b/FusionIIIT/applications/central_mess/urls.py @@ -43,6 +43,7 @@ url(r'^api', include('applications.central_mess.api.urls')), url(r'^registeredstudent', views.searchAddOrRemoveStudent, name='registeredstudent'), + url(r'^registrationRequest', views.reg_request, name='reg_request'), # url(r'^uploadpayment', views.uploadPaymentDue, name='uploadpayment') url(r'^respond_to_reg_req',views.respond_to_reg, name='reg_response') diff --git a/FusionIIIT/applications/central_mess/views.py b/FusionIIIT/applications/central_mess/views.py index 21f8a4e94..c7407dcd6 100644 --- a/FusionIIIT/applications/central_mess/views.py +++ b/FusionIIIT/applications/central_mess/views.py @@ -14,11 +14,11 @@ from .utils import render_to_pdf from applications.academic_information.models import Student from applications.globals.models import ExtraInfo, HoldsDesignation, Designation -from .forms import MinuteForm, MessInfoForm +from .forms import MinuteForm, MessInfoForm,RegistrationRequest from .models import (Feedback, Menu, Menu_change_request, Mess_meeting, Mess_minutes, Mess_reg, Messinfo, Monthly_bill, Payments, Rebate, - Special_request, Vacation_food, MessBillBase) + Special_request, Vacation_food, MessBillBase,Registration_Request) from .handlers import (add_mess_feedback, add_vacation_food_request, add_menu_change_request, handle_menu_change_response, handle_vacation_food_request, add_mess_registration_time, add_leave_request, add_mess_meeting_invitation, @@ -73,6 +73,7 @@ def mess(request): payments = Payments.objects.select_related('student_id','student_id__id','student_id__id__user','student_id__id__department').filter(student_id=student) rebates = Rebate.objects.select_related('student_id','student_id__id','student_id__id__user','student_id__id__department').filter(student_id=student).order_by('-app_date') splrequest = Special_request.objects.select_related('student_id','student_id__id','student_id__id__user','student_id__id__department').filter(student_id=student).order_by('-app_date') + reg_form = RegistrationRequest() monthly_bill=monthly_bill[::-1] tot_am=0 @@ -211,7 +212,8 @@ def mess(request): 'count7': count7, 'count8': count8, 'form': form, - 'desig': desig + 'desig': desig, + 'reg_form':reg_form } return render(request, "messModule/mess.html", context) @@ -276,7 +278,8 @@ def mess(request): 'count7': count7, 'count8': count8, 'form': form, - 'desig': desig + 'desig': desig, + 'reg_form':reg_form } return render(request, "messModule/mess.html", context) @@ -299,6 +302,7 @@ def mess(request): 'desig': desig, 'minutes': minutes, 'meeting': meeting, + 'reg_form':reg_form, } @@ -1387,3 +1391,16 @@ def respond_to_reg(request): return JsonResponse(data) +def reg_request(request): + + user = request.user + extra_info = ExtraInfo.objects.select_related().get(user=user) + student = Student.objects.select_related('id','id__user','id__department').get(id=extra_info) + if request.method == 'POST': + form = RegistrationRequest(request.POST, request.FILES) + + if form.is_valid(): + temp=form.save(commit=False) + temp.student_id=student + temp.save() + return HttpResponseRedirect("/mess") diff --git a/FusionIIIT/templates/messModule/menu_card.html b/FusionIIIT/templates/messModule/menu_card.html index f12acd3ab..8c5ca4436 100644 --- a/FusionIIIT/templates/messModule/menu_card.html +++ b/FusionIIIT/templates/messModule/menu_card.html @@ -44,8 +44,10 @@ - + + Registration + {% endif %} {% if d.designation.name == 'mess_committee' or d.designation.name == 'mess_committee_mess2' %} diff --git a/FusionIIIT/templates/messModule/mess.html b/FusionIIIT/templates/messModule/mess.html index 87347cc64..1b96e172b 100644 --- a/FusionIIIT/templates/messModule/mess.html +++ b/FusionIIIT/templates/messModule/mess.html @@ -76,6 +76,14 @@ {% comment %}The ... ends here!{% endcomment %} + {% comment %}The ... start here!{% endcomment %} +
+ {% block Registration %} + {% include 'messModule/registration.html' %} + {% endblock %} +
+ {% comment %}The ... end here!{% endcomment %} + {% comment %}The ... starts here!{% endcomment %} {% comment %}
{% block nonvegfood %} diff --git a/FusionIIIT/templates/messModule/registration.html b/FusionIIIT/templates/messModule/registration.html new file mode 100644 index 000000000..9ccb56e8c --- /dev/null +++ b/FusionIIIT/templates/messModule/registration.html @@ -0,0 +1,130 @@ +{#{% extends 'globals/base.html'%}#} +{% load static %} +{#{% block body %}#} +{% block Registration %} + {% comment %}The tab menu starts here!{% endcomment %} +
+ + Apply for Registration + + + + Previous Registration + +
+ +
+
+ + {% comment %}Form Tag starts here!{% endcomment %} +
+ {% csrf_token %} + {{ reg_form.as_p }} + +
+ {% comment %}Form Tag ends here!{% endcomment %} + + +
+ +
+
+ +
+ +
+ + {% for app in feedback %} + +
+ +
+ {{info.user.username}} + {{app.feedback_type}} + +
+ {{app.description}} +
+
+ +
+ {{app.fdate}} +
+ +
+ {% endfor %} +
+ +
+
+ +{% endblock %} +{#{% endblock %}#} + +{% block javascript %} + + + +{% endblock %} + + +