From dc2ad35becc02271bf9101acd007cd8a14711c57 Mon Sep 17 00:00:00 2001
From: Matheus Lins <msl@cin.ufpe.br>
Date: Mon, 3 Oct 2016 12:58:31 -0300
Subject: [PATCH] updatins course forms

---
 courses/forms.py                   |  1 -
 courses/templates/topic/index.html | 12 +++++++++---
 courses/views.py                   |  9 +++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/courses/forms.py b/courses/forms.py
index 35f89c6..e5b780b 100644
--- a/courses/forms.py
+++ b/courses/forms.py
@@ -1,4 +1,3 @@
-
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from .models import Category, Course, Subject, Topic, ActivityFile, Activity
diff --git a/courses/templates/topic/index.html b/courses/templates/topic/index.html
index 8b534a4..d35b5a9 100644
--- a/courses/templates/topic/index.html
+++ b/courses/templates/topic/index.html
@@ -74,7 +74,7 @@
   <div class="panel panel-default">
     <div class="panel-body">
     {% for activit in activitys %}
-      <form class="form-horizontal">
+      <form class="form-horizontal" enctype='multipart/form-data'>{% csrf_token %}
         <fieldset>
           <legend>{{activit.name}}</legend>
 
@@ -107,9 +107,15 @@
                           <input type="number" step="0.01">
                         </div>
                       {% else %}
-                        <div class="col-md-4">
-                          <input type="file" name="arquivos" class="btn btn-success" multiple/>
+                      <div class="col-md-4">
+                        <input type="hidden" name="id" value="">
+                        <input type="hidden" name="student" value="">
+                        <div class="form-group {% if form.pdf.errors %} has-error {% endif %}">
+                            <label for="id_pdf">PDF</label>
+                            {{form.pdf}}
                         </div>
+                        <button type="submit" class="btn btn-success" id="send_button">Enviar</button>
+                      </div>
                      {% endif %}
                   </div>
                 </div>
diff --git a/courses/views.py b/courses/views.py
index b48d26b..85cef22 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -11,7 +11,7 @@ from rolepermissions.verifications import has_role
 from django.db.models import Q
 from rolepermissions.verifications import has_object_permission
 
-from .forms import CourseForm, UpdateCourseForm, CategoryForm, SubjectForm,TopicForm
+from .forms import CourseForm, UpdateCourseForm, CategoryForm, SubjectForm,TopicForm,ActivityForm
 from .models import Course, Subject, Category,Topic, SubjectCategory,Activity
 from core.mixins import NotificationMixin
 from users.models import User
@@ -292,12 +292,17 @@ 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 = Activity.objects.all())
+		# page_user = User.objects.get(id= self.kwargs['user_id'])
 		context['topic'] = topic
 		context['subject'] = topic.subject
 		context['activitys'] = activitys
 		context['students_activit'] = students_activit
+		context['form'] = ActivityForm
+		# context['user_activity_id'] = Activity.objects.filter(students__id =  self.kwargs['students_id'])
+		# context['page_user'] = page_user
 		return context
 
+
 class CreateTopicView(LoginRequiredMixin, HasRoleMixin, NotificationMixin, generic.edit.CreateView):
 
 	allowed_roles = ['professor', 'system_admin']
@@ -342,7 +347,7 @@ class UpdateTopicView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
 		return super(UpdateTopicView, self).dispatch(*args, **kwargs)
 
 	def get_object(self, queryset=None):
-	    return get_object_or_404(Topic, slug = self.kwargs.get('slug'))
+		return get_object_or_404(Topic, slug = self.kwargs.get('slug'))
 
 	def get_success_url(self):
 		return reverse_lazy('course:view_subject', kwargs={'slug' : self.object.subject.slug})
--
libgit2 0.21.2