Faculty Profile errors resolved

.gitignore

@@ -72,3 +72,5 @@ node_modules/
 
 FusionIIIT/static/
 package-lock.json
+
+

FusionIIIT/Fusion/context_processors.py

@@ -0,0 +1,5 @@
+def global_vars(request):
+    return {
+        'global_var': request.session.get('currentDesignationSelected', 'default_value'),
+        'global_var2': request.session.get('allDesignations', 'default_value2'),
+    }

FusionIIIT/Fusion/middleware/custom_middleware.py

@@ -0,0 +1,48 @@
+# custom_middleware.py
+from django.contrib.auth.signals import user_logged_in
+from django.dispatch import receiver
+from applications.globals.models import (ExtraInfo, Feedback, HoldsDesignation,
+                                         Issue, IssueImage, DepartmentInfo)
+from django.shortcuts import get_object_or_404, redirect, render
+
+def user_logged_in_middleware(get_response):
+    @receiver(user_logged_in)
+    def user_logged_in_handler(sender, user, request, **kwargs):
+        if 'function_executed' not in request.session:
+            # Run the function only if the flag is not set
+            # Assuming user is a model with the desired data field, retrieve the data
+            # For example, if your User model has a field named 'custom_field', you can access it like:
+            if user.is_authenticated:
+                desig = list(HoldsDesignation.objects.select_related('user','working','designation').all().filter(working = request.user).values_list('designation'))
+                print(desig)
+                b = [i for sub in desig for i in sub]
+                design = HoldsDesignation.objects.select_related('user','designation').filter(working=request.user)
+
+                designation=[]
+
+                designation.append(str(user.extrainfo.user_type))
+                for i in design:
+                    if str(i.designation) != str(user.extrainfo.user_type):
+                        print('-------')
+                        print(i.designation)
+                        print(user.extrainfo.user_type)
+                        print('')
+                        designation.append(str(i.designation))
+
+                for i in designation:
+                    print(i)
+
+                request.session['currentDesignationSelected'] = designation[0]
+                request.session['allDesignations'] = designation               
+                print("logged iN")
+
+            # Set the flag in the session to indicate that the function has bee+n executed
+            request.session['function_executed'] = True
+
+    def middleware(request):
+        if request.user.is_authenticated:
+            user_logged_in_handler(request.user, request.user, request)
+        response = get_response(request)
+        return response
+
+    return middleware

FusionIIIT/Fusion/settings/common.py

@@ -104,7 +104,7 @@
     'django.contrib.staticfiles',
     'django.contrib.sites',
     'django.contrib.humanize',
-
+    'django_crontab',
     'corsheaders',
 
     'applications.eis',
@@ -163,6 +163,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'Fusion.middleware.custom_middleware.user_logged_in_middleware',
 ]
 
 ROOT_URLCONF = 'Fusion.urls'
@@ -178,6 +179,7 @@
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+                'Fusion.context_processors.global_vars',
             ],
         },
     },
@@ -277,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 = ['*']
@@ -16,9 +16,11 @@
     }
 }
 
+
 REST_FRAMEWORK = {
     'DEFAULT_AUTHENTICATION_CLASSES': (
         'rest_framework.authentication.TokenAuthentication',
+        'rest_framework.authentication.SessionAuthentication',
     ),
     'DEFAULT_PERMISSION_CLASSES': (
         'rest_framework.permissions.IsAuthenticated',
@@ -53,3 +55,11 @@
     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'),
+]

FusionIIIT/applications/academic_information/models.py

@@ -93,8 +93,8 @@ class Student(models.Model):
     batch_id = models.ForeignKey(Batch, null=True, blank=True, on_delete=models.CASCADE)
     cpi = models.FloatField(default=0)
     category = models.CharField(max_length=10, choices=Constants.CATEGORY, null=False)
-    father_name = models.CharField(max_length=40, default='')
-    mother_name = models.CharField(max_length=40, default='')
+    father_name = models.CharField(max_length=40, default='',null=True)
+    mother_name = models.CharField(max_length=40, default='',null=True)
     hall_no = models.IntegerField(default=0)
     room_no = models.CharField(max_length=10, blank=True, null=True)
     specialization = models.CharField(max_length=40,choices=Constants.MTechSpecialization, null=True, default='')

FusionIIIT/applications/central_mess/admin.py

@@ -2,8 +2,8 @@
 
 from .models import (Feedback, Menu, Menu_change_request, Mess_meeting,
                      Mess_minutes, Mess_reg, Messinfo, Monthly_bill,
-                     Nonveg_data, Nonveg_menu, Payments, Rebate,
-                     Special_request, Vacation_food,MessBillBase)
+                     Payments, Rebate,
+                     Special_request, Vacation_food,MessBillBase, Registration_Request, Reg_records, Reg_main)
 
 # Register your models here.
 
