Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 24 additions & 1 deletion FusionIIIT/applications/central_mess/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from applications.globals.models import ExtraInfo, HoldsDesignation, Designation
from .models import (Feedback, Menu, Menu_change_request, Mess_meeting,
Mess_minutes, Mess_reg, Messinfo, Monthly_bill,
Payments, Rebate,Special_request, Vacation_food, MessBillBase,Registration_Request, Reg_main, Reg_records ,Deregistration_Request)
Payments, Rebate,Special_request, Vacation_food, MessBillBase,Registration_Request, Reg_main, Reg_records ,Deregistration_Request, Semdates)
from notification.views import central_mess_notif


Expand Down Expand Up @@ -586,6 +586,29 @@ def add_bill_base_amount(request):

return data

def add_sem_dates(request):
"""
This function is to update the semester start and end date
:param request:
:return:
"""
start_date = request.POST.get("semstart_date")
end_date = request.POST.get("semend_date")

if (end_date <= start_date):
data = {
'status': 3,
'message': "Please check the dates"
}
return data

data = {
'status': 1,
'message': "Successfully updated"
}
semdate_object = Semdates(start_date=start_date, end_date=end_date)
semdate_object.save()
return data

def add_mess_committee(request, roll_number):
studentHere = Student.objects.get(id=roll_number)
Expand Down
8 changes: 7 additions & 1 deletion FusionIIIT/applications/central_mess/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,4 +312,10 @@ class Deregistration_Request(models.Model):
status=models.CharField(max_length=10,default='pending')
deregistration_remark=models.CharField(max_length=50,default='NA')
def __str__(self):
return str(self.student_id.id)
return str(self.student_id.id)

class Semdates(models.Model):
start_date = models.DateField(blank=False,default=datetime.date.today)
end_date = models.DateField(blank=False,default=datetime.date.today)
class Meta:
unique_together = (('start_date', 'end_date'),)
1 change: 1 addition & 0 deletions FusionIIIT/applications/central_mess/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,6 @@
# url(r'^uploadpayment', views.uploadPaymentDue, name='uploadpayment')
url(r'^respond_to_reg_req',views.respond_to_reg, name='reg_response'),
url(r'^deregistrationRequest', views.de_reg_request, name='de_reg_request'),
url(r'^updatesemdates', views.update_semdates, name='updatesemdates'),

]+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
16 changes: 15 additions & 1 deletion FusionIIIT/applications/central_mess/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
add_menu_change_request, handle_menu_change_response, handle_vacation_food_request,
add_mess_registration_time, add_leave_request, add_mess_meeting_invitation,
handle_rebate_response, add_special_food_request,
handle_special_request, add_bill_base_amount, add_mess_committee, generate_bill, handle_reg_response, handle_dreg_response)
handle_special_request, add_bill_base_amount, add_mess_committee, generate_bill, handle_reg_response, handle_dreg_response,add_sem_dates)
from notification.views import central_mess_notif

import csv
Expand Down Expand Up @@ -852,6 +852,20 @@ def update_cost(request):
data = add_bill_base_amount(request)
return JsonResponse(data)

@login_required
def update_semdates(request):
"""
This function is to update the semester start and end date

@param:
request - contains metadata about the requested page

@variables:
user - contains user details
"""
user = request.user
data = add_sem_dates(request)
return HttpResponseRedirect('/mess')

def generate_mess_bill(request):
"""
Expand Down
4 changes: 4 additions & 0 deletions FusionIIIT/templates/messModule/menu_card.html
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@
<a class="item" data-tab="twentyfive">
Update Menu
</a>

<a class="item" data-tab="twentyseven">
Update Sem Dates
</a>
{% endif %}


Expand Down
5 changes: 5 additions & 0 deletions FusionIIIT/templates/messModule/mess.html
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,11 @@
{% include 'messModule/updatemenu.html' %}
{% endblock %}
</div>
<div class="ui tab segment" data-tab="twentyseven">
{% block updateSemdates %}
{% include 'messModule/updateSemdates.html' %}
{% endblock %}
</div>



Expand Down
2 changes: 1 addition & 1 deletion FusionIIIT/templates/messModule/messactivities.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
document.getElementById('bill_dwn').addEventListener('click', download);

function download() {

}

function required_check_registration() {
Expand Down
73 changes: 73 additions & 0 deletions FusionIIIT/templates/messModule/updateSemdates.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{% extends 'globals/base.html' %}
{% load static %}
{% block body %}
{% block updateSemdates %}

<div class="ui pointing secondary menu">
<a class="active item" data-tab="" id="usd">
Update Sem dates
</a>
</div>
<div class="ui active tab" data-tab="semdates" id="semdates">
<div class="ui vertical segment">
<form method="post" action="{% url 'mess:updatesemdates' %}">
{% csrf_token %}
<div class="ui form" style="padding: 8px; padding-left: 12px; padding-right: 12px;">
{# <p style="text-align:center;"><strong>Update </strong></p>#}
<div class="three fields">
<div class="field">
<label for="semstart_date">Start Date*</label>
<div class="ui calendar" id="semstart">
<div>
<input name="semstart_date" type="date" placeholder="From" required="true"
id="semstart_date">
</div>
</div>
</div>
<div class="field">
<label for="semend_date">End Date*</label>
<div class="ui calendar" id="semend">
<div class="ui input left icon">
<input name="semend_date" type="date" placeholder="To" required="true"
id="semend_date">
</div>
</div>
</div>
<div class="field">
<button class="ui primary button right floated" type="submit" name="submit">Update
</button>
</div>
</div>
</div>
</form>
</div>
</div>
<script>
function updateSemdates() {

start_date = document.getElementById('semstart_date').value
end_date = document.getElementById('semend_date').value
$.ajax({
type: 'POST',
url: 'updatesemdates',
dataType: 'json',
data: {
'csrfmiddlewaretoken': '{{ csrf_token }}',
'start_date': start_date,
'end_date': end_date,
},
success: function (data) {
// if (data.status==1) {
alert(data.message);
location.reload()
// }
},
error: function (data, err) {
alert(err.message);
}
});
return false;
}
</script>
{% endblock %}
{% endblock %}