Merge branch 'main' of https://github.com/DaemonLab/Mess-Website

home/schedulers.py

@@ -4,8 +4,9 @@
 
 def start():
     scheduler = BackgroundScheduler()
-    scheduler.add_jobstore(DjangoJobStore(), "default")
-    scheduler.add_job(__send__rebate__email__, 'cron', hour=23, minute=59, second=0)
-    register_events(scheduler) 
-    scheduler.start()
-    print, "scheduler started"
+    if scheduler is None:
+        scheduler.add_jobstore(DjangoJobStore(), "default")
+        scheduler.add_job(__send__rebate__email__, 'cron', hour=23, minute=59, second=0)
+        register_events(scheduler) 
+        scheduler.start()
+        print(scheduler)

templates/admin/allocation.html

@@ -17,15 +17,13 @@ <h1>Allocation CSV uploader</h1>
   {{ user.email}}</span><br>
   {% for caterer in list%}
   <span></span>
-  <span>{{caterer.0}} Caterer has been alloted {{caterer.2}} students out of which {{caterer.1}} have taken the high tea.
-    {{caterer.3}} more students can be attocated to {{caterer.0}} caterer</span><br>
+  <span>{{caterer.0}} Caterer has been alloted {{caterer.2}} students, {{caterer.3}} more students can be attocated to {{caterer.0}} caterer</span><br>
   {% endfor %}
   <form action="." method="post" class="px-5 pt-2 mx-md-5" enctype="multipart/form-data">
     {% csrf_token %}
         <input type="file" class="custom-file-input" id="customFile" name="csv" required accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" size="60">
       <button type="submit" class="btn btn-primary p-2 mb-3" style="background-color: rgb(30, 55, 146);">Submit</button> 
   </form>
-  <div> {{messages}}</div>
 {% else %}
     <h1 class="text-decoration-none">Access to this page is only for Administration. Please login to continue.</h1>
 {% endif %}