@@ -45,7 +45,7 @@ class Mess_regAdmin(admin.ModelAdmin):
         ('start_reg', {'fields': ['start_reg']}),
         ('end_reg', {'fields': ['end_reg']}),
         ]
-    list_display = ('start_reg', 'end_reg')
+    list_display = ('sem','start_reg', 'end_reg')
 
 
 
@@ -56,26 +56,24 @@ class Monthly_billAdmin(admin.ModelAdmin):
         ('month', {'fields': ['month']}),
         ('year', {'fields': ['year']}),
         ('amount', {'fields': ['amount']}),
-        ('nonveg_total_bill', {'fields': ['nonveg_total_bill']}),
+        # ('nonveg_total_bill', {'fields': ['nonveg_total_bill']}),
         ('rebate_count', {'fields': ['rebate_count']}),
         ('rebate_amount', {'fields': ['rebate_amount']}),
         ('total_bill', {'fields': ['total_bill']}),
 
         ]
     list_display = ('student_id', 'month', 'year', 'amount',
-                    'nonveg_total_bill', 'rebate_count', 'rebate_amount', 'total_bill')
+                     'rebate_count', 'rebate_amount', 'total_bill')
 
 
 
 class PaymentsAdmin(admin.ModelAdmin):
     model = Payments
     fieldsets = [
         ('student_id', {'fields': ['student_id']}),
-        ('sem', {'fields': ['sem']}),
-        ('year', {'fields': ['year']}),
         ('amount_paid', {'fields': ['amount_paid']}),
         ]
-    list_display = ('student_id', 'sem', 'year', 'amount_paid')
+    list_display = ('student_id', 'amount_paid')
 
 
 class RebateAdmin(admin.ModelAdmin):
@@ -106,26 +104,26 @@ class Vacation_foodAdmin(admin.ModelAdmin):
 
 
 
-class Nonveg_menuAdmin(admin.ModelAdmin):
-    model = Nonveg_menu
-    fieldsets = [
-        ('dish', {'fields': ['dish']}),
-        ('price', {'fields': ['price']}),
-        ('order_interval', {'fields': ['order_interval']}),
-        ]
-    list_display = ('dish', 'price', 'order_interval')
+# class Nonveg_menuAdmin(admin.ModelAdmin):
+#     model = Nonveg_menu
+#     fieldsets = [
+#         ('dish', {'fields': ['dish']}),
+#         ('price', {'fields': ['price']}),
+#         ('order_interval', {'fields': ['order_interval']}),
+#         ]
+#     list_display = ('dish', 'price', 'order_interval')
 
 
 
-class Nonveg_dataAdmin(admin.ModelAdmin):
-    model = Nonveg_data
-    fieldsets = [
-        ('student_id', {'fields': ['student_id']}),
-        ('order_date', {'fields': ['order_date']}),
-        ('dish', {'fields': ['dish']}),
-        ('order_interval', {'fields': ['order_interval']}),
-        ]
-    list_display = ('student_id', 'order_date', 'dish', 'order_interval')
+# class Nonveg_dataAdmin(admin.ModelAdmin):
+#     model = Nonveg_data
+#     fieldsets = [
+#         ('student_id', {'fields': ['student_id']}),
+#         ('order_date', {'fields': ['order_date']}),
+#         ('dish', {'fields': ['dish']}),
+#         ('order_interval', {'fields': ['order_interval']}),
+#         ]
+#     list_display = ('student_id', 'order_date', 'dish', 'order_interval')
 
 
 
@@ -172,9 +170,10 @@ class FeedbackAdmin(admin.ModelAdmin):
         ('student_id', {'fields': ['student_id']}),
         ('fdate', {'fields': ['fdate']}),
         ('description', {'fields': ['description']}),
-        ('feedback_type', {'fields': ['feedback_type']})
+        ('feedback_type', {'fields': ['feedback_type']}),
+        ('feedback_remark', {'fields':['feedback_remark']})
         ]
