Skip to content

W
widget_group17
Commit e54f958a authored by Joan Denise Nocos's avatar Joan Denise Nocos
Browse files
Options

feat: added image field to Assignment model

parent 1cc16eb5
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 21 deletions
widget_group_17/assignments/migrations/0005_assignment_image.py 0 → 100644
View file @ e54f958a
# Generated by Django 3.2.12 on 2022-05-18 07:45
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('assignments', '0004_auto_20220406_0329'),
]
operations = [
migrations.AddField(
model_name='assignment',
name='image',
field=models.FileField(null=True, upload_to='static/'),
),
]
widget_group_17/assignments/models.py
View file @ e54f958a
from django.db import models from django.db import models
import os
# Create your models here. # Create your models here.
class Course(models.Model): class Course(models.Model):
...@@ -12,8 +13,11 @@ class Assignment(models.Model): ...@@ -12,8 +13,11 @@ class Assignment(models.Model):
description = models.CharField(max_length=500) description = models.CharField(max_length=500)
max_points = models.IntegerField(default=0) max_points = models.IntegerField(default=0)
passing_score = models.IntegerField(default=0) passing_score = models.IntegerField(default=0)
image = models.FileField(upload_to='static/', null=True)
def _str_(self): def _str_(self):
return self.name return self.name
def file(self):
\ No newline at end of file value = os.path.basename(self.image.name)
return value
\ No newline at end of file
widget_group_17/assignments/templates/assignments/details.html
View file @ e54f958a
{% extends "base.html" %} <!DOCTYPE html>
<html lang="en">
{% block page-title %}Assignment {{ assignment_id }} Details{% endblock %} <head>
<meta charset="UTF-8">
{% block content %} <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
{% comment %}
<link rel="stylesheet" type="text/css"
href="{% static 'style.css' %}">
{% endcomment %}
<title>{% block page-title %}Assignment {{ assignment_id }} Details{% endblock %}</title>
</head>
<body>
<h1>{{ course.course_code }} {{ course.course_title }} {{ course.section }}</h1> <h1>{{ course.course_code }} {{ course.course_title }} {{ course.section }}</h1>
<p>{{ assignment.name }}</p> <p>Name: {{ assignment.name }}</p>
<p>{{ assignment.description }}</p> <p>Description: {{ assignment.description }}</p>
<p>{{ assignment.max_points }}</p> <p>Perfect Score: {{ assignment.max_points }}</p>
<p>{{ assignment.passing_score }}</p> <p>Passing Score: {{ assignment.passing_score }}</p>
<p>Image Placeholder</p> <img src="/static/{{ assignment.file }}" width="250" height="250">
{% endblock %} </body>
\ No newline at end of file </html>
widget_group_17/assignments/templates/assignments/index.html
View file @ e54f958a
{% extends "base.html" %} <!DOCTYPE html>
<html lang="en">
{% block page-title %}Assignments{% endblock %} <head>
<meta charset="UTF-8">
{% block content %} <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
{% comment %}
<link rel="stylesheet" type="text/css"
href="{% static 'style.css' %}">
{% endcomment %}
<title>{% block page-title %}Assignments{% endblock %}</title>
</head>
<body>
<h1>Assignments Per Course</h1> <h1>Assignments Per Course</h1>
<h2>List of Courses:</h2> <h2>List of Courses:</h2>
{% if course_list %} {% if course_list %}
...@@ -11,7 +19,7 @@ ...@@ -11,7 +19,7 @@
<p>{{ course.course_code }} {{ course.course_title }} {{ course.section }}</p> <p>{{ course.course_code }} {{ course.course_title }} {{ course.section }}</p>
<ul> <ul>
{% for assignment in assignment_list %} {% for assignment in assignment_list %}
{% if assignment.course == course.id %} {% if assignment.course == course %}
<li><a href="{% url 'assignments:details' assignment.id %}">{{ assignment.name }}</a></li> <li><a href="{% url 'assignments:details' assignment.id %}">{{ assignment.name }}</a></li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
...@@ -21,5 +29,9 @@ ...@@ -21,5 +29,9 @@
{% else %} {% else %}
<p>No course available.</p> <p>No course available.</p>
{% endif %} {% endif %}
{% endblock %} </body>
</html>
widget_group_17/assignments/views.py
View file @ e54f958a
...@@ -14,11 +14,30 @@ def index(request): ...@@ -14,11 +14,30 @@ def index(request):
def details(request, assignment_id): def details(request, assignment_id):
try: try:
assignment = Article.objects.get(pk=assignment_id) assignment = Assignment.objects.get(pk=assignment_id)
except Assignment.DoesNotExist: except Assignment.DoesNotExist:
raise Http404("Assignment does not exist!") raise Http404("Assignment does not exist!")
context = { context = {
"assignment" : assignment, "assignment" : assignment,
"course" : assignment.course, "course" : assignment.course,
} }
return render(request, "assignments/details.html", context) return render(request, "assignments/details.html", context)
\ No newline at end of file
# Code from previous labs:
#
# def index(request):
# assignments_view = "ASSIGNMENTS: <br>"
# schoolwork = Assignment.objects.all()
# for assignment in schoolwork:
# score = assignment.max_points
# assignment.passing_score = (score*60) // 100
# assignments_view += "Assignment Name: {}<br>Description: {}<br>Perfect Score: {}<br>Passing Score: {}<br>Course/Section: {} {} {}<br><br>".\
# format(assignment.name,
# assignment.description,
# assignment.max_points,
# assignment.passing_score,
# assignment.course.course_code,
# assignment.course.course_title,
# assignment.course.section)
#
# return HttpResponse(assignments_view)
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment