bump django version from 4.1.x to 5.1.x

assignments/static/assignments/detail.js

@@ -86,13 +86,37 @@ function uploadPDFs (event, form) {
             // Enable the upload PDFs button
             uploadPDFsButton.innerHTML = buttonText;
             uploadPDFsButton.disabled = false;
-            // Display error message as an alert
+            // clear the bootstrap validation classes
+            form.classList.remove('was-validated');
+            // Display error message as a toast
+            const toast = createToastElement(data.message, data.message_type);
+            // append the toast to the toast-container
+            const toastContainer = document.querySelector('#toast-container');
+            toastContainer.appendChild(toast);
+            console.log("toast", toast);
+            var toastElement = new bootstrap.Toast(toast,
+                {delay: 10000, autohide: false});
+            toastElement.show();
         }})
     .catch(error => {
         console.log("error", error);
         // Enable the upload PDFs button
         uploadPDFsButton.innerHTML = buttonText;
         uploadPDFsButton.disabled = false;
+        // clear the bootstrap validation classes
+        form.classList.remove('was-validated');
+        // show toast
+        const toast = createToastElement(
+            "An error occurred while uploading the PDFs. Please try again.",
+            "danger"
+        );
+        // append the toast to the toast-container
+        const toastContainer = document.querySelector('#toast-container');
+        toastContainer.appendChild(toast);
+        console.log("toast", toast);
+        var toastElement = new bootstrap.Toast(toast,
+            {delay: 10000, autohide: false});
+        toastElement.show();
     });
 
 }

assignments/views.py

@@ -166,6 +166,14 @@ def assignment_detail_view(request,  course_pk, assignment_pk):
                     "message": message,
                     "message_type": message_type,
                 })
+            else:
+                print(upload_form.errors)
+                message = "Error while uploading files"
+                message_type = 'danger'
+                return JsonResponse({
+                    "message": message,
+                    "message_type": message_type,
+                })
         elif 'submit-classify' in request.POST:
             print("request was POST:classify")
             classify_form = StudentClassifyForm(no_assignment=False, data=request.POST)

environment-dev.yml

@@ -4,7 +4,7 @@ dependencies:
   - aiohttp
   - llvm-openmp
   - numpy<1.25
-  - django=4.1
+  - django=5.1
   - matplotlib=3.5.3
   - pandas=1.4.4
   - pillow=9.2.0
@@ -21,8 +21,14 @@ dependencies:
   - tesseract=5.3.0
   - pip:
     - canvasapi==2.2.0
+    - djangorestframework==3.15.1
+    - markdown
+    - django-cors-headers
+    - drf-nested-routers
+    - djangorestframework-simplejwt
     - crispy-bootstrap5==0.6
     - django-crispy-forms==1.14.0
     - opencv-python-headless==4.7.0.72
+    - onnxruntime==1.14.1
     - pymupdf==1.21.1
 name: django-ta

environment.yml

@@ -4,7 +4,7 @@ dependencies:
   - aiohttp
   - llvm-openmp
   - numpy<1.25
-  - django=4.1
+  - django=5.1
   - matplotlib=3.5.3
   - pandas=1.4.4
   - pillow=9.2.0

submissions/forms.py

@@ -159,6 +159,22 @@ def __init__(self, *args, **kwargs):
         self.new_comment = forms.Textarea()
         self.comment_file = forms.FileField()
 
+class MultipleFileInput(forms.ClearableFileInput):
+    allow_multiple_selected = True
+
+class MultipleFileField(forms.FileField):
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault("widget", MultipleFileInput())
+        super().__init__(*args, **kwargs)
+
+    def clean(self, data, initial=None):
+        single_file_clean = super().clean
+        if isinstance(data, (list, tuple)):
+            result = [single_file_clean(d, initial) for d in data]
+        else:
+            result = [single_file_clean(data, initial)]
+        return result
+
 class SubmissionFilesUploadForm(forms.Form):
     def __init__(self,*args,**kwargs):
         from django.forms.widgets import HiddenInput
@@ -176,9 +192,10 @@ def __init__(self,*args,**kwargs):
                 sections__in=assignment_targeted.course.sections.all()
             )
 
-    file_field = forms.FileField(
-        widget=forms.ClearableFileInput(attrs={'multiple': True})
-        )
+    file_field = MultipleFileField(
+        required=True,
+        label="Select file(s) to split and upload",
+    )
 
     assignment = forms.ModelChoiceField(
         queryset=Assignment.objects.all(),