Skip to content

W
widget_group17
Commit ed1bf67c authored by Miguel Luis D. Bandelaria's avatar Miguel Luis D. Bandelaria
Browse files
Options

resolved changes

parents 7f1f3feb 56568e5b
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 25 deletions
widget_group_17/announcements/static/announcements/style.css
View file @ ed1bf67c
p{
color: black;
font-weight: bold;
font-family: Helvetica;
font-family: papyrus;
font-size:25px;
}
h1 {
......@@ -9,24 +9,24 @@ h1 {
text-align: left;
color: black;
font-size: 55px;
font-family: Helvetica;
font-family: papyrus;
}
body {
background-image: url("/static/announcements/bg.png");
background-image: url("/static/announcements/bg.jpg");
background-repeat: no-repeat;
background-size: cover;
background-position: center;
background-attachment: fixed;
font-family: Helvetica;
font-family: papyrus;
}
a{
color: black;
font-family: Helvetica;
font-family: papyrus;
font-weight: bold;
}
ol {
font-size:35px;
font-family: Helvetica;
font-family: papyrus;
color:black;
font-weight: bold;
}
......
widget_group_17/announcements/templates/announcements/details.html
View file @ ed1bf67c
......@@ -8,7 +8,9 @@
<h2>by {{ announcement.author.first_name }} {{ announcement.author.last_name }}, {{ announcement.pub_date|date:"d-m-Y" }}</h2>
</head>
<body>
<div style="max-width:800px; word-wrap:break-word;">
<p>{{ announcement.announcement_body }}</p>
</div>
<p>Like: {{ like_tally }}</p>
<p>Love: {{ love_tally }}</p>
<p>Angry: {{ angry_tally }}</p>
......
widget_group_17/assignments/forms.py 0 → 100644
View file @ ed1bf67c
from django.forms import ModelForm
from .models import Assignment, Course
class AssignmentForm(ModelForm):
class Meta:
model = Assignment
fields = ["name", "description", "max_points", "course", "image"]
\ No newline at end of file
widget_group_17/assignments/migrations/0007_alter_assignment_image.py 0 → 100644
View file @ ed1bf67c
# Generated by Django 4.0.3 on 2022-05-24 08:34
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('assignments', '0006_alter_assignment_image'),
]
operations = [
migrations.AlterField(
model_name='assignment',
name='image',
field=models.FileField(null=True, upload_to='static/assignments'),
),
]
widget_group_17/assignments/models.py
View file @ ed1bf67c
......@@ -6,6 +6,9 @@ class Course(models.Model):
course_code = models.CharField(max_length=10)
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)
......@@ -13,11 +16,15 @@ class Assignment(models.Model):
description = models.CharField(max_length=500)
max_points = models.IntegerField(default=0)
passing_score = models.IntegerField(default=0)
image = models.FileField(upload_to='static/assignments/', null=True)
image = models.FileField(upload_to='static/assignments', null=True)
def _str_(self):
def __str__(self):
return self.name
def file(self):
value = os.path.basename(self.image.name)
return value
\ No newline at end of file
return value
def save(self):
self.passing_score = self.max_points*0.6
super(Assignment, self).save()
widget_group_17/assignments/templates/assignments/index.html
View file @ ed1bf67c
......@@ -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 0 → 100644
View file @ ed1bf67c
{% 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' %}" enctype="multipart/form-data">
{% 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
View file @ ed1bf67c
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
View file @ ed1bf67c
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):
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)
class IndexView(View):
def get(self, 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)
def details(request, assignment_id):
try:
assignment = Assignment.objects.get(pk=assignment_id)
except Assignment.DoesNotExist:
raise Http404("Assignment does not exist.")
score = assignment.max_points
assignment.passing_score = (score*60) // 100
context = {
"assignment" : assignment,
......@@ -27,7 +27,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, request.FILES)
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>"
......
widget_group_17/homepage/static/homepage/style.css
View file @ ed1bf67c
......@@ -12,7 +12,7 @@ h1 {
font-family: Helvetica;
}
body {
background-image: url("/static/bg.png");
background-image: url("/static/homepage/lenibg.jpg");
background-repeat: no-repeat;
background-size: cover;
background-position: center;
......
widget_group_17/homepage/templates/homepage/index.html
View file @ ed1bf67c
{% extends "homepage/base.html" %}
{% block page-title %}Widget User Homepage{% endblock %}
{% block content %}
......
widget_group_17/static/announcements/bg.jpg 0 → 100644
View file @ ed1bf67c
This diff is collapsed.
widget_group_17/static/announcements/bg.png deleted 100644 → 0
View file @ 7f1f3feb
This diff is collapsed.
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