Revert "Ac 1 Request to merge in staging again. (#1373)"

This reverts commit 16523a7.

Author: abhi87374

FusionIIIT/Fusion/context_processors.py

@@ -163,7 +163,6 @@
     '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'
@@ -179,7 +178,6 @@
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
-                'Fusion.context_processors.global_vars',
             ],
         },
     },

FusionIIIT/Fusion/middleware/custom_middleware.py

@@ -23,6 +23,5 @@
     # Endpoint to reset all passwords in DEV environment
     url(r'^resetallpass/$', views.reset_all_pass, name='resetallpass'),
     # API urls
-    url(r'^api/', include('applications.globals.api.urls')),
-    url(r'^update_global_variable/$', views.update_global_variable, name='update_global_var'),
+    url(r'^api/', include('applications.globals.api.urls'))
 ]

FusionIIIT/Fusion/settings/common.py

@@ -740,26 +740,21 @@ def dashboard(request):
 
     }
     # a=HoldsDesignation.objects.select_related('user','working','designation').filter(designation = user)
-    print(context)
-    print(type(user.extrainfo.user_type))
     if(request.user.get_username() == 'director'):
         return render(request, "dashboard/director_dashboard2.html", {})
     elif( "dean_rspc" in designation):
         return render(request, "dashboard/dashboard.html", context)
-    elif user.extrainfo.user_type != "student":
-        print ("inside")
+    elif user.extrainfo.user_type != 'student':
         designat = HoldsDesignation.objects.select_related().filter(user=user)
         response = {'designat':designat}
         context.update(response)
         return render(request, "dashboard/dashboard.html", context)
     else:
-        print ("inside2")
-        
         return render(request, "dashboard/dashboard.html", context)
 
 
 @login_required(login_url=LOGIN_URL)
-def   profile(request, username=None):
+def profile(request, username=None):
     """
     Generic endpoint for views.
     If it's a faculty, redirects to /eis/profile/*
@@ -773,76 +768,16 @@ def   profile(request, username=None):
     """
     user = get_object_or_404(User, Q(username=username)) if username else request.user
 
+
     editable = request.user == user
-    print("editable",editable)
     profile = get_object_or_404(ExtraInfo, Q(user=user))
-    print("profile",profile)
     if(str(user.extrainfo.user_type)=='faculty'):
-        print("profile")
         return HttpResponseRedirect('/eis/profile/' + (username if username else ''))
     if(str(user.extrainfo.department)=='department: Academics'):
-        print("profile2")
         return HttpResponseRedirect('/aims')
-    
-    array = [
-     "student",
-    "CC convenor",
-    "Mechatronic convenor",
-    "mess_committee",
-    "mess_convener",
-    "alumini",
-    "Electrical_AE",
-    "Electrical_JE",
-    "Civil_AE",
-    "Civil_JE",
-    "co-ordinator",
-    "co co-ordinator",
-    "Convenor",
-    "Convener",
-    "cc1convener",
-    "CC2 convener",
-    "mess_convener_mess2",
-    "mess_committee_mess2"
-]
-
-    # queryset = HoldsDesignation.objects.select_related('user','working','designation').filter(Q(working=user))
-
-    # for obj in queryset:
-    #     designation_name = obj.designation.name
-    #     print("designation_name",designation_name)
-        
-    # design = False
-    # if designation_name in array:
-    #     design = True
-    #     print("design",design)
-    #     print("designation_name",designation_name)
-    # if design:
-    #     current = HoldsDesignation.objects.select_relapted('user','working','designation').filter(Q(working=user, designation__name=designation_name))
-    #     for obj in current:
-    #         obj.designation.name = obj.designation.name.replace(designation_name, 'student')
-    
-    designation_name = ""
-    design = False
-
-    current = HoldsDesignation.objects.select_related('user', 'working', 'designation').filter(Q(working=user))
-
-    for obj in current:
-        designation_name = obj.designation.name
-        if designation_name in array:
-            design = True
-            break
-
-    if design:
-        current = HoldsDesignation.objects.filter(working=user, designation__name=designation_name)
-        for obj in current:
-            obj.designation.name = obj.designation.name.replace(designation_name, 'student')
-    
-    print(user.extrainfo.user_type)
-    print("current",current)
+    current = HoldsDesignation.objects.select_related('user','working','designation').filter(Q(working=user, designation__name="student"))
     if current:
-        print("profile3")
         student = get_object_or_404(Student, Q(id=profile.id))
