Updated Ac2 merged with staging

.gitignore

@@ -73,13 +73,4 @@ node_modules/
 FusionIIIT/static/
 package-lock.json
 
-docker-entrypoint.sh
 
-
-FusionIIIT/applications/eis/migrations/
-
-postgres_data
-
-# sample files from media/Adminstrator
-!media/Administrator/academic_procedures/sample_courses_allotment.xls
-!media/Administrator/academic_procedures/sample_student_profile.xlsx

FusionIIIT/Fusion/settings/common.py

@@ -104,7 +104,7 @@
     'django.contrib.staticfiles',
     'django.contrib.sites',
     'django.contrib.humanize',
-
+    'django_crontab',
     'corsheaders',
 
     'applications.eis',
@@ -171,7 +171,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(BASE_DIR, '..', 'templates/'),],
+        'DIRS': [os.path.join(BASE_DIR, '..', 'templates'),],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -256,9 +256,9 @@
 
 # os.path.join(BASE_DIR, 'static/')
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, '..', 'static/')
+STATIC_ROOT = os.path.join(BASE_DIR, '..', 'static')
 STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
-MEDIA_ROOT = os.path.join(BASE_DIR, '..', 'media/')
+MEDIA_ROOT = os.path.join(BASE_DIR, '..', 'media')
 MEDIA_URL = '/media/'
 
 ACCOUNT_USERNAME_REQUIRED = False
@@ -279,5 +279,6 @@
 YOUTUBE_DATA_API_KEY = 'api_key'
 
 
+
 CORS_ORIGIN_ALLOW_ALL = True
-ALLOW_PASS_RESET = 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/academic_procedures/urls.py

@@ -72,5 +72,5 @@
     url(r'^acad_person/add_course_to_slot/' , views.add_course_to_slot , name = 'add_course_to_slot'),
     url(r'^acad_person/replaceSwayam/', views.replaceSwayam, name='replaceSwayam'),
     url(r'^acad_person/swayam_replace/', views.swayam_replace, name='swayam_replace'),
-
+    url(r'^register_backlog_course/' , views.register_backlog_course , name = 'register_backlog_course')
 ]

FusionIIIT/applications/academic_procedures/views.py

@@ -76,17 +76,17 @@ def main(request):
 def academic_procedures(request):
 
     current_user = get_object_or_404(User, username=request.user.username)
-  
+
     #extra info details , user id used as main id
     user_details = ExtraInfo.objects.select_related('user','department').get(user = request.user)
 
-    des = HoldsDesignation.objects.all().select_related().filter(user = request.user).first()
+    # des = HoldsDesignation.objects.all().select_related().filter(user = request.user).first()
 
-    if str(des.designation) == "student":
+    if request.session.get('currentDesignationSelected') == "student":
         obj = Student.objects.select_related('id','id__user','id__department').get(id = user_details.id)
         return HttpResponseRedirect('/academic-procedures/stu/')
         # return HttpResponseRedirect('/logout/')
-    elif str(des.designation) == "Associate Professor" or str(des.designation) == "Professor" or str(des.designation) == "Assistant Professor" :
+    elif request.session.get('currentDesignationSelected') == "faculty" or request.session.get('currentDesignationSelected') == "Associate Professor" or request.session.get('currentDesignationSelected') == "Professor" or request.session.get('currentDesignationSelected') == "Assistant Professor" :
         return HttpResponseRedirect('/academic-procedures/fac/')
         # return HttpResponseRedirect('/logout/')
 
@@ -107,7 +107,7 @@ def academic_procedures(request):
 
         })
     else:
-        return HttpResponse('person not found')
+        return HttpResponseRedirect('/dashboard/')
 #
 #
 #
@@ -118,19 +118,20 @@ def academic_procedures(request):
 def academic_procedures_faculty(request):
 
     current_user = get_object_or_404(User, username=request.user.username)
