Download as
Browse Code »

Commit b390da23b4a0fea890649a68bc36b0959e2479dd

Authored by fbormann
1 parent 5099eb93
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

fixed topic detail view for students, now, it shows all activities as in the pro… 

…fessor and describes the topic instead of the Subject
Showing 3 changed files with 69 additions and 17 deletions   Show diff stats
courses/templates/topic/index.html
  Diff comments   View file @b390da2
... ... @@ -2,6 +2,15 @@
2 2  
3 3 {% load static i18n permission_tags professor_access %}
4 4  
  5 +
  6 +{% block javascript %}
  7 + <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
  8 + <script src="{% static 'js/file.js' %}"></script>
  9 + <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
  10 + <script type = "text/javascript" src="{% static 'links.js' %}"></script>
  11 +{% endblock %}
  12 +
  13 +
5 14 {% block breadcrumbs %}
6 15  
7 16 <ol class="breadcrumb">
... ... @@ -40,7 +49,7 @@
40 49 <div class="panel-heading">
41 50 <div class="row">
42 51 <div class="col-md-10 col-sm-7">
43   - <h3>{{subject}}</h3>
  52 + <h3> {{topic.name}} </h3>
44 53 </div>
45 54 <div class="col-xs-4 col-md-2 divMoreActions">
46 55 {% professor_subject subject user as permissions%}
... ... @@ -50,9 +59,15 @@
50 59 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
51 60 </button>
52 61 <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
53   - <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
54   - <li><a href="{% url 'course:update_subject' subject.slug %}" data-toggle="modal" data-target="#editSubject"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
55   - <li><a href="{% url 'course:delete_subject' subject.slug %}" data-toggle="modal" data-target="#removeSubject"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
  62 + <li>
  63 + <a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a>
  64 + </li>
  65 + <li>
  66 + <a href="{% url 'course:update_subject' subject.slug %}" data-toggle="modal" data-target="#editSubject"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a>
  67 + </li>
  68 + <li>
  69 + <a href="{% url 'course:delete_subject' subject.slug %}" data-toggle="modal" data-target="#removeSubject"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a>
  70 + </li>
56 71 </ul>
57 72 </div>
58 73 {% endif %}
... ... @@ -61,13 +76,17 @@
61 76 </div>
62 77 <div class="panel-body">
63 78 <p>
64   - {{subject.description|linebreaks}}
  79 + {{topic.description|linebreaks}}
65 80 </p>
66 81 </div>
67 82 </div>
68 83 <div class="panel panel-default">
69 84 <div class="panel-body">
70   - {% for activit in activitys %}
  85 + {% include "topic/topic_card_student.html" %}
  86 + {% comment %}
  87 +
  88 +
  89 + <!--{% for activit in activitys %}
71 90 <form class="form-horizontal" enctype='multipart/form-data'>{% csrf_token %}
72 91 <fieldset>
73 92 <legend>{{activit.name}}</legend>
... ... @@ -96,8 +115,8 @@
96 115 </div>
97 116 {% else %}
98 117 <div class="col-md-4">
99   - <!--<input type="hidden" name="id" value="">
100   - <input type="hidden" name="student" value="">-->
  118 + <input type="hidden" name="id" value="">
  119 + <input type="hidden" name="student" value="">
101 120 <div class="form-group {% if form.pdf.errors %} has-error {% endif %}">
102 121 {{ form.as_p }}
103 122 </div>
... ... @@ -112,18 +131,15 @@
112 131 {% endfor %}
113 132 </div>
114 133 </fieldset>
115   - </form>
116   -
  134 + </form>-->
  135 +{% endcomment %}
117 136  
118   -{% empty %}
119   - {% trans 'No activity found' %}
120   -{% endfor %}
121 137  
122 138  
123 139  
124   -</div>
  140 + </div>
125 141  
126 142  
127   -</div>
  143 + </div>
128 144 </div>
129 145 {% endblock %}
... ...
courses/templates/topic/topic_card_student.html 0 → 100644
  Diff comments   View file @b390da2
... ... @@ -0,0 +1,34 @@
  1 +{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access%}
  2 +
  3 +{% block javascript %}
  4 + <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
  5 + <script src="{% static 'js/file.js' %}"></script>
  6 + <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
  7 + <script type = "text/javascript" src="{% static 'links.js' %}"></script>
  8 +{% endblock %}
  9 +
  10 +<div class="row">
  11 + <div class="col-xs-6 col-md-6">
  12 + <div class="resource_inline">
  13 + <h4>{% trans "Materials" %}</h4>
  14 + </div>
  15 +
  16 + <ul id="list-materials">
  17 + {% list_topic_file request topic %}
  18 + {% list_topic_link request topic%}
  19 +
  20 + </ul>
  21 + </div>
  22 + <div class="col-xs-4 col-md-4">
  23 + <div class="resource_inline">
  24 + <h4>{% trans "Activities" %}</h4>
  25 + </div>
  26 + <ul>
  27 + <div class="foruns_list">
  28 + {% list_topic_poll request topic %}
  29 + {% list_topic_foruns request topic %}
  30 + </div>
  31 + </ul>
  32 + </div>
  33 +
  34 +</div>
0 35 \ No newline at end of file
... ...
courses/views.py
  Diff comments   View file @b390da2
... ... @@ -18,7 +18,7 @@ from core.mixins import NotificationMixin
18 18 from users.models import User
19 19 from files.forms import FileForm
20 20 from files.models import TopicFile
21   -
  21 +from courses.models import Material
22 22 from django.urls import reverse
23 23  
24 24 from datetime import date
... ... @@ -440,11 +440,13 @@ class TopicsView(LoginRequiredMixin, generic.ListView):
440 440 context = super(TopicsView, self).get_context_data(**kwargs)
441 441 activitys = Activity.objects.filter(topic__name = topic.name)
442 442 students_activit = User.objects.filter(activities__in = Activity.objects.all())
443   -
  443 + materials = Material.objects.filter(topic = topic)
  444 + print(materials)
444 445 context['topic'] = topic
445 446 context['subject'] = topic.subject
446 447 context['activitys'] = activitys
447 448 context['students_activit'] = students_activit
  449 + context['materials'] = materials
448 450 context['form'] = ActivityForm
449 451  
450 452 return context
... ...