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

…fessor and describes the topic instead of the Subject

fixed topic detail view for students, now, it shows all activities as in the pro…
…fessor and describes the topic instead of the Subject
fbormann
1 parent 5099eb93
Showing 3 changed files with 69 additions and 17 deletions Show diff stats
courses/templates/topic/index.html
courses/templates/topic/topic_card_student.html
courses/views.py
@@ -2,6 +2,15 @@
 {% load static i18n permission_tags professor_access %}
+
+{% block javascript %}
+        <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
+        <script src="{% static 'js/file.js' %}"></script>
+        <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
+        <script type = "text/javascript" src="{% static 'links.js' %}"></script>
+{% endblock %}
+
+
 {% block breadcrumbs %}
 	<ol class="breadcrumb">
@@ -40,7 +49,7 @@
     <div class="panel-heading">
 			<div class="row">
 	      <div class="col-md-10 col-sm-7">
-	        <h3>{{subject}}</h3>
+	        <h3> {{topic.name}} </h3>
 	      </div>
 	      <div class="col-xs-4 col-md-2 divMoreActions">
 					{% professor_subject subject user as permissions%}
@@ -50,9 +59,15 @@
                 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
               </button>
               <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
-                <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>
-                <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>
-                <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>
+                <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>
+                <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>
+                <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>
               </ul>
             </div>
           {% endif %}
@@ -61,13 +76,17 @@
     </div>
     <div class="panel-body">
       <p>
-        {{subject.description|linebreaks}}
+        {{topic.description|linebreaks}}
       </p>
     </div>
   </div>
   <div class="panel panel-default">
     <div class="panel-body">
-    {% for activit in activitys %}
+        {% include "topic/topic_card_student.html" %}
+        {% comment %}
+          
+        
+    <!--{% for activit in activitys %}
       <form class="form-horizontal" enctype='multipart/form-data'>{% csrf_token %}
         <fieldset>
           <legend>{{activit.name}}</legend>
@@ -96,8 +115,8 @@
                         </div>
                       {% else %}
                       <div class="col-md-4">
-                        <!--<input type="hidden" name="id" value="">
-                        <input type="hidden" name="student" value="">-->
+                        <input type="hidden" name="id" value="">
+                        <input type="hidden" name="student" value="">
                         <div class="form-group {% if form.pdf.errors %} has-error {% endif %}">
                             {{ form.as_p }}
                         </div>
@@ -112,18 +131,15 @@
           {% endfor %}
         </div>
     </fieldset>
-  </form>
-
+  </form>-->
+{% endcomment %}
-{% empty %}
-  {% trans 'No activity found' %}
-{% endfor %}
-</div>
+      </div>
-</div>
+    </div>
 </div>
 {% endblock %}
@@ -0,0 +1,34 @@
+{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access%}
+
+{% block javascript %}
+        <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
+        <script src="{% static 'js/file.js' %}"></script>
+        <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
+        <script type = "text/javascript" src="{% static 'links.js' %}"></script>
+{% endblock %}
+
+<div class="row">
+  <div class="col-xs-6 col-md-6">
+    <div class="resource_inline">
+      <h4>{% trans "Materials" %}</h4>
+    </div>
+    
+    <ul id="list-materials">
+        {% list_topic_file request topic %}
+        {% list_topic_link request topic%}
+      
+    </ul>
+  </div>
+  <div class="col-xs-4 col-md-4">
+    <div class="resource_inline">
+      <h4>{% trans "Activities" %}</h4>
+    </div>
+    <ul>
+        <div class="foruns_list">
+            {% list_topic_poll request topic %}
+            {% list_topic_foruns request topic %}
+        </div>
+    </ul>
+  </div>
+ 
+</div>
 \ No newline at end of file
@@ -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
	@@ -0,0 +1,34 @@		@@ -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	\ No newline at end of file	35	\ No newline at end of file