Added Course model under Assignments app, view displays all assignments

6d5191dd · Angelo Esteban · fb84ff44 · 6d5191dd · 6d5191dd · 6d5191dd
Verified Commit 6d5191dd authored Mar 22, 2022 by Angelo Esteban
7 changed files
--- a/assignments/admin.py
+++ b/assignments/admin.py
 from django.contrib import admin

 from .models import Assignment
+from .models import Course

 admin.site.register(Assignment)
+admin.site.register(Course)
--- a/assignments/migrations/0003_course.py
+++ b/assignments/migrations/0003_course.py
+# Generated by Django 4.0.3 on 2022-03-22 14:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assignments', '0002_alter_assignment_max_points'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Course',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('course_code', models.CharField(max_length=10)),
+                ('course_title', models.CharField(max_length=120)),
+                ('section', models.CharField(max_length=3)),
+            ],
+        ),
+    ]
--- a/assignments/migrations/0004_assignment_course_assignment_passing_score.py
+++ b/assignments/migrations/0004_assignment_course_assignment_passing_score.py
+# Generated by Django 4.0.3 on 2022-03-22 14:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assignments', '0003_course'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='assignment',
+            name='course',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='assignments.course'),
+        ),
+        migrations.AddField(
+            model_name='assignment',
+            name='passing_score',
+            field=models.IntegerField(default=6),
+        ),
+    ]
--- a/assignments/models.py
+++ b/assignments/models.py
@@ -5,3 +5,20 @@ class Assignment(models.Model):
    name = models.CharField(max_length=120)
    description = models.TextField(blank=True)
    max_points = models.IntegerField(default=10)
+    passing_score = models.IntegerField(default=6)
+
+    def save(self, *args, **kwargs):
+        self.passing_score = int(0.6*self.max_points)
+        super(Assignment, self).save()
+
+    course = models.ForeignKey(
+        'Course',
+        on_delete=models.CASCADE,
+        null=True,
+    )
+
+
+class Course(models.Model):
+    course_code = models.CharField(max_length=10)
+    course_title = models.CharField(max_length=120)
+    section = models.CharField(max_length=3)
--- a/assignments/templates/assignments_template.html
+++ b/assignments/templates/assignments_template.html
+<html>
+
+<head>
+<title>Assignments</title>
+    </head>
+
+<body>
+ASSIGNMENTS: <br>
+{% for assignment in all_assignments %}
+Assignment Name: {{ assignment.name }}<br>
+Description: {% if assignment.description != None and assignment.description != '' %}{{ assignment.description }}{% else %}No description provided.{% endif %}<br>
+Perfect Score: {{ assignment.max_points }}<br>
+Passing Score: {{ assignment.passing_score }}<br>
+Course/Section: {{ assignment.course.course_code }} {{ assignment.course.course_title }} {{ assignment.course.section }}<br><br>
+{% endfor %}
+    </body>
+
+</html>
\ No newline at end of file
--- a/assignments/urls.py
+++ b/assignments/urls.py
 from django.urls import path
-from .views import index
+from .views import assignments_view

 urlpatterns = [    
-    path('', index, name='index'),
+    path('', assignments_view, name='assignments_view'),
 ]

 app_name = "assignments"
--- a/assignments/views.py
+++ b/assignments/views.py
 from django.shortcuts import render
-from django.http import HttpResponse 
+from .models import Assignment


-def index(request):
-    return HttpResponse("This is the Assignments page!")
+def assignments_view(request):
+    objects_set = {
+        "all_assignments": [obj for obj in Assignment.objects.all()]
+    }
+    return render(request, "assignments_template.html", objects_set)