-        print("student",student)
         if editable and request.method == 'POST':
             if 'studentapprovesubmit' in request.POST:
                 status = PlacementStatus.objects.select_related('notify_id','unique_id__id__user','unique_id__id__department').filter(pk=request.POST['studentapprovesubmit']).update(invitation='ACCEPTED', timestamp=timezone.now())
@@ -1044,7 +979,6 @@ def   profile(request, username=None):
             return render(request, "globals/student_profile4.html", context)
         if 'achievementsubmit' in request.POST or 'deleteach' in request.POST:
             return render(request, "globals/student_profile5.html", context)
-        print("context",context)
         return render(request, "globals/student_profile.html", context)
     else:
         return redirect("/")
@@ -1242,15 +1176,4 @@ def search(request):
     if len(search_results) == 0:
         search_results = []
     context = {'sresults':search_results}
-    return render(request, "globals/search.html", context),
-
-@login_required(login_url=LOGIN_URL)
-def update_global_variable(request):
-    if request.method == 'POST':
-        selected_option = request.POST.get('dropdown')
-        request.session['currentDesignationSelected'] = selected_option
-        print(selected_option)
-        print(request.session['currentDesignationSelected'])
-        return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
-    # Redirect to home if not a POST request or some issue occurs
-    return HttpResponseRedirect(reverse('home'))
+    return render(request, "globals/search.html", context)

FusionIIIT/applications/globals/urls.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.contrib.admin.options import ModelAdmin
-from .models import Programme, Discipline, Curriculum, Semester, Course, Batch, CourseSlot,CourseInstructor, CourseProposal,UpdateCourseProposal
+from .models import Programme, Discipline, Curriculum, Semester, Course, Batch, CourseSlot,CourseInstructor
 
 
 class ProgrammeAdmin(admin.ModelAdmin):
@@ -29,10 +29,7 @@ class BatchAdmin(admin.ModelAdmin):
 class CourseSlotAdmin(admin.ModelAdmin):
     list_display = ('name', 'type', 'course_slot_info','semester')
     list_filter = ('type', 'courses',)
-class CourseProposalAdmin(admin.ModelAdmin):
-    list_display = ('faculty_name','faculty_code', 'name', 'code',)
-class UpdateCourseProposalAdmin(admin.ModelAdmin):
-    list_display = ('faculty_name','faculty_code', 'name', 'code',)
+
 
 # Register your models here.
 admin.site.register(Discipline, DisciplineAdmin)
@@ -42,6 +39,4 @@ class UpdateCourseProposalAdmin(admin.ModelAdmin):
 admin.site.register(Course, CourseAdmin)
 admin.site.register(Batch, BatchAdmin)
 admin.site.register(CourseSlot, CourseSlotAdmin)
-admin.site.register(CourseInstructor)
-admin.site.register(CourseProposal,CourseProposalAdmin)
-admin.site.register(UpdateCourseProposal,UpdateCourseProposalAdmin)
+admin.site.register(CourseInstructor)

FusionIIIT/applications/globals/views.py

@@ -7,15 +7,13 @@ class Meta:
         model = Course
         fields = {'code': ['icontains'],
                   'name': ['icontains'],
-                  'version': ['exact'],
 		          'working_course': ['exact'],
                   'disciplines': ['exact'],
                  }
         widgets = {
             'code' : django_filters.CharFilter(forms.TextInput(attrs={'placeholder': 'Course Code','max_length': 10,})),
             'name' : forms.TextInput(attrs={'placeholder': 'Course/Project Name','max_length': 100,}),
             'name' : django_filters.CharFilter(forms.TextInput(attrs={'placeholder': 'Course/Project Name','max_length': 100,})),
-            'code' : django_filters.CharFilter(forms.TextInput(attrs={'placeholder': 'Version','max_length': 10,})),
             'working_course' : django_filters.CharFilter(forms.CheckboxInput(attrs={'class': 'ui checkbox'})),
             'disciplines' : django_filters.CharFilter(forms.SelectMultiple(attrs={'class':'ui fluid search selection dropdown',})),
         }
@@ -34,10 +32,4 @@ class CurriculumFilter(django_filters.FilterSet):
     class Meta:
         model = Curriculum
         fields = {'name': ['icontains'],
-                  'version': ['exact'],
-                 }
-        widgets = {
-                'name' : forms.TextInput(attrs={'placeholder': 'Course/Project Name','max_length': 100,}),
-                'name' : django_filters.CharFilter(forms.TextInput(attrs={'placeholder': 'Course/Project Name','max_length': 100,})),
-                'code' : django_filters.CharFilter(forms.TextInput(attrs={'placeholder': 'Version','max_length': 10,})),
-            }
+                 }