Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ckechav #42

Merged
merged 4 commits into from
Dec 21, 2023
+16 −11
Merged

Ckechav #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b53878
removed High Tea from export allocation
TRISHANT131104 Dec 21, 2023
5065fbc
c
Dec 21, 2023
18621c9
Merge branch 'server-trishant' of https://github.com/DaemonLab/Mess-W…
Dec 21, 2023
8d4ce8c
Hi-Tea removed
Dec 21, 2023
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Before you begin, ensure you have the following installed:
2. Navigate to the project directory:

```shell
cd team_22
cd Mess-Website
```
3. Install all dependencies

Expand Down
6 changes: 3 additions & 3 deletions home/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
from import_export.admin import ImportExportModelAdmin, ImportExportMixin
from .resources import (
StudentResource,
AllocationResource,
# AllocationResource,
RebateResource,
RebateBillsResource,
UnregisteredStudentResource,
LongRebateResource,
CatererBillsResource,
# CatererBillsResource,
StudentBillsResource,
CatererBillsNewResource,
AllocationNewResource,
Expand Down Expand Up @@ -862,7 +862,7 @@ class about_Admin(ImportExportModelAdmin, admin.ModelAdmin):
"period",
"student_id",
"caterer",
"high_tea",
# "high_tea",
"jain",
"first_pref",
"second_pref",
Expand Down
6 changes: 3 additions & 3 deletions home/resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class AllocationNewResource(resources.ModelResource):
period = fields.Field(attribute="period", column_name="Period")
student_id = fields.Field(attribute="student_id", column_name="Student ID")
caterer__name = fields.Field(attribute="caterer__name", column_name="Caterer Allocated")
high_tea = fields.Field(attribute="high_tea", column_name="High Tea")
# high_tea = fields.Field(attribute="high_tea", column_name="High Tea")
jain = fields.Field(attribute="jain", column_name="Jain")
first_pref = fields.Field(attribute="first_pref", column_name="First Preferences")
second_pref = fields.Field(
Expand All @@ -99,7 +99,7 @@ class Meta:
"period",
"student_id",
"caterer__name",
"high_tea",
# "high_tea",
"jain",
"first_pref",
"second_pref",
Expand All @@ -116,7 +116,7 @@ class Meta:
"email__room_no",
"student_id",
"caterer__name",
"high_tea",
# "high_tea",
"jain",
"first_pref",
"second_pref",
Expand Down
2 changes: 1 addition & 1 deletion messWebsite/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
SECRET_KEY = env('SECRET_KEY')

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
DEBUG = False

ALLOWED_HOSTS = ["diningfee.iiti.ac.in","127.0.0.1"]
CSRF_TRUSTED_ORIGINS = ['http://diningfee.iiti.ac.in']
Expand Down
11 changes: 8 additions & 3 deletions templates/allocationForm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ <h4 class="px-5 mx-5">
<div class="form-group p-2">
<b>Period of Allocation: {{ allocation_form_details.period.start_date }} to {{ allocation_form_details.period.end_date }}</b>
</div>
<br>
<!--<br>
<div id = "notice">
<strong>NOTE: </strong>High-Tea is <strong>NOT</strong> available for students registering for Jain food.
<strong>NOTE: </strong>High-Tea is <strong>NOT</strong> available for students registering for Jain food.
</div>
<div class="form-group p-2">
<label for="high_tea">High Tea: </label>
Expand All @@ -37,6 +37,7 @@ <h4 class="px-5 mx-5">
<option value="False">No</option>
</select>
</div>
-->
<div class="form-group p-2">
<label for="high_tea">Jain: </label>
<select class="form-control-sm" id="jain" name="jain">
Expand Down Expand Up @@ -222,5 +223,9 @@ <h4 class="px-5 mx-5">
// }
// }
// }});



</script>
{% endblock %}
{% endblock %}

Loading