Merge pull request #42 from DaemonLab/ckechav

Ckechav
DaemonLab · Dec 21, 2023 · b268d09 · b268d09
2 parents 3097918 + 8d4ce8c
commit b268d09
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -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
 

diff --git a/home/admin.py b/home/admin.py
@@ -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,
@@ -862,7 +862,7 @@ class about_Admin(ImportExportModelAdmin, admin.ModelAdmin):
                         "period",
                         "student_id",
                         "caterer",
-                        "high_tea",
+                        # "high_tea",
                         "jain",
                         "first_pref",
                         "second_pref",

diff --git a/home/resources.py b/home/resources.py
@@ -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(
@@ -99,7 +99,7 @@ class Meta:
             "period",
             "student_id",
             "caterer__name",
-            "high_tea",
+            # "high_tea",
             "jain",
             "first_pref",
             "second_pref",
@@ -116,7 +116,7 @@ class Meta:
             "email__room_no",
             "student_id",
             "caterer__name",
-            "high_tea",
+            # "high_tea",
             "jain",
             "first_pref",
             "second_pref",

diff --git a/messWebsite/settings.py b/messWebsite/settings.py
@@ -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']

diff --git a/templates/allocationForm.html b/templates/allocationForm.html
@@ -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>
@@ -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">
@@ -222,5 +223,9 @@ <h4 class="px-5 mx-5">
   //     }
   //   }
   //   }});
+
+
+
 </script>
-{% endblock %}
+{% endblock %}
+