-
+    if request.session.get('currentDesignationSelected') != 'faculty':
+        return HttpResponseRedirect('/dashboard/')
     #extra info details , user id used as main id
     user_details = ExtraInfo.objects.select_related('user','department').get(user = request.user)
     des = HoldsDesignation.objects.all().select_related().filter(user = request.user).first()
     fac_id = user_details
     fac_name = user_details.user.first_name + " " + user_details.user.last_name
-    if str(des.designation) == "student":
-        return HttpResponseRedirect('/academic-procedures/main/')
+    # if str(des.designation) == "student":
+    #     return HttpResponseRedirect('/academic-procedures/main/')
 
-    elif str(request.user) == "acadadmin":
-        return HttpResponseRedirect('/academic-procedures/main/')
+    # elif str(request.user) == "acadadmin":
+    #     return HttpResponseRedirect('/academic-procedures/main/')
 
-    elif str(des.designation) == "Associate Professor" or str(des.designation) == "Professor" or str(des.designation) == "Assistant Professor":
+    if request.session.get('currentDesignationSelected') == "faculty" or str(des.designation) == "Associate Professor" or str(des.designation) == "Professor" or str(des.designation) == "Assistant Professor":
 
         object_faculty = Faculty.objects.select_related('id','id__user','id__department').get(id = user_details.pk)
 
@@ -216,7 +217,8 @@ def account(request):
 def academic_procedures_student(request):
 
     current_user = get_object_or_404(User, username=request.user.username)
-
+    # if global_var != "student":
+    #     return HttpResponse("Student has no record") 
     user_details = ExtraInfo.objects.select_related('user','department').get(id = request.user)
     des = HoldsDesignation.objects.all().select_related().filter(user = request.user).first()
 
@@ -474,16 +476,23 @@ def academic_procedures_student(request):
         cur_spi='Sem results not available' # To be fetched from db if result uploaded
 
         backlogCourseList = []
+        auto_backlog_courses = list(SemesterMarks.objects.filter(student_id = obj , grade = 'F'))
+        auto_backlog_courses_list = []
+        for i in auto_backlog_courses:
+            if not i.curr_id.courseslots.filter(type__contains="Optional").exists():
+                auto_backlog_courses_list.append([i.curr_id.name, i.curr_id.code, i.curr_id.version, i.curr_id.credit , i.grade])
+
         backlogCourses = backlog_course.objects.select_related('course_id' , 'student_id' , 'semester_id' ).filter(student_id=obj)
         for i in backlogCourses:
             summer_course = "Yes" if i.is_summer_course else "No"
             course_details = i.course_id.course_details if i.course_id.course_details else "N/A"
 
             backlogCourseList.append([i.course_id.course_name, course_details , i.semester_id.semester_no , summer_course])
 
-        Mess_bill = Monthly_bill.objects.filter(student_id = obj)
-        Mess_pay = Payments.objects.filter(student_id = obj)
-
+        # Mess_bill = Monthly_bill.objects.filter(student_id = obj)
+        # Mess_pay = Payments.objects.filter(student_id = obj)
+        Mess_bill = []
+        Mess_pay = []
         # Branch Change Form save
         if request.method=='POST':
             if True:
