Revert "ac-3: week-8: Prof can submit Marks to assignment and made site responsive"

FusionIIIT/Fusion/settings/common.py

@@ -261,8 +261,8 @@
     os.path.join(BASE_DIR, "static"),
 )
 
+MEDIA_ROOT = os.path.join(BASE_DIR, '..', 'media')
 MEDIA_URL = '/media/'
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 
 ACCOUNT_USERNAME_REQUIRED = False
 ACCOUNT_EMAIL_REQUIRED = True

FusionIIIT/applications/online_cms/admin.py

@@ -2,14 +2,13 @@
 
 from .models import (Assignment, CourseDocuments, CourseVideo, Forum,
                      ForumReply, Quiz, QuizQuestion, QuizResult, StudentAnswer,
-                     StudentAssignment1, Topics,CourseAssignment,CourseSlide)
+                     StudentAssignment, Topics,CourseSlide)
 
 class QuizResultAdmin(admin.ModelAdmin):
     model = QuizResult
     raw_id_fields = ("student_id",)
 
 admin.site.register(CourseDocuments)
-admin.site.register(CourseAssignment)
 admin.site.register(CourseSlide)
 admin.site.register(CourseVideo)
 
@@ -23,7 +22,7 @@ class QuizResultAdmin(admin.ModelAdmin):
 
 admin.site.register(Assignment)
 
-admin.site.register(StudentAssignment1)
+admin.site.register(StudentAssignment)
 
 admin.site.register(QuizResult, QuizResultAdmin)
 

FusionIIIT/applications/online_cms/forms.py

@@ -124,9 +124,4 @@ class Meta:
         fields=['couse_id','doc']
 
     # title = forms.CharField(max_length=50)
-    file = forms.FileField()
-
-
-class AssignmentMarks(forms.Form):
-    marks=forms.IntegerField()
-    feedback=forms.CharField(max_length=255)
+    file = forms.FileField()

FusionIIIT/applications/online_cms/models.py

@@ -14,7 +14,7 @@ def content_file_name(instance, filename):
     file_path = 'online_cms/{course_id}/doc/{fileName}.{ext}'.format(
          course_id=course_code, fileName=instance.document_name, ext=ext) 
     return file_path
-# the documents in the course (slides , ppt) added by the faculty  and can be downloaded by the students
+#the documents in the course (slides , ppt) added by the faculty  and can be downloaded by the students
 class CourseSlide(models.Model):
     course_id = models.ForeignKey(Course, on_delete=models.CASCADE)
     upload_time = models.DateTimeField(auto_now=True)
@@ -29,7 +29,7 @@ class CourseDocuments(models.Model):
     upload_time = models.DateTimeField(auto_now=True)
     description = models.CharField(max_length=100)
     document_name = models.CharField(max_length=40)
-    document_url = models.CharField(max_length=100, null=True,blank=True)
+    document_url = models.CharField(max_length=500, null=True,blank=True)
     # media = models.FileField(upload_to=content_file_name, null=True, blank=True)
 
     def __str__(self):
@@ -187,37 +187,11 @@ def __str__(self):
         return '{} - {} - {}'.format(self.pk, self.course_id, self.assignment_name)
 
 #details of the solution uploaded by the student
-def assignment_submit_name(instance, filename):
-    name, ext = filename.split('.')
-    # obj=Curriculum.objects.get(course_id=instance.course_id)
-    course_code=instance.course_code
-    assignmentName=instance.assignment_id.assignment_name
-    file_path = 'online_cms/{course_id}/assi/{assignmentName}/{fileName}.{ext}'.format(
-         course_id=course_code,assignmentName=assignmentName, fileName=name, ext=ext) 
-    return file_path
-# class StudentAssignment(models.Model):
-#     student_id = models.ForeignKey(Student, on_delete=models.CASCADE)
-#     assignment_id = models.ForeignKey(CourseAssignment, on_delete=models.CASCADE)
-#     upload_time = models.DateTimeField(auto_now=True)
-#     # upload_url = models.TextField(max_length=200)
-#     doc = models.FileField(upload_to=assignment_submit_name, null=True, blank=True)
-#     score = models.IntegerField(null=True)        #score is submitted by faculty 
-#     feedback = models.CharField(max_length=100, null=True)  #feedback by the faculty for the solution of the assignment submitted
-#     assign_name = models.CharField(max_length=100) 
-
-#     def __str__(self):
-#         return '{} - {} - {} - {} - {}'.format(
-#                 self.pk, self.student_id,
-#                 self.assignment_id, self.score,
-#                 self.feedback)
-
-class StudentAssignment1(models.Model):
+class StudentAssignment(models.Model):
     student_id = models.ForeignKey(Student, on_delete=models.CASCADE)
-    assignment_id = models.ForeignKey(CourseAssignment, on_delete=models.CASCADE)
+    assignment_id = models.ForeignKey(Assignment, on_delete=models.CASCADE)
     upload_time = models.DateTimeField(auto_now=True)
-    # upload_url = models.TextField(max_length=200)
-    course_code=models.CharField(max_length=100)
-    doc = models.FileField(upload_to=assignment_submit_name, null=True, blank=True)
+    upload_url = models.TextField(max_length=200)
     score = models.IntegerField(null=True)        #score is submitted by faculty 
     feedback = models.CharField(max_length=100, null=True)  #feedback by the faculty for the solution of the assignment submitted
     assign_name = models.CharField(max_length=100) 

FusionIIIT/applications/online_cms/urls.py

@@ -70,8 +70,6 @@
     url(r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/edit_bank/(?P<qb_code>[0-9]+)$',
         views.edit_bank, name='edit_bank'),
     url(r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/attendance$', views.submit_attendance,
-        name='submit_attendance'),
-    url(r'^(?P<course_code>[A-z]+[0-9]+[A-z]?)/edit-assignment-marks$', views.edit_assignment_marks,
-        name='assignment_marks'),    ]  
+        name='submit_attendance'),] 
 
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)