- {% comment %}The left-margin segment!{% endcomment %}
-
+
{% comment %}The left-rail segment starts here!{% endcomment %}
-
+
{% comment %}The user image card starts here!{% endcomment %}
{% block usercard %}
{% include 'globals/usercard.html' %}
@@ -46,8 +78,8 @@
{% comment %}The Tab-Menu starts here!{% endcomment %}
-
+
+
{% if student_flag %}
Current Semester
diff --git a/FusionIIIT/templates/dashboard/dashboard.html b/FusionIIIT/templates/dashboard/dashboard.html
old mode 100755
new mode 100644
index 2b940cdbb..658ec2e6e
--- a/FusionIIIT/templates/dashboard/dashboard.html
+++ b/FusionIIIT/templates/dashboard/dashboard.html
@@ -1,148 +1,140 @@
{% extends 'globals/base.html' %}
{% load static %}
-
{% block title %}
-Dashboard
+ Dashboard
{% endblock %}
{% block css %}
+
+
+
{% endblock %}
-
-{% comment %}The grid starts here!{% endcomment %}
-
-
- {% comment %}The left-margin segment!{% endcomment %}
-
-
- {% comment %}
- The left-rail segment starts here!
- {% endcomment %}
-
-
- {% comment %}The user image card starts here!{% endcomment %}
- {% block usercard %}
- {% include 'globals/usercard.html' %}
- {% endblock %}
- {% comment %}The user image card ends here!{% endcomment %}
-
-
-
- {% comment %}The Tab-Menu starts here!{% endcomment %}
-
- {% comment %}The Tab-Menu ends here!{% endcomment %}
-
-
- {% if 'student' != request.user.extrainfo.user_type %}
-
- {% comment %}The Tab-Menu starts here!{% endcomment %}
-
- {% comment %}The Tab-Menu ends here!{% endcomment %}
-
- {% endif %}
-
- {% comment %}The Tab-Menu starts here!{% endcomment %}
-
-
- {% if request.user.extrainfo.user_type == 'faculty' %}
- {%for desig in designat%}
- {% if 'hradmin' == desig.designation.name %}
-
-
- {% endif %}
- {%endfor %}
- {% endif %}
- {% comment %}The Tab-Menu ends here!{% endcomment %}
-
-
-
-
-
-
-
-
-
- {% comment %}
- The left-rail segment ends here!
- {% endcomment %}
+{% block body %}
+ {% block navBar %}
+ {% include 'dashboard/navbar.html' %}
+ {% endblock %}
+ {% comment %} The grid starts here! {% endcomment %}
+
- {% comment %}
- The central-rail segment starts here!
- {% endcomment %}
+ {% comment %} The left-rail segment starts here! {% endcomment %}
+
+
+ {% comment %} The user image card starts here! {% endcomment %}
+ {% block usercard %}
+ {% include 'globals/usercard.html' %}
+ {% endblock %}
+ {% comment %}The user image card ends here!{% endcomment %}
+
+
+
+ {% comment %}The Tab-Menu starts here!{% endcomment %}
+
+ {% comment %}The Tab-Menu ends here!{% endcomment %}
-
-
-
-
+ {% comment %} The left-rail segment ends here! {% endcomment %}
+
+ {% comment %} The central-rail segment starts here! {% endcomment %}
+
+ {% comment %} The central-rail segment ends here! {% endcomment %}
- {% comment %}The right-rail segment starts here!{% endcomment %}
-
+ {% endif %} {% endfor %} diff --git a/FusionIIIT/templates/messModule/view_feedback.html b/FusionIIIT/templates/messModule/view_feedback.html index 82ca0955b..6bfa6e951 100644 --- a/FusionIIIT/templates/messModule/view_feedback.html +++ b/FusionIIIT/templates/messModule/view_feedback.html @@ -38,16 +38,31 @@Student ID
Feedback Type
Description
+ Mess
- {% for item in feed %}
+ {% for item in feed1 %}
{% if item.feedback_type == 'Food' %}
{{item.fdate}}
{{ item.student_id.id|truncatewords:1|slice:"8" }}
{{item.feedback_type}}
{{item.description}}
+ Mess1
+
+ {% endif %}
+ {% endfor %}
+
+
+ {% for item in feed2%}
+ {% if item.feedback_type == 'Food' %}
+
+ {{item.fdate}}
+ {{ item.student_id.id|truncatewords:1|slice:"8" }}
+ {{item.feedback_type}}
+ {{item.description}}
+ Mess2
{% endif %}
{% endfor %}
@@ -68,16 +83,31 @@
Student ID
Feedback Type
Description
+ Mess
- {% for item in feed %}
+ {% for item in feed1 %}
{% if item.feedback_type == 'Cleanliness' %}
{{item.fdate}}
{{ item.student_id|truncatewords:1|slice:"8" }}
{{item.feedback_type}}
{{item.description}}
+ Mess1
+
+ {% endif %}
+ {% endfor %}
+
+
+ {% for item in feed2%}
+ {% if item.feedback_type == 'Cleanliness' %}
+
+ {{item.fdate}}
+ {{ item.student_id.id|truncatewords:1|slice:"8" }}
+ {{item.feedback_type}}
+ {{item.description}}
+ Mess2
{% endif %}
{% endfor %}
@@ -98,16 +128,32 @@
Student ID
Feedback Type
Description
+ Mess
+
- {% for item in feed %}
+ {% for item in feed1 %}
+ {% if item.feedback_type == 'Maintenance' %}
+
+ {{item.fdate}}
+ {{ item.student_id.id|truncatewords:1|slice:"8" }}
+ {{item.feedback_type}}
+ {{item.description}}
+ Mess1
+
+ {% endif %}
+ {% endfor %}
+
+
+ {% for item in feed2%}
{% if item.feedback_type == 'Maintenance' %}
{{item.fdate}}
{{ item.student_id.id|truncatewords:1|slice:"8" }}
{{item.feedback_type}}
{{item.description}}
+ Mess2
{% endif %}
{% endfor %}
@@ -128,16 +174,32 @@
Student ID
Feedback Type
Description
+ Mess
+
- {% for item in feed %}
+ {% for item in feed1%}
{% if item.feedback_type == 'Others' %}
{{item.fdate}}
{{ item.student_id.id|truncatewords:1|slice:"8" }}
{{item.feedback_type}}
{{item.description}}
+ Mess1
+
+ {% endif %}
+ {% endfor %}
+
+
+ {% for item in feed2%}
+ {% if item.feedback_type == 'Others' %}
+
+ {{item.fdate}}
+ {{ item.student_id.id|truncatewords:1|slice:"8" }}
+ {{item.feedback_type}}
+ {{item.description}}
+ Mess2
{% endif %}
{% endfor %}
@@ -152,12 +214,35 @@
-
-{% comment %}The grid ends here!{% endcomment %}
-
-
-
+ {% comment %}The grid ends here!{% endcomment %}
{% endblock %}
{% block javascript %}
-
-
+
-
+ });
+
+ /*$(document).ready(function(){
+ $("#textLoader").toggle();
+ $("#replacement-card").toggle();
+ setTimeout(loader, 1750);
+ });
+ function loader() {
+ $("#textLoader").toggle();
+ $("#replacement-card").toggle();
+ $("#loader").removeClass("active");
+ $("#loader").addClass("disabled");
+ }*/
+
{% endblock %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/dashboard/modules.html b/FusionIIIT/templates/dashboard/modules.html
old mode 100755
new mode 100644
index a8680958a..e83995749
--- a/FusionIIIT/templates/dashboard/modules.html
+++ b/FusionIIIT/templates/dashboard/modules.html
@@ -1,246 +1,217 @@
{% load static %}
+{% block css %}
+
+{% endblock %}
+
+{% comment %} The Modules start here! {% endcomment %}
{% block modules %}
-{% comment %}The Modules start here!{% endcomment %}
-
- {% comment %}The Modules:{% endcomment %}
+ {% comment %} The right-rail segment starts here! {% endcomment %}
+
- {% comment %}The right-rail segment ends here!{% endcomment %}
-
- {% comment %}The right-margin segment!{% endcomment %}
-
-
-
{% block modules %}
- {% include 'dashboard/modules.html' %}
+ {% include 'dashboard/modules.html' %}
{% endblock %}
-
+ {% comment %}The right-rail segment ends here!{% endcomment %}
-
-
-
{% endblock %}
diff --git a/FusionIIIT/templates/globals/usercard.html b/FusionIIIT/templates/globals/usercard.html
old mode 100755
new mode 100644
index ecb758bd3..8d1e54ef9
--- a/FusionIIIT/templates/globals/usercard.html
+++ b/FusionIIIT/templates/globals/usercard.html
@@ -1,14 +1,12 @@
{% load static %}
{% block usercard %}
-
{% comment %}
TODO: Something!
{% endcomment %}
- {% comment %}The Employee Image Card starts here!{% endcomment %}
-
-
-
-
-
-
- {% block data%}
-
- {% endblock %}
-
-
-
+ {% block data %} {% endblock %}
-
- Modules
-
-
-
+
-{% comment %}The Modules End here!{% endcomment %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+{% comment %}The Modules End here!{% endcomment %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/dashboard/navbar.html b/FusionIIIT/templates/dashboard/navbar.html
old mode 100755
new mode 100644
index 7d0e7e3f9..8aba787ba
--- a/FusionIIIT/templates/dashboard/navbar.html
+++ b/FusionIIIT/templates/dashboard/navbar.html
@@ -1,14 +1,59 @@
{% load static %}
+
+{% block css %}
+
+{% endblock %}
+
{% block navBar %}
{% include 'dashboard/sidenavbar.html' %}
+
+ Modules
+
+
+
+
+
-
+
+
+
+ {% endcomment %}
+
+
+
+
+ Academics Module
+
+
+
+
+
+
+
+
+
+
+
+ Programme And Curriculum Module
+
+
+
+
+
+
+
+
+
+
+
+ Central Mess
+
+
+
+
+
+
+
+
+
+
+
+ Visitor's Hostel
+
+
+
+
+
+
+
+
+
+
+
+ Healthcare Center
+
+
+
+
+
+
+
+
+
+
+
+ File Tracking
+
+
+
+
+
+
+
+
+
+
+
+ Scholarship Portal
+
+
+
+
+
+
+
+
+
+
+
+ Complaint System
+
+
+
+
+
+
+
+
+
+
+
+ Placement Cell
+
+
+
+
+
+
+
+
+
+
+
+ Estate Management
+
+
+
+
+
+
+
+
+
+
+
+ Department Portal
+
+
+
-
-
+ {% comment %}
- {% endcomment %}
-
- {% comment %}A single modules row starts here!{% endcomment %}
-
- {% comment %}A single modules row ends here!{% endcomment %}
-
- {% comment %}A single modules row starts here!{% endcomment %}
-
- {% comment %}
+
+
+
-
-
-
-
- {% comment %}A single modules row ends here!{% endcomment %}
-
- {% comment %}A single modules row starts here!{% endcomment %}
-
-
-
-
-
- {% comment %}A single modules row ends here!{% endcomment %}
-
- {% comment %}A single modules row starts here!{% endcomment %}
-
- {% comment %}A single modules row ends here!{% endcomment %}
-
- {% comment %}A single modules row starts here!{% endcomment %}
-
- {% comment %}A single modules row ends here!{% endcomment %}
-
- {% comment %}A single modules row ends here!{% endcomment %}
-
-
- {% comment %}A single modules row ends here!{% endcomment %}
-
-
-
+
+
+
+
+ Research Module
+
+
+
+
+
+
+
+
+
+
+
+ Counselling Cell
+
+
+
+
+
+
+
+
+
+
+
+ Leave Module
+
+
+
+
-
-
+
+
@@ -116,22 +163,10 @@
{% comment %}
TODO: User details! depending on type of user say: STUDENT/FACULTY/STAFF!
@@ -40,18 +87,19 @@
{{request.user.first_name}} {{request.user.last_name}}
+
{% comment %}
-
-
-
{{request.user.first_name}} {{request.user.last_name}}
+
{% comment %}
-
- Notifications
-
- 22
- TODO: Make dropdown menu
-
- {% endcomment %}
-
+
+ Notifications
+
+ 22
+ TODO: Make dropdown menu
+
+
+ {% endcomment %}
@@ -106,7 +154,6 @@
Notificati
Notificati Logout
-
+ {% comment %}The Employee Image Card starts here!{% endcomment %}
+
@@ -18,61 +16,66 @@
TODO: Add a If-Else here!
{% endcomment %}
{% if user %}
-
-
- {% comment %}The Employee Image Card ends here!{% endcomment %}
-
-
+ {% comment %} The Employee Image Card ends here! {% endcomment %}
{% endblock %}
From 83e2e73d895fc7f6a7ba2fa117624bbcb2ede278 Mon Sep 17 00:00:00 2001
From: Harshit0009
Date: Sun, 18 Feb 2024 18:09:35 +0530
Subject: [PATCH 02/78] updated models
---
.../applications/central_mess/models.py | 46 +++++++++----------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/FusionIIIT/applications/central_mess/models.py b/FusionIIIT/applications/central_mess/models.py
index 7af7d7484..dfb2ad70f 100644
--- a/FusionIIIT/applications/central_mess/models.py
+++ b/FusionIIIT/applications/central_mess/models.py
@@ -83,8 +83,8 @@
)
MESS_OPTION = (
- ('mess1', 'Veg_mess'),
- ('mess2', 'Non_veg_mess')
+ ('mess1', 'Mess1'),
+ ('mess2', 'Mess2')
)
@@ -126,7 +126,7 @@ class Monthly_bill(models.Model):
amount = models.IntegerField(default=0)
rebate_count = models.IntegerField(default=0)
rebate_amount = models.IntegerField(default=0)
- nonveg_total_bill = models.IntegerField(default=0)
+ # nonveg_total_bill = models.IntegerField(default=0)
total_bill = models.IntegerField(default=0)
paid = models.BooleanField(default=False)
@@ -139,15 +139,15 @@ def __str__(self):
class Payments(models.Model):
student_id = models.ForeignKey(Student, on_delete=models.CASCADE)
- sem = models.IntegerField()
- year = models.IntegerField(default=current_year)
+ # sem = models.IntegerField()
+ # year = models.IntegerField(default=current_year)
amount_paid = models.IntegerField(default=0)
class Meta:
- unique_together = (('student_id', 'sem', 'year'),)
+ unique_together = (('student_id'),)
def __str__(self):
- return '{} - {}'.format(self.student_id.id, self.sem)
+ return '{}'.format(self.student_id.id)
class Menu(models.Model):
@@ -187,26 +187,26 @@ def __str__(self):
return str(self.student_id.id)
-class Nonveg_menu(models.Model):
- dish = models.CharField(max_length=20)
- price = models.IntegerField()
- order_interval = models.CharField(max_length=20, choices=INTERVAL,
- default='Breakfast')
+# class Nonveg_menu(models.Model):
+# dish = models.CharField(max_length=20)
+# price = models.IntegerField()
+# order_interval = models.CharField(max_length=20, choices=INTERVAL,
+# default='Breakfast')
- def __str__(self):
- return '{} - {}'.format(self.dish, self.price)
+# def __str__(self):
+# return '{} - {}'.format(self.dish, self.price)
-class Nonveg_data(models.Model):
- student_id = models.ForeignKey(Student, on_delete=models.CASCADE)
- order_date = models.DateField(default=datetime.date.today)
- order_interval = models.CharField(max_length=20, choices=INTERVAL,
- default='Breakfast')
- dish = models.ForeignKey(Nonveg_menu, on_delete=models.CASCADE)
- app_date = models.DateField(default=datetime.date.today)
+# class Nonveg_data(models.Model):
+# student_id = models.ForeignKey(Student, on_delete=models.CASCADE)
+# order_date = models.DateField(default=datetime.date.today)
+# order_interval = models.CharField(max_length=20, choices=INTERVAL,
+# default='Breakfast')
+# dish = models.ForeignKey(Nonveg_menu, on_delete=models.CASCADE)
+# app_date = models.DateField(default=datetime.date.today)
- def __str__(self):
- return str(self.student_id.id)
+# def __str__(self):
+# return str(self.student_id.id)
class Special_request(models.Model):
From b8644f9eb26959981972809d68c47df1161f9fa0 Mon Sep 17 00:00:00 2001
From: Harshit0009
Date: Sun, 18 Feb 2024 18:12:55 +0530
Subject: [PATCH 03/78] Revert "updated models"
This reverts commit 83e2e73d895fc7f6a7ba2fa117624bbcb2ede278.
---
.../applications/central_mess/models.py | 46 +++++++++----------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/FusionIIIT/applications/central_mess/models.py b/FusionIIIT/applications/central_mess/models.py
index dfb2ad70f..7af7d7484 100644
--- a/FusionIIIT/applications/central_mess/models.py
+++ b/FusionIIIT/applications/central_mess/models.py
@@ -83,8 +83,8 @@
)
MESS_OPTION = (
- ('mess1', 'Mess1'),
- ('mess2', 'Mess2')
+ ('mess1', 'Veg_mess'),
+ ('mess2', 'Non_veg_mess')
)
@@ -126,7 +126,7 @@ class Monthly_bill(models.Model):
amount = models.IntegerField(default=0)
rebate_count = models.IntegerField(default=0)
rebate_amount = models.IntegerField(default=0)
- # nonveg_total_bill = models.IntegerField(default=0)
+ nonveg_total_bill = models.IntegerField(default=0)
total_bill = models.IntegerField(default=0)
paid = models.BooleanField(default=False)
@@ -139,15 +139,15 @@ def __str__(self):
class Payments(models.Model):
student_id = models.ForeignKey(Student, on_delete=models.CASCADE)
- # sem = models.IntegerField()
- # year = models.IntegerField(default=current_year)
+ sem = models.IntegerField()
+ year = models.IntegerField(default=current_year)
amount_paid = models.IntegerField(default=0)
class Meta:
- unique_together = (('student_id'),)
+ unique_together = (('student_id', 'sem', 'year'),)
def __str__(self):
- return '{}'.format(self.student_id.id)
+ return '{} - {}'.format(self.student_id.id, self.sem)
class Menu(models.Model):
@@ -187,26 +187,26 @@ def __str__(self):
return str(self.student_id.id)
-# class Nonveg_menu(models.Model):
-# dish = models.CharField(max_length=20)
-# price = models.IntegerField()
-# order_interval = models.CharField(max_length=20, choices=INTERVAL,
-# default='Breakfast')
+class Nonveg_menu(models.Model):
+ dish = models.CharField(max_length=20)
+ price = models.IntegerField()
+ order_interval = models.CharField(max_length=20, choices=INTERVAL,
+ default='Breakfast')
-# def __str__(self):
-# return '{} - {}'.format(self.dish, self.price)
+ def __str__(self):
+ return '{} - {}'.format(self.dish, self.price)
-# class Nonveg_data(models.Model):
-# student_id = models.ForeignKey(Student, on_delete=models.CASCADE)
-# order_date = models.DateField(default=datetime.date.today)
-# order_interval = models.CharField(max_length=20, choices=INTERVAL,
-# default='Breakfast')
-# dish = models.ForeignKey(Nonveg_menu, on_delete=models.CASCADE)
-# app_date = models.DateField(default=datetime.date.today)
+class Nonveg_data(models.Model):
+ student_id = models.ForeignKey(Student, on_delete=models.CASCADE)
+ order_date = models.DateField(default=datetime.date.today)
+ order_interval = models.CharField(max_length=20, choices=INTERVAL,
+ default='Breakfast')
+ dish = models.ForeignKey(Nonveg_menu, on_delete=models.CASCADE)
+ app_date = models.DateField(default=datetime.date.today)
-# def __str__(self):
-# return str(self.student_id.id)
+ def __str__(self):
+ return str(self.student_id.id)
class Special_request(models.Model):
From c39e300695f6e3758f10d5332d60b9bc4e1033dc Mon Sep 17 00:00:00 2001
From: Harshit0009
Date: Sun, 18 Feb 2024 18:17:04 +0530
Subject: [PATCH 04/78] revert to old
---
.../applications/central_mess/models.py | 46 +++++++++----------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/FusionIIIT/applications/central_mess/models.py b/FusionIIIT/applications/central_mess/models.py
index 7af7d7484..dfb2ad70f 100644
--- a/FusionIIIT/applications/central_mess/models.py
+++ b/FusionIIIT/applications/central_mess/models.py
@@ -83,8 +83,8 @@
)
MESS_OPTION = (
- ('mess1', 'Veg_mess'),
- ('mess2', 'Non_veg_mess')
+ ('mess1', 'Mess1'),
+ ('mess2', 'Mess2')
)
@@ -126,7 +126,7 @@ class Monthly_bill(models.Model):
amount = models.IntegerField(default=0)
rebate_count = models.IntegerField(default=0)
rebate_amount = models.IntegerField(default=0)
- nonveg_total_bill = models.IntegerField(default=0)
+ # nonveg_total_bill = models.IntegerField(default=0)
total_bill = models.IntegerField(default=0)
paid = models.BooleanField(default=False)
@@ -139,15 +139,15 @@ def __str__(self):
class Payments(models.Model):
student_id = models.ForeignKey(Student, on_delete=models.CASCADE)
- sem = models.IntegerField()
- year = models.IntegerField(default=current_year)
+ # sem = models.IntegerField()
+ # year = models.IntegerField(default=current_year)
amount_paid = models.IntegerField(default=0)
class Meta:
- unique_together = (('student_id', 'sem', 'year'),)
+ unique_together = (('student_id'),)
def __str__(self):
- return '{} - {}'.format(self.student_id.id, self.sem)
+ return '{}'.format(self.student_id.id)
class Menu(models.Model):
@@ -187,26 +187,26 @@ def __str__(self):
return str(self.student_id.id)
-class Nonveg_menu(models.Model):
- dish = models.CharField(max_length=20)
- price = models.IntegerField()
- order_interval = models.CharField(max_length=20, choices=INTERVAL,
- default='Breakfast')
+# class Nonveg_menu(models.Model):
+# dish = models.CharField(max_length=20)
+# price = models.IntegerField()
+# order_interval = models.CharField(max_length=20, choices=INTERVAL,
+# default='Breakfast')
- def __str__(self):
- return '{} - {}'.format(self.dish, self.price)
+# def __str__(self):
+# return '{} - {}'.format(self.dish, self.price)
-class Nonveg_data(models.Model):
- student_id = models.ForeignKey(Student, on_delete=models.CASCADE)
- order_date = models.DateField(default=datetime.date.today)
- order_interval = models.CharField(max_length=20, choices=INTERVAL,
- default='Breakfast')
- dish = models.ForeignKey(Nonveg_menu, on_delete=models.CASCADE)
- app_date = models.DateField(default=datetime.date.today)
+# class Nonveg_data(models.Model):
+# student_id = models.ForeignKey(Student, on_delete=models.CASCADE)
+# order_date = models.DateField(default=datetime.date.today)
+# order_interval = models.CharField(max_length=20, choices=INTERVAL,
+# default='Breakfast')
+# dish = models.ForeignKey(Nonveg_menu, on_delete=models.CASCADE)
+# app_date = models.DateField(default=datetime.date.today)
- def __str__(self):
- return str(self.student_id.id)
+# def __str__(self):
+# return str(self.student_id.id)
class Special_request(models.Model):
From d40f61b053932f2fc9dc30675287837c5bbf6578 Mon Sep 17 00:00:00 2001
From: Harshul
Date: Sun, 18 Feb 2024 20:16:17 +0530
Subject: [PATCH 05/78] some changes in frontend
---
FusionIIIT/templates/messModule/views.html | 76 +++-------------------
1 file changed, 10 insertions(+), 66 deletions(-)
diff --git a/FusionIIIT/templates/messModule/views.html b/FusionIIIT/templates/messModule/views.html
index b10154258..8049c4920 100644
--- a/FusionIIIT/templates/messModule/views.html
+++ b/FusionIIIT/templates/messModule/views.html
@@ -22,7 +22,7 @@
-
- {{ user.first_name}}
- {{ user.last_name}}
-
-
{% else %}
-
- {{ request.user.first_name}}
- {{ request.user.last_name}}
-
{% endif %}
- -
+
@@ -41,27 +41,21 @@
-
+
@@ -322,26 +286,6 @@ - - {% for pay in payments %} -
-
-
-
-
-
- {{pay.sem}}
-
- {{pay.amount_paid}}
-
-
- {% endfor %}
-
From 15b27a85332cadea939719c353e64cc679fd74c4 Mon Sep 17 00:00:00 2001 From: Harshul
Date: Sun, 18 Feb 2024 20:24:36 +0530
Subject: [PATCH 06/78] some updates in frontend files
---
.../templates/messModule/respondmenu.html | 6 +-
.../templates/messModule/view_feedback.html | 105 +++++++++++--
FusionIIIT/templates/messModule/viewmenu.html | 141 +++---------------
3 files changed, 115 insertions(+), 137 deletions(-)
diff --git a/FusionIIIT/templates/messModule/respondmenu.html b/FusionIIIT/templates/messModule/respondmenu.html
index d55d8be73..d16debf9b 100644
--- a/FusionIIIT/templates/messModule/respondmenu.html
+++ b/FusionIIIT/templates/messModule/respondmenu.html
@@ -57,7 +57,7 @@
-
+ {% endif %} @@ -91,7 +91,7 @@
-
+ {% endif %} {% if list.status == '0' %} @@ -110,7 +110,7 @@
- | Monday | {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'MB' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'ML' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'MD' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} @@ -71,27 +65,21 @@Tuesday | {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'TB' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'TL' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'TD' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} @@ -102,27 +90,21 @@Wednesday | {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'WB' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'WL' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'WD' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} @@ -131,27 +113,21 @@Thursday | {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'THB' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'THL' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'THD' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} @@ -161,27 +137,21 @@Friday | {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'FB' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'FL' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'FD' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} @@ -190,27 +160,21 @@Saturday | {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'SB' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'SL' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'SD' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} @@ -220,27 +184,21 @@Sunday | {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'SUB' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'SUL' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} {% for item in reg_menu %} - {% if item.mess_option == messinfo.mess_option %} {% if item.meal_time == 'SUD' %}{{item.dish}} | {% endif %} - {% endif %} {% endfor %} @@ -277,9 +235,9 @@Monthly bill | Rebate Count | Rebate Amt | -NonVeg Amt | Total | Paid | +Due Amount | {% for stu in monthly_bill %} @@ -288,7 +246,6 @@{{stu.amount}} | {{stu.rebate_count}} | {{stu.rebate_amount}} | -{{stu.nonveg_total_bill}} | {{stu.total_bill}} | {% if stu.paid %} @@ -297,12 +254,19 @@ {% endif %} | ++ {% if stu.paid %} + 0 + {% else %} + {{stu.due_amount}} + {% endif %} + | {% endfor %}
|---|
Total Due Amount : {{total_due}}
@@ -322,26 +286,6 @@ - - {% for pay in payments %} -
-
-
- {{pay.student_id}}
-
-
- From 15b27a85332cadea939719c353e64cc679fd74c4 Mon Sep 17 00:00:00 2001 From: Harshul
+ {% endif %} @@ -91,7 +91,7 @@
+ {% endif %} {% if list.status == '0' %} @@ -110,7 +110,7 @@
+ {% endif %} {% endfor %} diff --git a/FusionIIIT/templates/messModule/view_feedback.html b/FusionIIIT/templates/messModule/view_feedback.html index 82ca0955b..6bfa6e951 100644 --- a/FusionIIIT/templates/messModule/view_feedback.html +++ b/FusionIIIT/templates/messModule/view_feedback.html @@ -38,16 +38,31 @@
diff --git a/FusionIIIT/templates/messModule/viewmenu.html b/FusionIIIT/templates/messModule/viewmenu.html
index cae07f21a..0ac8034c6 100644
--- a/FusionIIIT/templates/messModule/viewmenu.html
+++ b/FusionIIIT/templates/messModule/viewmenu.html
@@ -4,14 +4,14 @@
{% comment %}The tab menu starts here!{% endcomment %}
-
+
@@ -28,21 +28,6 @@
| Monday | - {% for item in menu %} {% if item.mess_option == 'mess2' %} {% if item.meal_time == 'MB' %} @@ -72,22 +57,6 @@||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| Tuesday | - {% for item in menu %} {% if item.mess_option == 'mess2' %} {% if item.meal_time == 'TB' %} @@ -118,21 +87,6 @@||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| Wednesday | - {% for item in menu %} {% if item.mess_option == 'mess2' %} {% if item.meal_time == 'WB' %} @@ -161,22 +115,6 @@||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| Thursday | - {% for item in menu %} {% if item.mess_option == 'mess2' %} {% if item.meal_time == 'THB' %} @@ -206,21 +144,6 @@Friday | - {% for item in menu %} {% if item.mess_option == 'mess2' %} {% if item.meal_time == 'FB' %} @@ -250,21 +173,6 @@|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| Saturday | - {% for item in menu %} {% if item.mess_option == 'mess2' %} {% if item.meal_time == 'SB' %} @@ -294,21 +202,6 @@||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| Sunday | - {% for item in menu %} {% if item.mess_option == 'mess2' %} {% if item.meal_time == 'SUB' %} @@ -356,7 +249,7 @@ -
| Monday | - {% for item in menu %} - {% if item.mess_option == 'mess1' %} - {% if item.meal_time == 'MB' or item.meal_time == 'ML' or item.meal_time == 'MD' %} - - {% if item.meal_time == 'MB' %} -{{item.dish}} | - {% elif item.meal_time == 'ML' %} -{{item.dish}} | - {% elif item.meal_time == 'MD' %} -{{item.dish}} | + {% for item in menu %} + {% if item.mess_option == 'mess1' %} + {% if item.meal_time == 'MB' or item.meal_time == 'ML' or item.meal_time == 'MD' %} + + {% if item.meal_time == 'MB' %} +{{item.dish}} | + {% elif item.meal_time == 'ML' %} +{{item.dish}} | + {% elif item.meal_time == 'MD' %} +{{item.dish}} | + {% endif %} + {% endif %} - {% endif %} - {% endif %} - {% endfor %} + {% endfor %}|||||||||||||||||
| - | Breakfast |
- Lunch |
- Dinner |
+ Breakfast |
+ Lunch |
+ Dinner |
+
|||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Monday | +Monday |
{% for item in menu %}
{% if item.mess_option == 'mess1' %}
{% if item.meal_time == 'MB' or item.meal_time == 'ML' or item.meal_time == 'MD' %}
{% if item.meal_time == 'MB' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'ML' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'MD' %}
- {{item.dish}} | +{{item.dish}} |
{% endif %}
+
{% endif %}
{% endif %}
@@ -223,18 +48,18 @@ ||||||||||||||||
| Tuesday | +Tuesday |
{% for item in menu %}
{% if item.mess_option == 'mess1' %}
{% if item.meal_time == 'TB' or item.meal_time == 'TL' or item.meal_time == 'TD' %}
{% if item.meal_time == 'TB' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'TL' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'TD' %}
- {{item.dish}} | +{{item.dish}} |
{% endif %}
{% endif %}
@@ -246,17 +71,17 @@ ||||||||||||||||
| Wednesday | +Wednesday |
{% for item in menu %}
{% if item.mess_option == 'mess1' %}
{% if item.meal_time == 'WB' or item.meal_time == 'WL' or item.meal_time == 'WD' %}
{% if item.meal_time == 'WB' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'WL' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'WD' %}
- {{item.dish}} | +{{item.dish}} |
{% endif %}
{% endif %}
@@ -266,18 +91,18 @@ ||||||||||||||||
| Thursday | +Thursday |
{% for item in menu %}
{% if item.mess_option == 'mess1' %}
{% if item.meal_time == 'THB' or item.meal_time == 'THL' or item.meal_time == 'THD' %}
{% if item.meal_time == 'THB' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'THL' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'THD' %}
- {{item.dish}} | +{{item.dish}} |
{% endif %}
{% endif %}
@@ -288,17 +113,17 @@ ||||||||||||||||
| Friday | +Friday |
{% for item in menu %}
{% if item.mess_option == 'mess1' %}
{% if item.meal_time == 'FB' or item.meal_time == 'FL' or item.meal_time == 'FD' %}
{% if item.meal_time == 'FB' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'FL' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'FD' %}
- {{item.dish}} | +{{item.dish}} |
{% endif %}
{% endif %}
@@ -309,17 +134,17 @@ ||||||||||||||||
| Saturday | +Saturday |
{% for item in menu %}
{% if item.mess_option == 'mess1' %}
{% if item.meal_time == 'SB' or item.meal_time == 'SL' or item.meal_time == 'SD' %}
{% if item.meal_time == 'SB' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'SL' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'SD' %}
- {{item.dish}} | +{{item.dish}} |
{% endif %}
{% endif %}
@@ -330,17 +155,17 @@ ||||||||||||||||
| Sunday | +Sunday |
{% for item in menu %}
{% if item.mess_option == 'mess1' %}
{% if item.meal_time == 'SUB' or item.meal_time == 'SUL' or item.meal_time == 'SUD' %}
{% if item.meal_time == 'SUB' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'SUL' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'SUD' %}
- {{item.dish}} | +{{item.dish}} |
{% endif %}
{% endif %}
diff --git a/FusionIIIT/templates/messModule/menudownloadable2.html b/FusionIIIT/templates/messModule/menudownloadable2.html
index 1f097f9f8..95d31acea 100644
--- a/FusionIIIT/templates/messModule/menudownloadable2.html
+++ b/FusionIIIT/templates/messModule/menudownloadable2.html
@@ -10,30 +10,35 @@
||||||||||||||||
| - | Breakfast | -Lunch | -Dinner | +Breakfast |
+ Lunch |
+ Dinner |
+
|||||||||||||||||
| Monday | +Monday |
{% for item in menu %}
{% if item.mess_option == 'mess2' %}
{% if item.meal_time == 'MB' or item.meal_time == 'ML' or item.meal_time == 'MD' %}
{% if item.meal_time == 'MB' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'ML' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'MD' %}
- {{item.dish}} | +{{item.dish}} |
{% endif %}
+
{% endif %}
{% endif %}
@@ -43,18 +48,18 @@ ||||||||||||||||
| Tuesday | +Tuesday |
{% for item in menu %}
{% if item.mess_option == 'mess2' %}
{% if item.meal_time == 'TB' or item.meal_time == 'TL' or item.meal_time == 'TD' %}
{% if item.meal_time == 'TB' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'TL' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'TD' %}
- {{item.dish}} | +{{item.dish}} |
{% endif %}
{% endif %}
@@ -66,17 +71,17 @@ ||||||||||||||||
| Wednesday | +Wednesday |
{% for item in menu %}
{% if item.mess_option == 'mess2' %}
{% if item.meal_time == 'WB' or item.meal_time == 'WL' or item.meal_time == 'WD' %}
{% if item.meal_time == 'WB' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'WL' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'WD' %}
- {{item.dish}} | +{{item.dish}} |
{% endif %}
{% endif %}
@@ -86,18 +91,18 @@ ||||||||||||||||
| Thursday | +Thursday |
{% for item in menu %}
{% if item.mess_option == 'mess2' %}
{% if item.meal_time == 'THB' or item.meal_time == 'THL' or item.meal_time == 'THD' %}
{% if item.meal_time == 'THB' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'THL' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'THD' %}
- {{item.dish}} | +{{item.dish}} |
{% endif %}
{% endif %}
@@ -108,17 +113,17 @@ ||||||||||||||||
| Friday | +Friday |
{% for item in menu %}
{% if item.mess_option == 'mess2' %}
{% if item.meal_time == 'FB' or item.meal_time == 'FL' or item.meal_time == 'FD' %}
{% if item.meal_time == 'FB' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'FL' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'FD' %}
- {{item.dish}} | +{{item.dish}} |
{% endif %}
{% endif %}
@@ -129,17 +134,17 @@ ||||||||||||||||
| Saturday | +Saturday |
{% for item in menu %}
{% if item.mess_option == 'mess2' %}
{% if item.meal_time == 'SB' or item.meal_time == 'SL' or item.meal_time == 'SD' %}
{% if item.meal_time == 'SB' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'SL' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'SD' %}
- {{item.dish}} | +{{item.dish}} |
{% endif %}
{% endif %}
@@ -150,17 +155,17 @@ ||||||||||||||||
| Sunday | +Sunday |
{% for item in menu %}
{% if item.mess_option == 'mess2' %}
{% if item.meal_time == 'SUB' or item.meal_time == 'SUL' or item.meal_time == 'SUD' %}
{% if item.meal_time == 'SUB' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'SUL' %}
- {{item.dish}} | +{{item.dish}} |
{% elif item.meal_time == 'SUD' %}
- {{item.dish}} | +{{item.dish}} |
{% endif %}
{% endif %}
From e2733d38d3f7d417af64d47cb99766daebe2d910 Mon Sep 17 00:00:00 2001
From: Harshit0009
| Student Id | +Transaction No | +Image | +Amount | +Accept/Reject | +
|---|---|---|---|---|
| + {{var.student_id}} + | ++ {{var.Txn_no}} + | ++ {{var.img}} + | ++ {{var.amount}} + | ++ + + + + + + + + + + | +
+
+
+
+
+
+
+
+ {% endblock %}
+ {% endblock %}
diff --git a/FusionIIIT/templates/messModule/menu_card.html b/FusionIIIT/templates/messModule/menu_card.html
index 8c5ca4436..eda9c82b8 100644
--- a/FusionIIIT/templates/messModule/menu_card.html
+++ b/FusionIIIT/templates/messModule/menu_card.html
@@ -96,6 +96,10 @@
Respond to requests
+
+
+ Registrations/Deregistrations Requests
+
{% comment %}
Non-Veg Orders
diff --git a/FusionIIIT/templates/messModule/mess.html b/FusionIIIT/templates/messModule/mess.html
index 1b96e172b..ad5d1a248 100644
--- a/FusionIIIT/templates/messModule/mess.html
+++ b/FusionIIIT/templates/messModule/mess.html
@@ -170,7 +170,11 @@
{% include 'messModule/respondmenu.html' %}
{% endblock %}
+
+
+
+
+
+| Student Id | +Date | +Accept/Reject | +
|---|---|---|
| + {{var.student_id}} + | ++ {{var.date}} + | ++ + + + + + + + + + + | +
+ {% block de-registraionsrequests %}
+ {% include 'messModule/de-registraionsrequests.html' %}
+ {% endblock %}
+
{% comment %}
{% block nonvegorders %}
From 26a4706acdd28766513eb9b2d3964fe6e395f460 Mon Sep 17 00:00:00 2001
From: HritikYadav7
Date: Fri, 8 Mar 2024 03:19:38 +0530
Subject: [PATCH 25/78] registration UI changes
---
FusionIIIT/Fusion/settings/development.py | 2 +-
FusionIIIT/applications/central_mess/urls.py | 4 +++-
FusionIIIT/applications/central_mess/views.py | 11 +++++------
.../templates/messModule/de-registraionsrequests.html | 7 +++++--
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/FusionIIIT/Fusion/settings/development.py b/FusionIIIT/Fusion/settings/development.py
index 4cd393879..ae8e70855 100644
--- a/FusionIIIT/Fusion/settings/development.py
+++ b/FusionIIIT/Fusion/settings/development.py
@@ -1,7 +1,7 @@
from Fusion.settings.common import *
DEBUG = True
-
+TEMPLATE_DEBUG = True
SECRET_KEY = '=&w9due426k@l^ju1=s1)fj1rnpf0ok8xvjwx+62_nc-f12-8('
ALLOWED_HOSTS = ['*']
diff --git a/FusionIIIT/applications/central_mess/urls.py b/FusionIIIT/applications/central_mess/urls.py
index 09e3838c1..6476ba209 100644
--- a/FusionIIIT/applications/central_mess/urls.py
+++ b/FusionIIIT/applications/central_mess/urls.py
@@ -1,4 +1,6 @@
from django.conf.urls import url , include
+from django.conf import settings
+from django.conf.urls.static import static
from . import views
@@ -47,4 +49,4 @@
# url(r'^uploadpayment', views.uploadPaymentDue, name='uploadpayment')
url(r'^respond_to_reg_req',views.respond_to_reg, name='reg_response')
-]
\ No newline at end of file
+]+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
\ No newline at end of file
diff --git a/FusionIIIT/applications/central_mess/views.py b/FusionIIIT/applications/central_mess/views.py
index 49b5c706b..6ca245b7a 100644
--- a/FusionIIIT/applications/central_mess/views.py
+++ b/FusionIIIT/applications/central_mess/views.py
@@ -75,7 +75,7 @@ def mess(request):
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()
reg_request = Registration_Request.objects.filter(student_id=student)
- reg_main = Reg_main.objects.get(student_id=student)
+ # reg_main = Reg_main.objects.get(student_id=student)
reg_record = Reg_records.objects.filter(student_id=student)
monthly_bill=monthly_bill[::-1]
@@ -218,7 +218,7 @@ def mess(request):
'desig': desig,
'reg_form':reg_form,
'reg_request':reg_request,
- 'reg_main':reg_main,
+ # 'reg_main':reg_main,
'reg_record':reg_record
}
return render(request, "messModule/mess.html", context)
@@ -287,7 +287,7 @@ def mess(request):
'desig': desig,
'reg_form':reg_form,
'reg_request':reg_request,
- 'reg_main':reg_main,
+ # 'reg_main':reg_main,
'reg_record':reg_record
}
return render(request, "messModule/mess.html", context)
@@ -313,7 +313,6 @@ def mess(request):
'meeting': meeting,
'reg_form':reg_form,
'reg_request':reg_request,
- 'reg_main':reg_main,
'reg_record':reg_record
}
@@ -366,7 +365,7 @@ def mess(request):
sprequest_past = Special_request.objects.select_related('student_id','student_id__id','student_id__id__user','student_id__id__department').filter(status='2').order_by('-app_date')
reg_request = Registration_Request.objects.all()
- reg_main = Reg_main.objects.all()
+ # reg_main = Reg_main.objects.all()
reg_record = Reg_records.objects.all()
context = {
'bill_base': current_bill,
@@ -390,7 +389,7 @@ def mess(request):
'count2': count2, 'count3': count3, 'feed1': feed1,'feed2':feed2,
'count4': count4, 'form': form, 'count5': count5,
'count6': count6, 'count7': count7, 'count8': count8, 'desig': desig,
- 'reg_request':reg_request, 'reg_main':reg_main, 'reg_record':reg_record
+ 'reg_request':reg_request,'reg_record':reg_record
}
return render(request, "messModule/mess.html", context)
diff --git a/FusionIIIT/templates/messModule/de-registraionsrequests.html b/FusionIIIT/templates/messModule/de-registraionsrequests.html
index 8c8d34a78..a4499f66a 100644
--- a/FusionIIIT/templates/messModule/de-registraionsrequests.html
+++ b/FusionIIIT/templates/messModule/de-registraionsrequests.html
@@ -26,7 +26,7 @@
-
Date: Fri, 8 Mar 2024 14:28:51 +0530
Subject: [PATCH 29/78] migration fix
---
.../central_mess/migrations/0001_initial.py | 186 ------------------
.../migrations/0002_auto_20230328_1942.py | 38 ----
.../migrations/0002_monthly_bill_paid.py | 18 --
.../migrations/0003_auto_20230331_1935.py | 26 ---
.../migrations/0004_merge_20230405_0022.py | 14 --
.../migrations/0005_auto_20240307_0044.py | 23 ---
.../central_mess/migrations/__init__.py | 0
7 files changed, 305 deletions(-)
delete mode 100644 FusionIIIT/applications/central_mess/migrations/0001_initial.py
delete mode 100644 FusionIIIT/applications/central_mess/migrations/0002_auto_20230328_1942.py
delete mode 100644 FusionIIIT/applications/central_mess/migrations/0002_monthly_bill_paid.py
delete mode 100644 FusionIIIT/applications/central_mess/migrations/0003_auto_20230331_1935.py
delete mode 100644 FusionIIIT/applications/central_mess/migrations/0004_merge_20230405_0022.py
delete mode 100644 FusionIIIT/applications/central_mess/migrations/0005_auto_20240307_0044.py
delete mode 100644 FusionIIIT/applications/central_mess/migrations/__init__.py
diff --git a/FusionIIIT/applications/central_mess/migrations/0001_initial.py b/FusionIIIT/applications/central_mess/migrations/0001_initial.py
deleted file mode 100644
index 2a5bce41c..000000000
--- a/FusionIIIT/applications/central_mess/migrations/0001_initial.py
+++ /dev/null
@@ -1,186 +0,0 @@
-# Generated by Django 3.1.5 on 2023-03-15 18:53
-
-import applications.central_mess.models
-import datetime
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- initial = True
-
- dependencies = [
- ('academic_information', '0001_initial'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Menu',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('mess_option', models.CharField(choices=[('mess1', 'Veg_mess'), ('mess2', 'Non_veg_mess')], default='mess2', max_length=20)),
- ('meal_time', models.CharField(choices=[('MB', 'Monday Breakfast'), ('ML', 'Monday Lunch'), ('MD', 'Monday Dinner'), ('TB', 'Tuesday Breakfast'), ('TL', 'Tuesday Lunch'), ('TD', 'Tuesday Dinner'), ('WB', 'Wednesday Breakfast'), ('WL', 'Wednesday Lunch'), ('WD', 'Wednesday Dinner'), ('THB', 'Thursday Breakfast'), ('THL', 'Thursday Lunch'), ('THD', 'Thursday Dinner'), ('FB', 'Friday Breakfast'), ('FL', 'Friday Lunch'), ('FD', 'Friday Dinner'), ('SB', 'Saturday Breakfast'), ('SL', 'Saturday Lunch'), ('SD', 'Saturday Dinner'), ('SUB', 'Sunday Breakfast'), ('SUL', 'Sunday Lunch'), ('SUD', 'Sunday Dinner')], max_length=20)),
- ('dish', models.CharField(max_length=200)),
- ],
- ),
- migrations.CreateModel(
- name='Mess_meeting',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('meet_date', models.DateField()),
- ('agenda', models.TextField()),
- ('venue', models.TextField()),
- ('meeting_time', models.CharField(choices=[('10', '10 a.m.'), ('11', '11 a.m.'), ('12', '12 p.m.'), ('13', '1 p.m.'), ('14', '2 p.m.'), ('15', '3 p.m.'), ('16', '4 p.m.'), ('17', '5 p.m.'), ('18', '6 p.m.'), ('19', '7 p.m.'), ('20', '8 p.m.'), ('21', '9 p.m.')], max_length=20)),
- ],
- ),
- migrations.CreateModel(
- name='Mess_reg',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('sem', models.IntegerField(default='1')),
- ('start_reg', models.DateField(default=datetime.date.today)),
- ('end_reg', models.DateField(default=datetime.date.today)),
- ],
- ),
- migrations.CreateModel(
- name='MessBillBase',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('bill_amount', models.PositiveIntegerField(default=0)),
- ('timestamp', models.DateTimeField(auto_now_add=True)),
- ],
- ),
- migrations.CreateModel(
- name='Nonveg_menu',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('dish', models.CharField(max_length=20)),
- ('price', models.IntegerField()),
- ('order_interval', models.CharField(choices=[('Breakfast', 'Breakfast'), ('Lunch', 'Lunch'), ('Dinner', 'Dinner')], default='Breakfast', max_length=20)),
- ],
- ),
- migrations.CreateModel(
- name='Vacation_food',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('start_date', models.DateField(default=datetime.date.today)),
- ('end_date', models.DateField(default=datetime.date.today)),
- ('purpose', models.TextField()),
- ('status', models.CharField(choices=[('0', 'rejected'), ('1', 'pending'), ('2', 'accepted')], default='1', max_length=20)),
- ('app_date', models.DateField(default=datetime.date.today)),
- ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
- ],
- ),
- migrations.CreateModel(
- name='Special_request',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('start_date', models.DateField(default=datetime.date.today)),
- ('end_date', models.DateField(default=datetime.date.today)),
- ('request', models.TextField()),
- ('status', models.CharField(choices=[('0', 'rejected'), ('1', 'pending'), ('2', 'accepted')], default='1', max_length=20)),
- ('item1', models.CharField(max_length=50)),
- ('item2', models.CharField(max_length=50)),
- ('app_date', models.DateField(default=datetime.date.today)),
- ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
- ],
- ),
- migrations.CreateModel(
- name='Rebate',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('start_date', models.DateField(default=datetime.date.today)),
- ('end_date', models.DateField(default=datetime.date.today)),
- ('purpose', models.TextField()),
- ('status', models.CharField(choices=[('0', 'rejected'), ('1', 'pending'), ('2', 'accepted')], default='1', max_length=20)),
- ('app_date', models.DateField(default=datetime.date.today)),
- ('leave_type', models.CharField(choices=[('casual', 'Casual'), ('vacation', 'Vacation')], default='casual', max_length=20)),
- ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
- ],
- ),
- migrations.CreateModel(
- name='Nonveg_data',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('order_date', models.DateField(default=datetime.date.today)),
- ('order_interval', models.CharField(choices=[('Breakfast', 'Breakfast'), ('Lunch', 'Lunch'), ('Dinner', 'Dinner')], default='Breakfast', max_length=20)),
- ('app_date', models.DateField(default=datetime.date.today)),
- ('dish', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='central_mess.nonveg_menu')),
- ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
- ],
- ),
- migrations.CreateModel(
- name='Mess_minutes',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('mess_minutes', models.FileField(upload_to='central_mess/')),
- ('meeting_date', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='central_mess.mess_meeting')),
- ],
- ),
- migrations.CreateModel(
- name='Menu_change_request',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('reason', models.TextField()),
- ('request', models.CharField(max_length=100)),
- ('status', models.CharField(choices=[('0', 'rejected'), ('1', 'pending'), ('2', 'accepted')], default='1', max_length=20)),
- ('app_date', models.DateField(default=datetime.date.today)),
- ('dish', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='central_mess.menu')),
- ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
- ],
- ),
- migrations.CreateModel(
- name='Feedback',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('mess', models.CharField(choices=[('mess1', 'Veg_mess'), ('mess2', 'Non_veg_mess')], default='mess1', max_length=10)),
- ('mess_rating', models.PositiveSmallIntegerField(default='5')),
- ('fdate', models.DateField(default=datetime.date.today)),
- ('description', models.TextField()),
- ('feedback_type', models.CharField(choices=[('maintenance', 'Maintenance'), ('food', 'Food'), ('cleanliness', 'Cleanliness & Hygiene'), ('others', 'Others')], max_length=20)),
- ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
- ],
- ),
- migrations.CreateModel(
- name='Payments',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('sem', models.IntegerField()),
- ('year', models.IntegerField(default=applications.central_mess.models.current_year)),
- ('amount_paid', models.IntegerField(default=0)),
- ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
- ],
- options={
- 'unique_together': {('student_id', 'sem', 'year')},
- },
- ),
- migrations.CreateModel(
- name='Monthly_bill',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('month', models.CharField(default=applications.central_mess.models.current_month, max_length=20)),
- ('year', models.IntegerField(default=applications.central_mess.models.current_year)),
- ('amount', models.IntegerField(default=0)),
- ('rebate_count', models.IntegerField(default=0)),
- ('rebate_amount', models.IntegerField(default=0)),
- ('nonveg_total_bill', models.IntegerField(default=0)),
- ('total_bill', models.IntegerField(default=0)),
- ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
- ],
- options={
- 'unique_together': {('student_id', 'month', 'year')},
- },
- ),
- migrations.CreateModel(
- name='Messinfo',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('mess_option', models.CharField(choices=[('mess1', 'Veg_mess'), ('mess2', 'Non_veg_mess')], default='mess2', max_length=20)),
- ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
- ],
- options={
- 'unique_together': {('student_id', 'mess_option')},
- },
- ),
- ]
diff --git a/FusionIIIT/applications/central_mess/migrations/0002_auto_20230328_1942.py b/FusionIIIT/applications/central_mess/migrations/0002_auto_20230328_1942.py
deleted file mode 100644
index 5002a3375..000000000
--- a/FusionIIIT/applications/central_mess/migrations/0002_auto_20230328_1942.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Generated by Django 3.1.5 on 2023-03-28 19:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('central_mess', '0001_initial'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='monthly_bill',
- name='nonveg_total_bill',
- ),
- migrations.AlterField(
- model_name='feedback',
- name='mess',
- field=models.CharField(choices=[('mess1', 'Mess1'), ('mess2', 'Mess2')], default='mess1', max_length=10),
- ),
- migrations.AlterField(
- model_name='menu',
- name='mess_option',
- field=models.CharField(choices=[('mess1', 'Mess1'), ('mess2', 'Mess2')], default='mess2', max_length=20),
- ),
- migrations.AlterField(
- model_name='messinfo',
- name='mess_option',
- field=models.CharField(choices=[('mess1', 'Mess1'), ('mess2', 'Mess2')], default='mess2', max_length=20),
- ),
- migrations.DeleteModel(
- name='Nonveg_data',
- ),
- migrations.DeleteModel(
- name='Nonveg_menu',
- ),
- ]
diff --git a/FusionIIIT/applications/central_mess/migrations/0002_monthly_bill_paid.py b/FusionIIIT/applications/central_mess/migrations/0002_monthly_bill_paid.py
deleted file mode 100644
index 0884018c1..000000000
--- a/FusionIIIT/applications/central_mess/migrations/0002_monthly_bill_paid.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.1.5 on 2023-04-04 11:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('central_mess', '0001_initial'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='monthly_bill',
- name='paid',
- field=models.BooleanField(default=False),
- ),
- ]
diff --git a/FusionIIIT/applications/central_mess/migrations/0003_auto_20230331_1935.py b/FusionIIIT/applications/central_mess/migrations/0003_auto_20230331_1935.py
deleted file mode 100644
index 42b542001..000000000
--- a/FusionIIIT/applications/central_mess/migrations/0003_auto_20230331_1935.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Generated by Django 3.1.5 on 2023-03-31 19:35
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('academic_information', '0001_initial'),
- ('central_mess', '0002_auto_20230328_1942'),
- ]
-
- operations = [
- migrations.AlterUniqueTogether(
- name='payments',
- unique_together={('student_id',)},
- ),
- migrations.RemoveField(
- model_name='payments',
- name='sem',
- ),
- migrations.RemoveField(
- model_name='payments',
- name='year',
- ),
- ]
diff --git a/FusionIIIT/applications/central_mess/migrations/0004_merge_20230405_0022.py b/FusionIIIT/applications/central_mess/migrations/0004_merge_20230405_0022.py
deleted file mode 100644
index 1fa962e73..000000000
--- a/FusionIIIT/applications/central_mess/migrations/0004_merge_20230405_0022.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated by Django 3.1.5 on 2023-04-05 00:22
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('central_mess', '0003_auto_20230331_1935'),
- ('central_mess', '0002_monthly_bill_paid'),
- ]
-
- operations = [
- ]
diff --git a/FusionIIIT/applications/central_mess/migrations/0005_auto_20240307_0044.py b/FusionIIIT/applications/central_mess/migrations/0005_auto_20240307_0044.py
deleted file mode 100644
index d4cb56a2b..000000000
--- a/FusionIIIT/applications/central_mess/migrations/0005_auto_20240307_0044.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 3.1.5 on 2024-03-07 00:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('central_mess', '0004_merge_20230405_0022'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='feedback',
- name='feedback_remark',
- field=models.CharField(default='NA', max_length=50),
- ),
- migrations.AddField(
- model_name='rebate',
- name='rebate_remark',
- field=models.CharField(default='NA', max_length=50),
- ),
- ]
diff --git a/FusionIIIT/applications/central_mess/migrations/__init__.py b/FusionIIIT/applications/central_mess/migrations/__init__.py
deleted file mode 100644
index e69de29bb..000000000
From 6b83377e005dc99edb08f9b690d2551b51f4526a Mon Sep 17 00:00:00 2001
From: Harshit0009
Date: Fri, 8 Mar 2024 15:45:29 +0530
Subject: [PATCH 30/78] done things about payments
---
.../applications/central_mess/handlers.py | 57 ++++++++++++++++---
.../applications/central_mess/models.py | 7 ++-
2 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/FusionIIIT/applications/central_mess/handlers.py b/FusionIIIT/applications/central_mess/handlers.py
index a3c28fad0..390797c57 100644
--- a/FusionIIIT/applications/central_mess/handlers.py
+++ b/FusionIIIT/applications/central_mess/handlers.py
@@ -30,7 +30,14 @@
first_day_of_next_month = (date.today().replace(day=28) + timedelta(days=4)).replace(day=1)
last_day_of_this_month = first_day_of_next_month - timedelta(days=1)
next_month = first_day_of_next_month.month
+first_day_prev_month = last_day_prev_month.replace(day=1)
+def current_month():
+ return datetime.datetime.now().strftime("%B")
+
+
+def current_year():
+ return datetime.datetime.now().strftime("%Y")
# def add_nonveg_order(request, student):
# """
@@ -569,17 +576,46 @@ def add_mess_committee(request, roll_number):
}
+def Calculate_rebate(id, month_previous, amount_per_day):
+ students = Rebate.objects.filter(student_id_id=id)
+ print(students)
+ no_of_days = 0
+ for student in students:
+ start_date_month = student.start_date.month
+ end_date_month = student.end_date.month
+ if(start_date_month == month_previous):
+ if(end_date_month == month_previous):
+ no_of_days = no_of_days + abs((student.end_date - student.start_date).days) + 1
+ elif(end_date_month == today_g.month):
+ no_of_days = no_of_days + abs((last_day_prev_month - student.start_date).days) + 1
+ else:
+ if(end_date_month == month_previous):
+ no_of_days = no_of_days + abs((student.end_date - student.start_date).days) + 1
+ elif(end_date_month == today_g.month):
+ no_of_days = no_of_days + abs((last_day_prev_month - first_day_prev_month).days) + 1
+ print(no_of_days)
+ rebate_amount = no_of_days*amount_per_day
+ return rebate_amount
+
+
def generate_bill():
- month_t = datetime.now().month - 1
- month_g = last_day_prev_month.month
+ # month_previous = datetime.now().month - 1
+ month_previous = last_day_prev_month.month
+ print(previous_month)
+ # print(datetime.month())
first_day_prev_month = last_day_prev_month.replace(day=1)
# previous_month = month_t.strftime("%B")
- student_all = Student.objects.prefetch_related('rebate_set')
+ # student_all = Student.objects.prefetch_related('rebate_set')
+ student_all = Reg_main.objects.filter(current_mess_status="Registered")
+
print(student_all)
- amount_c = MessBillBase.objects.latest('timestamp')
+ amount_per_day = MessBillBase.objects.latest('timestamp')
+ print(amount_per_day.bill_amount)
for student in student_all:
- # nonveg_total_bill=0
- rebate_count = 0
+ rebate_amount = Calculate_rebate(student.student_id, month_previous, amount_per_day.bill_amount)
+ print(rebate_amount)
+ # rebate_count = rebate_amount/amount_per_day
+ # print(rebate_count)
total = 0
# nonveg_data = student.nonveg_data_set.all()
rebates = student.rebate_set.all()
@@ -663,9 +699,16 @@ def handle_reg_response(request):
mess_status = "Registered"
new_reg = Reg_main(student_id=student,program=program,current_mess_status=mess_status,balance=amount,mess_option=mess)
new_reg.save()
-
new_reg_record = Reg_records(student_id=student)
new_reg_record.save()
+ try:
+ existing_student = Payments.objects.get(student_id=student, payment_month=current_month(), payment_year=current_year())
+ new_amount = existing_student.amount_paid + amount
+ existing_student.amount_paid = new_amount
+ existing_student.save()
+ except:
+ new_payment_record = Payments(student_id = student, amount_paid = amount)
+ new_payment_record.save()
message="Your registeration request has been accepted"
else:
message="Your registeration request has been rejected"
diff --git a/FusionIIIT/applications/central_mess/models.py b/FusionIIIT/applications/central_mess/models.py
index 60a4a99ec..242f55fde 100644
--- a/FusionIIIT/applications/central_mess/models.py
+++ b/FusionIIIT/applications/central_mess/models.py
@@ -128,7 +128,7 @@ class Monthly_bill(models.Model):
rebate_amount = models.IntegerField(default=0)
# nonveg_total_bill = models.IntegerField(default=0)
total_bill = models.IntegerField(default=0)
- paid = models.BooleanField(default=False)
+ # paid = models.BooleanField(default=False)
class Meta:
unique_together = (('student_id', 'month', 'year'),)
@@ -142,9 +142,11 @@ class Payments(models.Model):
# sem = models.IntegerField()
# year = models.IntegerField(default=current_year)
amount_paid = models.IntegerField(default=0)
+ payment_month = models.CharField(max_length=20, default=current_month)
+ payment_year = models.IntegerField(default = current_year)
class Meta:
- unique_together = (('student_id'),)
+ unique_together = (('student_id', 'payment_month', 'payment_year'),)
def __str__(self):
return '{}'.format(self.student_id.id)
@@ -168,6 +170,7 @@ class Rebate(models.Model):
purpose = models.TextField()
status = models.CharField(max_length=20, choices=STATUS, default='1')
app_date = models.DateField(default=datetime.date.today)
+ # TODO = remove leave type
leave_type = models.CharField(choices=LEAVE_TYPE, max_length=20, default="casual")
# leave_document = models.FileField(upload_to='central_mess/')
rebate_remark = models.CharField(max_length=50,default='NA')
From 19aaea4efa2f56082d1083ba2ed4516c0d42f736 Mon Sep 17 00:00:00 2001
From: Harshit0009
Date: Fri, 8 Mar 2024 23:48:24 +0530
Subject: [PATCH 31/78] changed some views
---
FusionIIIT/applications/central_mess/views.py | 42 +++++++++----------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/FusionIIIT/applications/central_mess/views.py b/FusionIIIT/applications/central_mess/views.py
index 5338894df..e647b27fc 100644
--- a/FusionIIIT/applications/central_mess/views.py
+++ b/FusionIIIT/applications/central_mess/views.py
@@ -1,4 +1,3 @@
-
from datetime import date, datetime, timedelta
from django.contrib.auth.decorators import login_required
from django.db import transaction
@@ -71,7 +70,7 @@ def mess(request):
vaca_obj = Vacation_food.objects.select_related('student_id','student_id__id','student_id__id__user','student_id__id__department').filter(student_id=student)
feedback_obj = Feedback.objects.select_related('student_id','student_id__id','student_id__id__user','student_id__id__department').filter(student_id=student).order_by('-fdate')
monthly_bill = Monthly_bill.objects.select_related('student_id','student_id__id','student_id__id__user','student_id__id__department').filter(student_id=student)
- payments = Payments.objects.select_related('student_id','student_id__id','student_id__id__user','student_id__id__department').filter(student_id=student)
+ # 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()
@@ -80,29 +79,29 @@ def mess(request):
reg_record = Reg_records.objects.filter(student_id=student)
monthly_bill=monthly_bill[::-1]
- tot_am=0
- if len(payments)>0:
- tot_am=payments[0].amount_paid
- else:
- tot_am=0
- for x in monthly_bill:
- tot_am=tot_am+x.total_bill
- Payments.objects.create(student_id=student,amount_paid=(-tot_am))
- payments = Payments.objects.select_related('student_id','student_id__id','student_id__id__user','student_id__id__department').filter(student_id=student)
+ # tot_am=0
+ # if len(payments)>0:
+ # tot_am=payments[0].amount_paid
+ # else:
+ # tot_am=0
+ # for x in monthly_bill:
+ # tot_am=tot_am+x.total_bill
+ # Payments.objects.create(student_id=student,amount_paid=(-tot_am))
+ # payments = Payments.objects.select_related('student_id','student_id__id','student_id__id__user','student_id__id__department').filter(student_id=student)
- for i in range(0,len(monthly_bill)):
- if(monthly_bill[i].paid):
- monthly_bill[i].due_amount=0;
- elif monthly_bill[i].total_bill+tot_am<0:
- monthly_bill[i].due_amount=(monthly_bill[i].total_bill)
- else:
- monthly_bill[i].due_amount=(-tot_am)
- tot_am+=monthly_bill[i].total_bill
- amount_due=-payments[0].amount_paid
-
+ # for i in range(0,len(monthly_bill)):
+ # if(monthly_bill[i].paid):
+ # monthly_bill[i].due_amount=0;
+ # elif monthly_bill[i].total_bill+tot_am<0:
+ # monthly_bill[i].due_amount=(monthly_bill[i].total_bill)
+ # else:
+ # monthly_bill[i].due_amount=(-tot_am)
+ # tot_am+=monthly_bill[i].total_bill
+ # amount_due=-payments[0].amount_paid
+ amount_due = 0
## adding the batch of student if btech or bdes then value of programme is 1 or else 0, holds value of phd and mtech.
if student.programme == 'B.Tech' or student.programme == 'B.Des':
@@ -192,6 +191,7 @@ def mess(request):
'newmenu': newmenu,
'monthly_bill': monthly_bill,
'total_due': amount_due,
+
'vaca': vaca_obj,
'info': extrainfo,
'feedback': feedback_obj,
From cf8e7f7c92477a43b76f5fab1f66b5e752e6d9bf Mon Sep 17 00:00:00 2001
From: HritikYadav7
Date: Sat, 9 Mar 2024 00:08:35 +0530
Subject: [PATCH 32/78] Added Registration Remark and Dropdown
---
.../messModule/de-registraionsrequests.html | 41 +++++++++++++++----
.../templates/messModule/registration.html | 4 ++
2 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/FusionIIIT/templates/messModule/de-registraionsrequests.html b/FusionIIIT/templates/messModule/de-registraionsrequests.html
index 203c1dba6..fa207471c 100644
--- a/FusionIIIT/templates/messModule/de-registraionsrequests.html
+++ b/FusionIIIT/templates/messModule/de-registraionsrequests.html
@@ -22,6 +22,8 @@
Transaction No
Image
Amount
+ Remark
+ Mess
Accept/Reject
-
+
{% endblock %}
From 6a162c4b95aab7b10c09760611572d1f18d86e87 Mon Sep 17 00:00:00 2001
From: Harshul-25
+
-
{% comment %}Form Tag starts here!{% endcomment %}
-
{% comment %}Form Tag ends here!{% endcomment %}
-
-
-
-
+
-
-
-
-{% endblock %}
-{#{% endblock %}#}
-
-{% block javascript %}
-
-
-
+
-
- {% for app in feedback %}
-
-
-
-
-
-
-
-
-
- {% endfor %}
-
-
-
-
-
+ {% block Deregistration %}
+ {% include 'messModule/de-registration.html' %}
+ {% endblock %}
+
+ {% comment %}The ... end here!{% endcomment %}
+
{% comment %}The ... starts here!{% endcomment %}
{% comment %}
{% block nonvegfood %}
From 11b3633a316f40db59282a762937344206ac72b2 Mon Sep 17 00:00:00 2001
From: Harshit0009
Date: Sat, 9 Mar 2024 04:38:18 +0530
Subject: [PATCH 38/78] rectified the backend issues for generate bills
---
.../applications/central_mess/handlers.py | 138 ++++++++++--------
FusionIIIT/applications/central_mess/views.py | 68 ++++-----
2 files changed, 109 insertions(+), 97 deletions(-)
diff --git a/FusionIIIT/applications/central_mess/handlers.py b/FusionIIIT/applications/central_mess/handlers.py
index 390797c57..bc37f0192 100644
--- a/FusionIIIT/applications/central_mess/handlers.py
+++ b/FusionIIIT/applications/central_mess/handlers.py
@@ -24,6 +24,8 @@
year_g = today_g.year
tomorrow_g = today_g + timedelta(days=1)
first_day_of_this_month = date.today().replace(day=1)
+this_month = first_day_of_this_month.strftime('%B')
+this_year = first_day_of_this_month.year
last_day_prev_month = first_day_of_this_month - timedelta(days=1)
previous_month = last_day_prev_month.strftime('%B')
previous_month_year = last_day_prev_month.year
@@ -401,7 +403,49 @@ def add_mess_meeting_invitation(request):
}
return data
-
+def rebateCountFn(start_date, end_date, student_id):
+ '''
+ This function is used to store the rebate_count in generte bill table and in what month that rebate has been issued.
+ '''
+ start_date_month = start_date.strftime('%B')
+ start_date_year = start_date.year
+ end_date_month = end_date.strftime('%B')
+ date_format = "%Y-%m-%d"
+ begin_day = datetime.strptime(str(start_date), date_format)
+ end_day = datetime.strptime(str(end_date), date_format)
+ rebate_count_days = 0
+ rebate_count_days_next_month = 0
+ if start_date_month != end_date_month:
+ last_day_day = int(last_day_of_this_month.day)
+ begin_day_day = int(begin_day.day)
+ end_day_day = int(end_day.day)
+ first_day_day = int(first_day_of_next_month.day)
+ rebate_count_days = abs(last_day_day-begin_day_day) + 1
+ rebate_count_days_next_month = abs(end_day_day-first_day_day)+1
+ else:
+ rebate_count_days = abs((end_day - begin_day).days) + 1
+
+ #### Storing the rebate count days into the monthly bill table so it can be used while bill generation.
+
+ try:
+ existing_student = Monthly_bill.objects.get(student_id=student_id, month=start_date_month, year=start_date_year)
+ new_rebate_count = existing_student.rebate_count + rebate_count_days
+ existing_student.rebate_count = new_rebate_count
+ existing_student.save()
+ if(rebate_count_days_next_month != 0):
+ new_student = Monthly_bill.objects.create(student_id=student_id, month=end_date_month, year=start_date_year, rebate_count=rebate_count_days_next_month)
+ new_student.save()
+ except:
+ new_student = Monthly_bill.objects.create(student_id=student_id, month=start_date_month, year=start_date_year, rebate_count=rebate_count_days)
+ new_student.save()
+ if(rebate_count_days_next_month != 0):
+ new_student = Monthly_bill.objects.create(student_id=student_id, month=end_date_month, year=start_date_year, rebate_count=rebate_count_days_next_month)
+ new_student.save()
+
+
+
+
+
def handle_rebate_response(request):
"""
This function is to respond to rebate requests
@@ -427,6 +471,7 @@ def handle_rebate_response(request):
leaves.status = action
leaves.save()
if action == '2':
+ rebateCountFn(leaves.start_date, leaves.end_date, leaves.student_id)
message = 'Your leave request has been accepted between dates ' + str(b.date()) + ' and ' + str(d.date())
else:
message = 'Your leave request has been rejected between dates ' + str(b.date()) + ' and ' + str(d.date())
@@ -599,70 +644,37 @@ def Calculate_rebate(id, month_previous, amount_per_day):
def generate_bill():
- # month_previous = datetime.now().month - 1
- month_previous = last_day_prev_month.month
- print(previous_month)
- # print(datetime.month())
- first_day_prev_month = last_day_prev_month.replace(day=1)
- # previous_month = month_t.strftime("%B")
- # student_all = Student.objects.prefetch_related('rebate_set')
- student_all = Reg_main.objects.filter(current_mess_status="Registered")
- print(student_all)
- amount_per_day = MessBillBase.objects.latest('timestamp')
- print(amount_per_day.bill_amount)
+ per_day_cost_obj = MessBillBase.objects.latest('timestamp')
+ per_day_cost = per_day_cost_obj.bill_amount
+ print(per_day_cost)
+ amount = int(last_day_prev_month.day) * int(per_day_cost)
+ print(amount)
+ student_all = Reg_main.objects.filter(current_mess_status = "Registered")
+ print(student_all)
for student in student_all:
- rebate_amount = Calculate_rebate(student.student_id, month_previous, amount_per_day.bill_amount)
- print(rebate_amount)
- # rebate_count = rebate_amount/amount_per_day
- # print(rebate_count)
- total = 0
- # nonveg_data = student.nonveg_data_set.all()
- rebates = student.rebate_set.all()
- # for order in nonveg_data:
- # if order.order_date.strftime("%B") == previous_month:
- # nonveg_total_bill = nonveg_total_bill + order.dish.price
-
- for r in rebates:
- if r.status == '2':
- if r.start_date.month == month_g:
- if r.end_date.month == today_g:
- rebate_count = rebate_count + abs((last_day_prev_month - r.start_date).days) + 1
- else:
- rebate_count = rebate_count + abs((r.end_date - r.start_date).days) + 1
- elif r.end_date.month == month_g:
- rebate_count = rebate_count + abs((r.end_date - first_day_prev_month).days) + 1
- else:
- rebate_count = 0
- rebate_amount = rebate_count*amount_c.bill_amount/30
- total = amount_c.bill_amount - rebate_amount
- bill_object = Monthly_bill(student_id=student,
- month=previous_month,
- year = previous_month_year,
- amount=amount_c.bill_amount,
- rebate_count=rebate_count,
- rebate_amount=rebate_amount,
- total_bill=total)
- if Monthly_bill.objects.filter(student_id=student,
- month=previous_month,
- year = previous_month_year,
- total_bill=total).exists():
- 1
- elif Monthly_bill.objects.filter(student_id=student,
- month=previous_month,
- year = previous_month_year):
- Monthly_bill.objects.filter(student_id=student,
- month=previous_month,
- year=previous_month_year).update(student_id=student,
- month=previous_month,
- amount=amount_c.bill_amount,
- rebate_count=rebate_count,
- rebate_amount=rebate_amount,
- total_bill=total)
- # bill_object.update()
- else:
- bill_object.save()
-
+ student_id = student.student_id
+ rem_balance = student.balance
+ try:
+ monthly_bill_obj = Monthly_bill.objects.get(student_id=student_id, month=previous_month, year=previous_month_year)
+ rebate_count_count = monthly_bill_obj.rebate_count
+ rebate_amount = int(rebate_count_count)*int(per_day_cost)
+ monthly_bill_obj.rebate_amount = rebate_amount
+ total_bill = amount - rebate_amount
+ monthly_bill_obj.total_bill = total_bill
+ rem_balance = rem_balance - total_bill
+ student.balance = rem_balance
+ monthly_bill_obj.amount = amount
+ monthly_bill_obj.save()
+ except:
+ new_monthly_bill_obj = Monthly_bill(student_id=student_id, month=previous_month, year=previous_month_year, amount=amount, total_bill=amount)
+ rem_balance = rem_balance - amount
+ student.balance = rem_balance
+ new_monthly_bill_obj.save()
+ if(student.balance <= 0):
+ student.current_mess_status = 'Deregistered'
+ student.save()
+
diff --git a/FusionIIIT/applications/central_mess/views.py b/FusionIIIT/applications/central_mess/views.py
index e647b27fc..0624ef136 100644
--- a/FusionIIIT/applications/central_mess/views.py
+++ b/FusionIIIT/applications/central_mess/views.py
@@ -117,41 +117,41 @@ def mess(request):
y = Menu.objects.filter(mess_option=mess_optn.mess_option)
- bill = Monthly_bill.objects.select_related('student_id','student_id__id','student_id__id__user','student_id__id__department').filter(Q(student_id=student) & Q(month=month_g_l) & Q(year=year_g))
- amount_c = MessBillBase.objects.latest('timestamp')
- rebate_count = 0
+ # bill = Monthly_bill.objects.select_related('student_id','student_id__id','student_id__id__user','student_id__id__department').filter(Q(student_id=student) & Q(month=month_g_l) & Q(year=year_g))
+ # amount_c = MessBillBase.objects.latest('timestamp')
+ # rebate_count = 0
- for r in rebates:
- if r.status == '2':
- if r.start_date.month == month_g:
- if r.end_date.month == next_month:
- rebate_count = rebate_count + abs((last_day_of_this_month - r.start_date).days) + 1
- else:
- rebate_count = rebate_count + abs((r.end_date - r.start_date).days) + 1
- elif r.end_date.month == month_g:
- rebate_count = rebate_count + abs((r.end_date - first_day_of_this_month).days) + 1
- else:
- rebate_count = 0
- rebate_amount = rebate_count * amount_c.bill_amount / 30
- total_bill = amount_c.bill_amount - rebate_amount
- if bill:
- bill.update(student_id = student,
- month = month_g_l,
- year = year_g,
- amount = amount_c.bill_amount,
- rebate_count = rebate_count,
- rebate_amount = rebate_amount,
- total_bill = total_bill)
-
- else:
- bill_object = Monthly_bill(student_id=student,
- amount=amount_c.bill_amount,
- rebate_count=rebate_count,
- rebate_amount=rebate_amount,
- total_bill=total_bill,
- month=month_g_l,
- year=year_g)
- bill_object.save()
+ # for r in rebates:
+ # if r.status == '2':
+ # if r.start_date.month == month_g:
+ # if r.end_date.month == next_month:
+ # rebate_count = rebate_count + abs((last_day_of_this_month - r.start_date).days) + 1
+ # else:
+ # rebate_count = rebate_count + abs((r.end_date - r.start_date).days) + 1
+ # elif r.end_date.month == month_g:
+ # rebate_count = rebate_count + abs((r.end_date - first_day_of_this_month).days) + 1
+ # else:
+ # rebate_count = 0
+ # rebate_amount = rebate_count * amount_c.bill_amount / 30
+ # total_bill = amount_c.bill_amount - rebate_amount
+ # if bill:
+ # bill.update(student_id = student,
+ # month = month_g_l,
+ # year = year_g,
+ # amount = amount_c.bill_amount,
+ # rebate_count = rebate_count,
+ # rebate_amount = rebate_amount,
+ # total_bill = total_bill)
+
+ # else:
+ # bill_object = Monthly_bill(student_id=student,
+ # amount=amount_c.bill_amount,
+ # rebate_count=rebate_count,
+ # rebate_amount=rebate_amount,
+ # total_bill=total_bill,
+ # month=month_g_l,
+ # year=year_g)
+ # bill_object.save()
except:
mess_optn={'mess_option':'no-mess'}
y = Menu.objects.filter(mess_option="mess1")
From f03ad1f0af8ee8096167e49e9c429632ca06a4c7 Mon Sep 17 00:00:00 2001
From: Harshul-25
Date: Sat, 9 Mar 2024 05:07:28 +0530
Subject: [PATCH 39/78] added registration list
---
FusionIIIT/applications/central_mess/views.py | 10 ++---
FusionIIIT/templates/messModule/reg_list.html | 38 +++++++++++++++++++
.../messModule/registered_student.html | 6 +++
3 files changed, 49 insertions(+), 5 deletions(-)
create mode 100644 FusionIIIT/templates/messModule/reg_list.html
diff --git a/FusionIIIT/applications/central_mess/views.py b/FusionIIIT/applications/central_mess/views.py
index 939404c87..c307484f3 100644
--- a/FusionIIIT/applications/central_mess/views.py
+++ b/FusionIIIT/applications/central_mess/views.py
@@ -75,7 +75,7 @@ def mess(request):
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()
reg_request = Registration_Request.objects.filter(student_id=student)
- # reg_main = Reg_main.objects.get(student_id=student)
+ reg_main = Reg_main.objects.get(student_id=student)
reg_record = Reg_records.objects.filter(student_id=student)
monthly_bill=monthly_bill[::-1]
@@ -221,7 +221,7 @@ def mess(request):
'desig': desig,
'reg_form':reg_form,
'reg_request':reg_request,
- # 'reg_main':reg_main,
+ 'reg_main':reg_main,
'reg_record':reg_record
}
return render(request, "messModule/mess.html", context)
@@ -290,7 +290,7 @@ def mess(request):
'desig': desig,
'reg_form':reg_form,
'reg_request':reg_request,
- # 'reg_main':reg_main,
+ 'reg_main':reg_main,
'reg_record':reg_record
}
return render(request, "messModule/mess.html", context)
@@ -368,7 +368,7 @@ def mess(request):
sprequest_past = Special_request.objects.select_related('student_id','student_id__id','student_id__id__user','student_id__id__department').filter(status='2').order_by('-app_date')
reg_request = Registration_Request.objects.all().filter(status='pending')
- # reg_main = Reg_main.objects.all()
+ reg_main = Reg_main.objects.filter(current_mess_status="Registered").all()
reg_record = Reg_records.objects.all()
context = {
'bill_base': current_bill,
@@ -392,7 +392,7 @@ def mess(request):
'count2': count2, 'count3': count3, 'feed1': feed1,'feed2':feed2,
'count4': count4, 'form': form, 'count5': count5,
'count6': count6, 'count7': count7, 'count8': count8, 'desig': desig,
- 'reg_request':reg_request,'reg_record':reg_record
+ 'reg_request':reg_request,'reg_record':reg_record,'reg_main':reg_main
}
return render(request, "messModule/mess.html", context)
diff --git a/FusionIIIT/templates/messModule/reg_list.html b/FusionIIIT/templates/messModule/reg_list.html
new file mode 100644
index 000000000..9e494ca33
--- /dev/null
+++ b/FusionIIIT/templates/messModule/reg_list.html
@@ -0,0 +1,38 @@
+{% load static %}
+{% block body %}
+{% block reg_list %}
+
+
+
+
+
+
+
+
+{% endblock %}
+{% endblock %}
+
+{% block javascript %}
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/messModule/registered_student.html b/FusionIIIT/templates/messModule/registered_student.html
index 86a44ac6d..5b6960fca 100644
--- a/FusionIIIT/templates/messModule/registered_student.html
+++ b/FusionIIIT/templates/messModule/registered_student.html
@@ -4,6 +4,7 @@
Search/Remove Student
Register for Mess1
Register for Mess2
+ View Registration List
| Name | +Roll No | +Program | +Balance | +Mess | +
|---|---|---|---|---|
| {{entry.student_id.id.user.first_name}} | +{{entry.student_id.id.id}} | +{{entry.student_id.programme}} | +{{entry.balance}} | +{{entry.mess_option}} | +
@@ -196,6 +197,11 @@
+ {% block reg_list %}
+ {% include 'messModule/reg_list.html' %}
+ {% endblock %}
+
{% block javascript %} From 97d051982eb95ac07b915263877d6ba7dee34f6e Mon Sep 17 00:00:00 2001 From: Harshul-25
+
@@ -47,7 +47,7 @@
| - + |
@@ -91,42 +91,33 @@
-
+
Total Due Amount : {{total_due}}+ + + {% comment %}Total Due Amount : {{total_due}}{% endcomment %}+ +
+
+
+
+ Total Due Amount : {{total_due}}{% endblock %} \ No newline at end of file From da394417a776d99b36dac96ff0e7c502c10a1aa0 Mon Sep 17 00:00:00 2001 From: Harshit0009
+
@@ -33,6 +51,68 @@
{% block javascript %}
+
+
{% endblock %}
\ No newline at end of file
From ce8cd17556722f3058f929a5fc9479d609206ff8 Mon Sep 17 00:00:00 2001
From: Harshul-25
+
+
+
+
+
+
+
+
+
{% comment %}The ... start here!{% endcomment %}
{% block feedback %}
diff --git a/FusionIIIT/templates/messModule/reg_list.html b/FusionIIIT/templates/messModule/reg_list.html
index e31373d07..9dfddec0f 100644
--- a/FusionIIIT/templates/messModule/reg_list.html
+++ b/FusionIIIT/templates/messModule/reg_list.html
@@ -19,23 +19,29 @@
-
+
+
{% comment %}Form Tag starts here!{% endcomment %}
- {% if current_date < mess_reg.end_reg %}
+ {% comment %} {% if current_date < mess_reg.end_reg %}
Registration ongoing till {{ mess_reg.end_reg }}
- {% else %}
+ {% else %} {% endcomment %}
{# |