Merge pull request #4 from FusionIIIT/master

fetch

Author: shivansh1010

.idea/Fusion.iml

@@ -167,9 +167,6 @@
 
 WSGI_APPLICATION = 'Fusion.wsgi.application'
 
-
-PROJECT_DIR = os.path.abspath(os.path.dirname(__file__))
-
 # Database template for mysql
 
 # DATABASES = {

.idea/runConfigurations/Local_Server.xml

@@ -16,6 +16,13 @@
     }
 }
 
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.sqlite3',
+#         'NAME': os.path.join(BASE_DIR, 'fusion.db'),
+#     }
+# }
+
 if DEBUG:
     MIDDLEWARE += (
         'debug_toolbar.middleware.DebugToolbarMiddleware',

FusionIIIT/Fusion/fusion.db

@@ -692,6 +692,7 @@ def dashboard(request):
     else:
         return render(request, "dashboard/dashboard.html", context)
 
+
 @login_required(login_url=LOGIN_URL)
 def profile(request, username=None):
     """
@@ -911,6 +912,14 @@ def profile(request, username=None):
                    'form10':form10, 'form11':form11, 'form12':form12, 'current':current,
                    'editable': editable
                    }
+        if 'skillsubmit' in request.POST or 'deleteskill' in request.POST:
+            return render(request, "globals/student_profile2.html", context)
+        if 'coursesubmit' in request.POST or 'educationsubmit' in request.POST or 'deleteedu' in request.POST or 'deletecourse' in request.POST:
+            return render(request, "globals/student_profile3.html", context)
+        if 'experiencesubmit' in request.POST or 'projectsubmit' in request.POST or 'deleteexp' in request.POST or 'deletepro' in request.POST:
+            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)
         return render(request, "globals/student_profile.html", context)
     else:
         return redirect("/")

FusionIIIT/Fusion/settings/common.py

@@ -2,9 +2,12 @@
 
 from .models import (Assignment, CourseDocuments, CourseVideo, Forum,
                      ForumReply, Quiz, QuizQuestion, QuizResult, StudentAnswer,
-                     StudentAssignment, Topics,
-                    )
-#need to register all the tables here which are functions in models.py
+                     StudentAssignment, Topics)
+
+class QuizResultAdmin(admin.ModelAdmin):
+    model = QuizResult
+    raw_id_fields = ("student_id",)
+
 admin.site.register(CourseDocuments)
 
 admin.site.register(CourseVideo)
@@ -21,7 +24,7 @@
 
 admin.site.register(StudentAssignment)
 
-admin.site.register(QuizResult)
+admin.site.register(QuizResult, QuizResultAdmin)
 
 admin.site.register(Forum)
 

FusionIIIT/Fusion/settings/development.py

@@ -177,7 +177,7 @@ def __str__(self):
         return '{} - {} - {} - {} - {}'.format(
                 self.pk, self.student_id,
                 self.quiz_id, self.score,
-                self.feedback)
+                self.finished)
 
 #to store the comment of student and lecturer
 class Forum(models.Model):

FusionIIIT/applications/globals/views.py

@@ -6,7 +6,7 @@
 import os
 import random
 import subprocess
-from datetime import datetime, time, timedelta
+import datetime
 
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
@@ -86,7 +86,6 @@ def course(request, course_code):
         slides = CourseDocuments.objects.filter(course_id=course1)
         quiz = Quiz.objects.filter(course_id=course1)
         assignment = Assignment.objects.filter(course_id=course1)
-        student = Student.objects.filter(id=extrainfo)
         stu_ass = StudentAssignment.objects.filter
         student_assignment = []
         for assi in assignment:
@@ -290,7 +289,7 @@ def add_document(request, course_code):
         #save the info/details in the database
         CourseDocuments.objects.create(
             course_id=course,
-            upload_time=datetime.now(),
+            upload_time=datetime.datetime.now(),
             description=description,
             document_url=uploaded_file_url,
             document_name=name+file_extenstion
@@ -374,7 +373,7 @@ def add_videos(request, course_code):
         #saving in the 
         video = CourseVideo.objects.create(
             course_id=course,
-            upload_time=datetime.now(),
+            upload_time=datetime.datetime.now(),
             description=description,
             video_url=uploaded_file_url,
             video_name=name
@@ -731,7 +730,7 @@ def quiz(request, quiz_id):
         for x in random_ques_pk:
             shuffed_questions.append(QuizQuestion.objects.get(pk=x))
         end = quiz.end_time
-        now = timezone.now() + timedelta(hours=5.5)
+        now = timezone.now() + datetime.timedelta(hours=5.5)
         diff = end-now
         days, seconds = diff.days, diff.seconds
         hours = days * 24 + seconds // 3600
@@ -815,12 +814,12 @@ def create_quiz(request, course_code):
             k1 = st_time.hour
             k2 = st_time.minute
             k3 = st_time.second
-            start_date_time = datetime.combine(form.cleaned_data['startdate'], time(k1, k2, k3))
+            start_date_time = datetime.datetime.combine(form.cleaned_data['startdate'], datetime.time(k1, k2, k3))
             st_time = form.cleaned_data['endtime']
             k1 = st_time.hour
             k2 = st_time.minute
             k3 = st_time.second
-            end_date_time = datetime.combine(form.cleaned_data['enddate'], time(k1, k2, k3))
+            end_date_time = datetime.datetime.combine(form.cleaned_data['enddate'], datetime.time(k1, k2, k3))
             duration = end_date_time - start_date_time
             days, seconds = duration.days, duration.seconds
             hours, remainder = divmod(duration.seconds, 3600)
@@ -866,15 +865,15 @@ def edit_quiz_details(request, course_code, quiz_code):
             st_date = request.POST.get('startdate_month') + " " + request.POST.get('startdate_day')
             st_date = st_date + " " + request.POST.get('startdate_year')
             string = str(st_date) + " " + str(st_time)
-            datetime_object = datetime.strptime(string, '%m %d %Y %H:%M')
+            datetime_object = datetime.datetime.strptime(string, '%m %d %Y %H:%M')
             quiz.start_time = datetime_object
             quiz.save()
         elif x == 'edit2':
             st_time = request.POST.get('endtime')
             st_date = request.POST.get('enddate_month') + " " + request.POST.get('enddate_day')
             st_date = st_date + " " + request.POST.get('enddate_year')
             string = str(st_date) + " " + str(st_time)
-            datetime_object = datetime.strptime(string, '%m %d %Y %H:%M')
+            datetime_object = datetime.datetime.strptime(string, '%m %d %Y %H:%M')
             quiz.end_time = datetime_object
             quiz.save()
         elif x == 'edit3':