@@ -495,7 +504,7 @@ def academic_procedures_student(request):
         return render(
                           request, '../templates/academic_procedures/academic.html',
                           {'details': details,
-                           # 'calendar': calendar,
+                        #    'calendar': calendar,
                             'currently_registered': currently_registered_course,
                             'pre_registered_course' : pre_registered_courses,
                             'pre_registered_course_show' : pre_registered_course_show,
@@ -555,6 +564,7 @@ def academic_procedures_student(request):
                             'tot_d':tot_d,
                            'attendence':attendence,
                            'backlogCourseList' : backlogCourseList,
+                           'auto_backlog_courses_list' : auto_backlog_courses_list,
                            'BranchChangeForm': BranchChangeForm(),
                            'BranchFlag':branchchange_flag,
                            'assistantship_flag' : student_status,
@@ -1905,6 +1915,8 @@ def get_add_course_options(branch_courses, current_register, batch):
     for c in current_register:
         slots.append(c[0])
     for courseslot in branch_courses:
+        if courseslot.type == "Swayam":
+            continue
         max_limit = courseslot.max_registration_limit
         if courseslot not in slots:
             lis = []
@@ -2616,7 +2628,7 @@ def auto_verify_registration(request):
         sem_id = Semester.objects.get(curriculum = curr_id, semester_no = sem_no)
         with transaction.atomic():
             academicadmin = get_object_or_404(User, username = "acadadmin")
-            FinalRegistration.objects.filter(student_id = student_id, verified = False, semester_id = sem_id).delete()
+            # FinalRegistration.objects.filter(student_id = student_id, verified = False, semester_id = sem_id).delete()
             StudentRegistrationChecks.objects.filter(student_id = student_id, semester_id = sem_id).update(final_registration_flag = False)
             FeePayments.objects.filter(student_id = student_id, semester_id = sem_id).delete()
             academics_module_notif(academicadmin, student_id.id.user, 'Registration Declined - '+reject_reason)
@@ -4008,17 +4020,6 @@ def swayam_replace(request):
 
             swayam_semester_id_value = request.POST['swayam_semester_id']
             swayam_semester_id_value_array = [int(semester_str) for semester_str in swayam_semester_id_value.split(',')[:-1]]
-            # print(swayam_semester_id_value_array)
-            # print(swayam_semester_id_value)
-
-            # from your_app.models import Student
-            # Retrieve the Student object based on the student ID
-            # student_id = '20BCS074'
-            # student_model = Student.objects.get(id=user_value)
-            #print(student)
-            # course_id_model = Course.objects.get()
-            # Create the course_registration object with the Student object
-            # course_registration.objects.create(student_id=student, ...)
 
 
 
@@ -4059,4 +4060,38 @@ def swayam_replace(request):
             messages.error(request, f"Error in Registration: {error_message}")
             return HttpResponseRedirect('/academic-procedures/main')
     else:
-        return HttpResponseRedirect('/academic-procedures/main')
+        return HttpResponseRedirect('/academic-procedures/main')
+
+def register_backlog_course(request):
+    if request.method == 'POST':
+        try:
+            current_user = request.user
+            current_user = ExtraInfo.objects.all().filter(user=request.user).first()
+            current_user = Student.objects.all().filter(id=current_user.id).first()
+            sem_id = Semester.objects.filter(id = request.POST.get('semester')).first()
+            course_id = Courses.objects.get(code = request.POST.get('courseCode') , version = request.POST.get('Version'))  
+            course_slots = course_id.courseslots.all()
+            course_slot_id = ''
+            if course_slots:
+                course_slot_id = CourseSlot.objects.filter(id = course_slots[0].id).first()
+            if (sem_id.semester_no - course_slot_id.semester.semester_no)%2 != 0 :
+                return JsonResponse({'message':'Wait for Next Semester !'}, status=200)
+                # print('_____________________________________________________________________________________________' , course_id ,current_user , course_slot_id ,  sem_id)
+            try:
+                if course_registration.objects.filter(course_id=course_id, student_id=current_user , semester_id  = sem_id).count() == 0:
+                    p = course_registration(
+                            course_id=course_id,
+                            student_id=current_user,
+                            course_slot_id=course_slot_id,
+                            semester_id=sem_id
+                        )
+                    p.save()
+                    return JsonResponse({'message': 'Successfully Registered Backlog course' }, status=200)
+                else:
+                    return JsonResponse({'message': 'Already Registered Backlog course' }, status=200)
+            except Exception as e:
+                print(str(e))
+                return JsonResponse({'message': 'Error Registering course ' + str(e)}, status=500)
+        except Exception as e:
+            print(str(e))
+            return JsonResponse({'message': 'Adding Backlog Failed '  +str(e)}, status=500)