diff --git a/courses/templates/topic/index.html b/courses/templates/topic/index.html index 77e4f85..a22ec82 100644 --- a/courses/templates/topic/index.html +++ b/courses/templates/topic/index.html @@ -2,6 +2,15 @@ {% load static i18n permission_tags professor_access %} + +{% block javascript %} + + + + +{% endblock %} + + {% block breadcrumbs %}
    @@ -40,7 +49,7 @@
    -

    {{subject}}

    +

    {{topic.name}}

    {% professor_subject subject user as permissions%} @@ -50,9 +59,15 @@
    {% endif %} @@ -61,13 +76,17 @@

    - {{subject.description|linebreaks}} + {{topic.description|linebreaks}}

    - {% for activit in activitys %} + {% include "topic/topic_card_student.html" %} + {% comment %} + + + + +
    {{ form.as_p }}
    @@ -112,18 +131,15 @@ {% endfor %}
    - - + --> +{% endcomment %} -{% empty %} - {% trans 'No activity found' %} -{% endfor %} -
    + - + {% endblock %} diff --git a/courses/templates/topic/topic_card_student.html b/courses/templates/topic/topic_card_student.html new file mode 100644 index 0000000..124c9b8 --- /dev/null +++ b/courses/templates/topic/topic_card_student.html @@ -0,0 +1,34 @@ +{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access%} + +{% block javascript %} + + + + +{% endblock %} + +
    +
    +
    +

    {% trans "Materials" %}

    +
    + +
      + {% list_topic_file request topic %} + {% list_topic_link request topic%} + +
    +
    +
    +
    +

    {% trans "Activities" %}

    +
    +
      +
      + {% list_topic_poll request topic %} + {% list_topic_foruns request topic %} +
      +
    +
    + +
    \ No newline at end of file diff --git a/courses/views.py b/courses/views.py index 6eed274..4f27301 100644 --- a/courses/views.py +++ b/courses/views.py @@ -18,7 +18,7 @@ from core.mixins import NotificationMixin from users.models import User from files.forms import FileForm from files.models import TopicFile - +from courses.models import Material from django.urls import reverse from datetime import date @@ -440,11 +440,13 @@ class TopicsView(LoginRequiredMixin, generic.ListView): context = super(TopicsView, self).get_context_data(**kwargs) activitys = Activity.objects.filter(topic__name = topic.name) students_activit = User.objects.filter(activities__in = Activity.objects.all()) - + materials = Material.objects.filter(topic = topic) + print(materials) context['topic'] = topic context['subject'] = topic.subject context['activitys'] = activitys context['students_activit'] = students_activit + context['materials'] = materials context['form'] = ActivityForm return context -- libgit2 0.21.2