diff --git a/FusionIIIT/Fusion/fusion.db b/FusionIIIT/Fusion/fusion.db index ec071c6bb..53a42f6f0 100644 Binary files a/FusionIIIT/Fusion/fusion.db and b/FusionIIIT/Fusion/fusion.db differ diff --git a/FusionIIIT/applications/scholarships/models.py b/FusionIIIT/applications/scholarships/models.py index 5acdf8bf4..228204fff 100644 --- a/FusionIIIT/applications/scholarships/models.py +++ b/FusionIIIT/applications/scholarships/models.py @@ -152,6 +152,8 @@ class Release(models.Model): enddate = models.DateField() award = models.CharField(default='',max_length=25) remarks = models.TextField(max_length=500,default='') + notif_visible = models.IntegerField(default=1) + award_form_visible = models.IntegerField(default=0) class Meta: db_table = 'Release' diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py index aac6cbeda..7c45f4463 100644 --- a/FusionIIIT/applications/scholarships/views.py +++ b/FusionIIIT/applications/scholarships/views.py @@ -29,6 +29,19 @@ @login_required(login_url='/accounts/login') def spacs(request): # context = {} + if request.method == 'POST': + if 'studentapprovesubmit' in request.POST: + pk = request.POST.get('studentapprovesubmit') + obj1 = Release.objects.get(pk=pk) + obj1.notif_visible = 0 + obj1.award_form_visible = 1 + obj1.save() + if 'studentdeclinesubmit' in request.POST: + pk = request.POST.get('studentdeclinesubmit') + obj2 = Release.objects.get(pk=pk) + obj2.notif_visible = 0 + obj2.award_form_visible = 0 + obj2.save() convener = Designation.objects.get(name='spacsconvenor') assistant = Designation.objects.get(name='spacsassistant') hd = HoldsDesignation.objects.filter(user=request.user,designation=convener) @@ -54,7 +67,9 @@ def convener_view(request): startdate=from_date, enddate=to_date, award=award, - remarks=remarks + remarks=remarks, + notif_visible=1, + award_form_visible=0 ) messages.success(request,award+' are invited successfully') return HttpResponseRedirect('/spacs/convener_view') diff --git a/FusionIIIT/templates/scholarshipsModule/applyNew.html b/FusionIIIT/templates/scholarshipsModule/applyNew.html index f8fb2edda..346e05ee9 100644 --- a/FusionIIIT/templates/scholarshipsModule/applyNew.html +++ b/FusionIIIT/templates/scholarshipsModule/applyNew.html @@ -2,7 +2,8 @@ {% block awards %} {% comment %}The tab menu starts here!{% endcomment %} - + {% for i in release %} + {% if i.award_form_visible == 1 %}
Mcm Scholarship @@ -17,8 +18,8 @@
Application Form for Merit Cum Means (MCM) Scholarship: - - + +
- +
- +
- +
@@ -291,7 +292,7 @@


- +
@@ -302,7 +303,7 @@
Please read below instructions before applying for any of the Convocation Medals:
- +
@@ -318,34 +319,34 @@



- +


- + - +
- +
@@ -547,7 +548,7 @@
- +
@@ -584,7 +585,7 @@
- {% csrf_token %} + {% csrf_token %}
@@ -592,17 +593,17 @@
- +
- - + +
- +
@@ -622,7 +623,7 @@
- +
@@ -641,12 +642,12 @@
-
+
- +
@@ -663,21 +664,21 @@
- +
- +
- +
@@ -690,7 +691,7 @@
- +
@@ -703,8 +704,8 @@
- - + +
@@ -756,7 +757,7 @@
- +
@@ -764,7 +765,7 @@
- +
@@ -778,13 +779,13 @@
- - + +
- {% csrf_token %} + {% csrf_token %}
@@ -792,24 +793,24 @@
- +
- +
- +
@@ -829,7 +830,7 @@
- +
@@ -848,12 +849,12 @@
-
+
- +
@@ -863,36 +864,36 @@
-
+
- +
- - + +
- +
- - + +
- +
- +
@@ -910,13 +911,17 @@
- +
- + +{% else %} +

Form not available to you!!

+{% endif %} +{% endfor %}