-    list_display = ('student_id', 'fdate', 'description', 'feedback_type')
+    list_display = ('student_id', 'fdate', 'description', 'feedback_type', 'feedback_remark')
 
 
 class MessBillBaseAdmin(admin.ModelAdmin):
@@ -184,6 +183,19 @@ class MessBillBaseAdmin(admin.ModelAdmin):
         ]
     list_display = ('bill_amount', 'timestamp')
 
+class Reg_mainAdmin(admin.ModelAdmin):
+    model = Reg_main
+    list_display = ('student_id','program','current_mess_status','balance','mess_option')
+
+class Reg_recordsAdmin(admin.ModelAdmin):
+    model=Reg_records
+    list_display = ('student_id','start_date','end_date')
+
+
+class Registration_RequestAdmin(admin.ModelAdmin):
+    model=Registration_Request
+    list_display = ('student_id','Txn_no','img','amount','status','registration_remark')
+
 
 admin.site.register(Mess_minutes, Mess_minutesAdmin),
 admin.site.register(Messinfo, MessinfoAdmin),
@@ -194,9 +206,12 @@ class MessBillBaseAdmin(admin.ModelAdmin):
 admin.site.register(Rebate, RebateAdmin),
 admin.site.register(Vacation_food, Vacation_foodAdmin),
 admin.site.register(Special_request, Special_requestAdmin),
-admin.site.register(Nonveg_menu, Nonveg_menuAdmin),
-admin.site.register(Nonveg_data, Nonveg_dataAdmin),
+# admin.site.register(Nonveg_menu, Nonveg_menuAdmin),
+# admin.site.register(Nonveg_data, Nonveg_dataAdmin),
 admin.site.register(Mess_meeting, Mess_meetingAdmin),
 admin.site.register(Feedback, FeedbackAdmin),
 admin.site.register(MessBillBase,MessBillBaseAdmin),
 admin.site.register(Menu_change_request, Menu_change_requestAdmin)
+admin.site.register(Reg_main,Reg_mainAdmin)
+admin.site.register(Reg_records,Reg_recordsAdmin)
+admin.site.register(Registration_Request,Registration_RequestAdmin)

FusionIIIT/applications/central_mess/api/serializers.py

@@ -0,0 +1,91 @@
+from rest_framework import serializers
+from applications.central_mess.models import *
+
+class MessinfoSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model=Messinfo
+        fields=('__all__')
+
+class Mess_regSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Mess_reg
+        fields=('__all__')
+
+class MessBillBaseSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = MessBillBase
+        fields=('__all__')
+
+class Monthly_billSerializer(serializers.ModelSerializer):
+    class Meta:
+        model=Monthly_bill
+        fields=('__all__')
+
+class PaymentsSerializer(serializers.ModelSerializer):
+    class Meta:
+        model=Payments
+        fields=('__all__')
+
+class MenuSerializer(serializers.ModelSerializer):
+    class Meta:
+        model=Menu
+        fields=('__all__')
+
+class RebateSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model=Rebate
+        fields=('__all__')
+
+class Vacation_foodSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Vacation_food
+        fields=('__all__')
+
+# class Nonveg_menuSerializer(serializers.ModelSerializer):
+#     class Meta:
+#         model = Nonveg_menu
+#         fields=('__all__')
+
+# class Nonveg_dataSerializer(serializers.ModelSerializer):
+#     class Meta:
+#         model=Nonveg_data
+#         fields=('__all__')
+
+class Special_requestSerializer(serializers.ModelSerializer):
+    class Meta:
+        model=Special_request
+        fields=('__all__')
+
+class Mess_meetingSerializer(serializers.ModelSerializer):
+    class Meta:
+        model=Mess_meeting
+        fields=('__all__')        
+
+class Mess_minutesSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Mess_minutes
+        fields=('__all__')
+
+class Menu_change_requestSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Menu_change_request
+        fields=('__all__')
+
+class FeedbackSerializer(serializers.ModelSerializer):
+    class Meta:
+        model=Feedback
+        fields=('__all__')
+
+class GetFilteredSerialzer(serializers.ModelSerializer):
+    first_name = serializers.CharField(source='student_id.id.user.first_name')
+    last_name = serializers.CharField(source='student_id.id.user.last_name')
+    class Meta:
+        model=Reg_main
+        fields=('__all__')
+
+class reg_recordSerialzer(serializers.ModelSerializer):
+    class Meta:
+        model = Reg_records
+        fields=('__all__')