Commit 153c4df7 authored by Alissandra Gabrielle C. Tanaliga's avatar Alissandra Gabrielle C. Tanaliga

Merge branch 'tanaliga/assignments'

parents c794d226 f4b131ea
...@@ -8,19 +8,18 @@ ...@@ -8,19 +8,18 @@
{% block app_header %}Assignments Per Course{% endblock %} {% block app_header %}Assignments Per Course{% endblock %}
{% block content %} {% block content %}
<ul> {% for c in course_list|dictsort:"course_code" %}
{% for c in course_list|dictsort:"course_code" %} <div class="course_block">
<li><p class="course_section">{{ c.course_code }} {{ c.course_title }} {{ c.section }}</p> <p class="course_section">{{ c.course_code }} {{ c.course_title }} {{ c.section }}</p>
<ul class="course_assignments"> <ul class="course_assignments">
{% for a in assignment_list %} {% for a in assignment_list %}
{% if a.course.course_code == c.course_code %} {% if a.course.course_code == c.course_code %}
{% if a.course.section == c.section %} {% if a.course.section == c.section %}
<li><a href="{% url 'assignments:assignment-detail' pk=a.pk %}">{{ a.name }}</a></li> <li><a href="{% url 'assignments:assignment-detail' pk=a.pk %}">{{ a.name }}</a></li>
{% endif %}
{% endif %} {% endif %}
{% endfor %} {% endif %}
</ul> {% endfor %}
</li> </ul>
{% endfor %} </div>
</ul> {% endfor %}
{% endblock %} {% endblock %}
\ No newline at end of file
...@@ -5,13 +5,19 @@ ...@@ -5,13 +5,19 @@
<link rel="stylesheet" href="{% static 'css/assignments_stylesheet.css' %}"> <link rel="stylesheet" href="{% static 'css/assignments_stylesheet.css' %}">
{% endblock %} {% endblock %}
{% block app_header %}
{{ object.name }}
{% endblock %}
{% block content %} {% block content %}
<p class="course">{{ object.course.course_code }} {{ object.course.course_title }} {{ object.course.section }}</p> <div class="assignment_page">
<p class="title">{{ object.name }}</p> <p class="course">{{ object.course.course_code }} {{ object.course.course_title }} {{ object.course.section }}</p>
<img src= "{{ object.image.url }}"> <img class="assign_img" src= "{{ object.image.url }}">
<div class="assign_details"> <div class="assign_details">
<p class="desc">{{ object.description }}</p> <p class="instructions">Instructions:</p>
<p class="score">Perfect Score: {{ object.max_points }}</p> <p>{{ object.description }}</p>
<p class="score">Passing Score: {{ object.passing_score }}</p> <p class="score">Perfect Score: {{ object.max_points }}</p>
<p class="score">Passing Score: {{ object.passing_score }}</p>
</div>
</div> </div>
{% endblock %} {% endblock %}
\ No newline at end of file
No preview for this file type
body { body {
font-family: Tahoma, sans-serif; font-family: Tahoma, sans-serif;
background-color: darkgray;
} }
header { header {
font-size: 25px; font-size: 50px;
font-weight: bold; font-weight: bold;
padding: 1vh 2vw;
text-align: center;
}
.course_block {
border: 1px solid black;
background-color: aliceblue;
padding: 1vh 2vw;
margin: 2vh 2vw;
} }
.course_section { .course_section {
font-weight: bold; font-weight: bold;
} }
.course, .title { .assignment_page {
border: 1px solid black;
background-color: aliceblue;
padding: 1vh 2vw;
margin: 2vh 2vw;
display: grid;
}
.course {
grid-column: 1 / 3;
grid-row: 1;
text-align: center;
font-weight: bold;
}
.assign_img {
grid-column: 1;
grid-row: 2;
padding: 1vh 1vw;
margin: 1vh 1vw;
width: 40vw;
}
.assign_details {
grid-column: 2;
grid-row: 2;
}
.instructions {
font-weight: bold;
}
.score {
font-weight: bold; font-weight: bold;
} }
\ 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