fix: resolving merge conflicts

widget_group_17/assignments/forms.py

+from django.forms import ModelForm
+from .models import Assignment, Course
+
+class AssignmentForm(ModelForm):
+    class Meta:
+        model = Assignment
+        fields = ["name", "description", "max_points", "course"]
\ No newline at end of file

widget_group_17/assignments/models.py

@@ -7,6 +7,9 @@ class Course(models.Model):
     course_title = models.CharField(max_length=255)
     section = models.CharField(max_length=3)
     
+    def __str__(self):
+        return self.course_code + '/' + self.course_title + '/' + self.section
+
 class Assignment(models.Model):
     course = models.ForeignKey(Course, on_delete=models.CASCADE, null=True)
     name = models.CharField(max_length=50)
@@ -15,7 +18,7 @@ class Assignment(models.Model):
     passing_score = models.IntegerField(default=0)
     image = models.FileField(upload_to='static/assignments/', null=True)
 
-    def _str_(self):
+    def __str__(self):
         return self.name
     
     def file(self):

widget_group_17/assignments/templates/assignments/index.html

@@ -21,4 +21,5 @@
 	{% else %}
 		<p>No course available.</p>
 	{% endif %}
+	<a href="{% url 'assignments:newassignment' %}">New Assignment</a>
 {% endblock %}
\ No newline at end of file

widget_group_17/assignments/templates/assignments/newassignment.html

+{% extends "assignments/base.html" %}
+
+{% block page-title %}New Assignment{% endblock %}
+
+{% block content %}
+	<h1>New Assignment</h1>
+	<a href="{% url 'assignments:index' %}">Assignments Per Course</a>
+	<form method="POST" action="{% url 'assignments:newassignment' %}">
+		{% csrf_token %}
+		{{ assignment_form.as_p }}
+		<button class="button" type="submit">Save Assignment</button>
+	</form>
+{% endblock %}
\ No newline at end of file

widget_group_17/assignments/urls.py

 from django.urls import path
 
 from . import views
+from .views import IndexView
 
 app_name = "assignments"
 urlpatterns = [
     # assignments/
-    path('', views.index, name='index'),
+    path('', IndexView.as_view(), name='index'),
     # assignments/<assignment_id>/details/
     path('<int:assignment_id>/details/', views.details, name='details'),
+    # assignments/add/
+    path('add/', views.newassignment, name='newassignment'),
 ]
\ No newline at end of file

widget_group_17/assignments/views.py

 from django.http import HttpResponse, Http404
-from django.shortcuts import render
+from django.shortcuts import render, redirect
+from django.views import View
 from assignments.models import Assignment, Course
+from assignments.forms import AssignmentForm
 
 # Create your views here.
-def index(request):
+class IndexView(View):
+    def get(self, request):
         course_list = Course.objects.order_by("course_code")
         assignment_list = Assignment.objects.all()
         context = {
@@ -27,7 +30,30 @@ def details(request, assignment_id):
     } 
     return render(request, "assignments/details.html", context)
     
-# Code from previous labs:
+def newassignment(request):
+    if request.method == "POST":
+        assignment_form = AssignmentForm(request.POST)
+        if assignment_form.is_valid():
+            new_assignment = assignment_form.save()
+            return redirect("assignments:newassignment")
+    else:
+        assignment_form = AssignmentForm()
+    return render(request, "assignments/newassignment.html", {"assignment_form":assignment_form})
+
+
+# Code from Lab 3:
+#
+# def index(request):
+#    course_list = Course.objects.order_by("course_code")
+#    assignment_list = Assignment.objects.all()
+#    context = {
+#        "course_list" : course_list,
+#        "assignment_list" : assignment_list,
+#    }
+#    return render(request, "assignments/index.html", context)
+
+
+# Code from Midterm Project and earlier labs:
 #
 # def index(request):
 #    assignments_view = "ASSIGNMENTS: <br>"