Merge branch 'staging' into ac-2

Author: abhi87374

.gitignore

@@ -73,6 +73,7 @@ node_modules/
 FusionIIIT/static/
 package-lock.json
 
+
 docker-entrypoint.sh
 
 
@@ -83,3 +84,6 @@ postgres_data
 # sample files from media/Adminstrator
 !media/Administrator/academic_procedures/sample_courses_allotment.xls
 !media/Administrator/academic_procedures/sample_student_profile.xlsx
+
+migrations/
+

FusionIIIT/Fusion/settings/common.py

@@ -104,7 +104,7 @@
     'django.contrib.staticfiles',
     'django.contrib.sites',
     'django.contrib.humanize',
-    
+    'django_crontab',
     'corsheaders',
 
     'applications.eis',
@@ -279,5 +279,6 @@
 YOUTUBE_DATA_API_KEY = 'api_key'
 
 
+
 CORS_ORIGIN_ALLOW_ALL = True
 ALLOW_PASS_RESET = True

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 = ['*']
@@ -19,6 +19,7 @@
 REST_FRAMEWORK = {
     'DEFAULT_AUTHENTICATION_CLASSES': (
         'rest_framework.authentication.TokenAuthentication',
+        'rest_framework.authentication.SessionAuthentication',
     ),
     'DEFAULT_PERMISSION_CLASSES': (
         'rest_framework.permissions.IsAuthenticated',
@@ -53,3 +54,16 @@
     DEBUG_TOOLBAR_CONFIG = {
         'INTERCEPT_REDIRECTS': False,
     }
+    
+CRONJOBS = [
+    # the below job will update the bill at every minute can be used for testing
+    # ('* * * * *', 'applications.central_mess.tasks.generate_bill'), 
+    
+    #the below job which we need to add in production server, to update the mess bill of student everyday at 10 pm in night
+    ('0 22 * * *', 'applications.central_mess.tasks.generate_bill'),
+]
+
+CRONTAB_DJANGO_MANAGE_PATH = '/home/owlman/Desktop/Fuse/Fusion/FusionIIIT/manage.py'
+
+MEDIA_URL = "/media/"
+MEDIA_ROOT=os.path.join(BASE_DIR,"media/")