removed matheuslins code, which is represented as the exercise app and checked i…

…f nothing else was affected when removing it

removed matheuslins code, which is represented as the exercise app and checked i…
…f nothing else was affected when removing it
Felipe Henrique de Almeida Bormann
1 parent 1b22fd60
Showing 30 changed files with 6 additions and 1018 deletions Show diff stats
amadeus/settings.py
amadeus/urls.py
courses/templates/subject/form_view_student.html
courses/templates/topic/update.html
courses/templates/topic/view.html
courses/urls.py
courses/views.py
exercise/__init__.py
exercise/admin.py
exercise/apps.py
exercise/forms.py
exercise/locale/pt_BR/LC_MESSAGES/django.po
exercise/migrations/0001_initial.py
exercise/migrations/0002_auto_20161124_1217.py
exercise/migrations/__init__.py
exercise/models.py
exercise/static/js/exercise.js
exercise/templates/exercise/card_list_user.html
exercise/templates/exercise/card_topic_exercises.html
exercise/templates/exercise/create_exercise.html
@@ -60,7 +60,6 @@ INSTALLED_APPS = [
     'poll',
     'links',
     'files',
-    'exercise',
  
 ]
  
@@ -23,7 +23,6 @@ urlpatterns = [
     url(r'^home/', include('app.urls', namespace = 'app')),
     url(r'^courses/', include('courses.urls', namespace = 'course')),
     url(r'^users/', include('users.urls', namespace = 'users')),
-    url(r'^exercise/', include('exercise.urls', namespace = 'exercise')),
     url(r'^admin/', admin.site.urls),
     url(r'^', include('core.urls', namespace = 'core')),
     #API
-{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access list_topic_exercises %}
+{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access %}
 {% professor_subject topic.subject user as professor_links %}
  
   {% block javascript %}
-{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access list_topic_exercises course_value_field %}
+{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access course_value_field %}
  
 <form class="" id="form_topic_update_{{topic.slug}}" method="post" action="">
   {% csrf_token %}
@@ -84,7 +84,6 @@
         <ul class="dropdown-menu" aria-labelledby="dLabel">
           <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
           <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#requisicoes_ajax');">{% trans 'Create Poll' %}</a></li>
-          <li><a href="javascript:modal.get('{% url 'course:exercise:create_exercise' topic.slug %}', '#createExercisesModal','#requisicoes_ajax')">{% trans 'Delivery Material' %}</a></li>
           <li><a href="{% url 'course:exam:create_exam' topic.slug %}">{% trans 'Create exam' %}</a></li>
         </ul>
       </div>
-{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access list_topic_exercises %}
+{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access  %}
 <!-- Block with Log info -->
 <input type="hidden" class="log_id" value="{{ topic_log_id }}" />
 <input type="hidden" class="log_url" value="{% url 'course:topic_log' topic.id %}" />
@@ -51,7 +51,7 @@
         <ul class="dropdown-menu" aria-labelledby="dLabel">
           <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
           <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#requisicoes_ajax');">{% trans 'Create Poll' %}</a></li>
-          <li><a href="javascript:modal.get('{% url 'course:exercise:create_exercise' topic.slug %}', '#createExercisesModal','#requisicoes_ajax')">{% trans 'Delivery Material' %}</a></li>
+          
           <li><a href="{% url 'course:exam:create_exam' topic.slug %}">{% trans 'Create exam' %}</a></li>
         </ul>
       </div>
@@ -61,7 +61,7 @@
       <ul>
         {% list_topic_poll request topic %}
         {% list_topic_foruns request topic %}
-        {% list_topic_exercise request topic %}
+        
       </ul>
   </div>
   {% endif %}
@@ -33,7 +33,6 @@ urlpatterns = [
     url(r'^upload-material/$', views.UploadMaterialView.as_view(), name='upload_material'),
     url(r'^subjects/file-material-view/(?P<slug>[\w_-]+)/$', views.FileMaterialView.as_view(), name='file_material_view'),
     url(r'^links/',include('links.urls',namespace = 'links')),
-    url(r'^exercise/', include('exercise.urls', namespace='exercise')),
     url(r'^topic/(?P<topic>[\w_-]+)/$', views.topic_log, name='topic_log'),
     url(r'^(?P<slug>[\w_-]+)/', include([
         url(r'^$', views.CourseView.as_view(), name='view'),
@@ -16,7 +16,7 @@ from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.views import generic
-from exercise.models import Exercise
+
 from files.forms import FileForm
 from files.models import TopicFile
 from functools import reduce
@@ -623,7 +623,6 @@ class SubjectsView(AccessMixin, LogMixin, generic.ListView):
         context['course'] = subject.course
         context['subject'] = subject
         context['topics'] = Topic.objects.filter(subject = subject)
-        context['exercise'] = Exercise.objects.filter(topic__subject=subject)
         context['title'] = subject.name
         if has_role(self.request.user,'professor') or has_role(self.request.user,'system_admin'):
             context['files'] = TopicFile.objects.filter(professor__name = self.request.user.name)
@@ -1,8 +0,0 @@
-from django.contrib import admin
-from .models import Exercise
-
-class ExerciseAdmin(admin.ModelAdmin):
-    list_display = ['name_exercise']
-    search_fields = ['name_exercise']
-
-admin.site.register(Exercise, ExerciseAdmin)
@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class ExerciseConfig(AppConfig):
-    name = 'exercise'
@@ -1,32 +0,0 @@
-from .models import Exercise
-from django import forms
-from django.core.exceptions import ValidationError, FieldError
-from django.utils.translation import ugettext_lazy as _
-import requests
-
-
-class ExerciseForm(forms.ModelForm):
-
-    def __init__(self, *args, **kwargs):
-        super(ExerciseForm, self).__init__(*args, **kwargs)
-        self.fields["allowed"].required = False
-        self.fields["allowed"].initial = False
-
-    # def clean_allowed(self):
-    #     if('allowed' in self.data):
-    #         allowed = self.data['allowed']
-    #         raise forms.ValidationError(_('It is required one these fields.'))
-    #     return True
-
-    class Meta:
-        model = Exercise
-        fields = ['name_exercise', 'description',
-                    'end_date', 'file', 'allowed']
-
-
-class UpdateExerciseForm(forms.ModelForm):
-
-    class Meta:
-        model = Exercise
-        fields = ['name_exercise', 'description',
-                    'end_date', 'file']
@@ -1,125 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-24 00:05-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: .\models.py:24
-msgid "Name"
-msgstr "Nome"
-
-#: .\models.py:25 .\templates\exercise\card_topic_exercises.html:11
-msgid "Description"
-msgstr "Descrição"
-
-#: .\models.py:26 .\templates\exercise\card_topic_exercises.html:22
-msgid "Delivery Date"
-msgstr "Data de entrega"
-
-#: .\models.py:28
-msgid "Topic"
-msgstr "Tópico"
-
-#: .\models.py:29
-msgid "Professors"
-msgstr "Professores"
-
-#: .\models.py:30
-msgid "Students"
-msgstr "Estudantes"
-
-#: .\models.py:32
-msgid "Type file"
-msgstr "Tipo de arquivo"
-
-#: .\models.py:33
-msgid "Allowed delivery after end date?"
-msgstr "Permitido entregar após a data de término?"
-
-#: .\templates\exercise\card_list_user.html:23
-#: .\templates\exercise\card_topic_exercises.html:26
-msgid "Grade"
-msgstr "Nota"
-
-#: .\templates\exercise\card_list_user.html:30
-msgid "Give a grade"
-msgstr "Dar a nota"
-
-#: .\templates\exercise\card_list_user.html:37
-msgid "Delivery"
-msgstr "Entregar"
-
-#: .\templates\exercise\card_list_user.html:45
-msgid "Create"
-msgstr "Criar"
-
-#: .\templates\exercise\card_list_user.html:52
-msgid "Create a specific exercise"
-msgstr "Criar um exercício específico"
-
-#: .\templates\exercise\card_topic_exercises.html:15
-msgid "Don't have description"
-msgstr "Não possui descrição"
-
-#: .\templates\exercise\card_topic_exercises.html:34
-msgid "Not yet"
-msgstr "Ainda não"
-
-#: .\templates\exercise\card_topic_exercises.html:41
-msgid "File"
-msgstr "Arquivo"
-
-#: .\templates\exercise\card_topic_exercises.html:45
-msgid "Exercise not yet"
-msgstr "Sem exercícios por enquanto"
-
-#: .\templates\exercise\card_topic_exercises.html:49
-msgid "Teacher waiting corretion"
-msgstr "Aguardando correção do professor"
-
-#: .\templates\exercise\create_exercise.html:8
-msgid "Create a New Material"
-msgstr "Criar um novo Material"
-
-#: .\templates\exercise\create_exercise.html:36
-msgid "Choose your file..."
-msgstr "Escolha seu arquivo..."
-
-#: .\templates\exercise\create_exercise.html:66
-msgid "The file size shouldnt exceed 10MB"
-msgstr "O tamanho do arquivo não pode exceder 10MB"
-
-#: .\templates\exercise\create_exercise.html:72
-#: .\templates\exercise\delete_exercise.html:24
-msgid "Close"
-msgstr "Fechar"
-
-#: .\templates\exercise\create_exercise.html:73
-msgid "Submit"
-msgstr "Enviar"
-
-#: .\templates\exercise\delete_exercise.html:12
-msgid "Delete Exercise"
-msgstr "Apagar exercício"
-
-#: .\templates\exercise\delete_exercise.html:20
-msgid "Are you sure to delete the exercise "
-msgstr "Você tem certeza que quer deletar o exercício "
-
-#: .\templates\exercise\delete_exercise.html:25
-msgid "Delete"
-msgstr "Apagar"
@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-24 15:17
-from __future__ import unicode_literals
-
-from decimal import Decimal
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('core', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Exercise',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name_exercise', models.CharField(max_length=100, verbose_name='Name')),
-                ('description', models.TextField(blank=True, verbose_name='Description')),
-                ('end_date', models.DateField(verbose_name='Delivery Date')),
-                ('grade', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=20, null=True)),
-                ('file', models.FileField(upload_to='uploads/%Y/%m/%d')),
-                ('allowed', models.BooleanField(default=False, verbose_name='Allowed delivery after end date?')),
-                ('file_type', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='exercise_type', to='core.MimeType', verbose_name='Type file')),
-            ],
-        ),
-    ]
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-24 15:17
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('exercise', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('courses', '0002_auto_20161124_1217'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='exercise',
-            name='professors',
-            field=models.ManyToManyField(blank=True, related_name='professors_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
-        ),
-        migrations.AddField(
-            model_name='exercise',
-            name='students',
-            field=models.ManyToManyField(blank=True, related_name='subject_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
-        ),
-        migrations.AddField(
-            model_name='exercise',
-            name='topic',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exercise_topic', to='courses.Topic', verbose_name='Topic'),
-        ),
-    ]
@@ -1,36 +0,0 @@
-from courses.models import Topic
-from decimal import Decimal
-from django.db import models
-from django.utils.translation import ugettext_lazy as _
-from users.models import User
-from core.models import MimeType
-
-"""
-    Function to return the path where the file should be saved
-"""
-
-    
-def file_path(instance, filename):
-    return '/'.join([instance.topic.subject.course.slug, instance.topic.subject.slug, instance.topic.slug, filename])
-
-
-"""
-It represents the Exercises inside topic.
-"""
-
-
-class Exercise(models.Model):
-
-    name_exercise = models.CharField(_('Name'), max_length=100)
-    description = models.TextField(_('Description'), blank=True)
-    end_date = models.DateField(_('Delivery Date'))
-    grade = models.DecimalField(max_digits=20, decimal_places=2, default=Decimal('0.00'), null=True)
-    topic = models.ForeignKey(Topic, verbose_name=_('Topic'), related_name='exercise_topic')
-    professors = models.ManyToManyField(User, verbose_name=_('Professors'), related_name='professors_exercise', blank=True)
-    students = models.ManyToManyField(User, verbose_name=_('Students'), related_name='subject_exercise', blank = True)
-    file = models.FileField(upload_to='uploads/%Y/%m/%d')
-    file_type = models.ForeignKey(MimeType, verbose_name=_('Type file'), related_name='exercise_type',null=True)
-    allowed = models.BooleanField(_('Allowed delivery after end date?'), default=False)
-
-    def __str__(self):
-        return self.name_exercise
@@ -1,7 +0,0 @@
-function get_modal_exercise(url, id,div_content){
-    $.get(url, function (data) {
-        $(div_content).detach();
-        $(div_content).append(data);
-        $(id).modal('show');
-    });
-}
@@ -1,64 +0,0 @@
-{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access list_topic_exercises %}
-
-<div class="col-md-12 col-sm-12 col-lg-12">
-  <div class="panel-group accordion ui-accordion ui-widget ui-helper-reset ui-sortable" role="tablist" aria-multiselectable="false">
-    <div class="group"><div class="panel panel-default">
-      <div class="panel-heading topic ui-sortable-handle" role="tab">
-        <div class="row">
-          <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{user.id}}" href=".collapseTopic-{{user.id}}" aria-expanded="false" aria-controls="collapseTopic-{{user.id}}">
-            <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
-          </div>
-          <div class="col-xs-9 col-md-9 titleTopic">
-            <a href="" role="button">
-              <h4>{{user|capfirst}}</h4>
-            </a>
-          </div>
-        </div>
-      </div>
-      <div class="panel-collapse collapseTopic-{{user.id}} collapse in" role="tabpanel" aria-labelledby="heading_{{user.id}}" aria-expanded="true" aria-hidden="false">
-        <div class="panel-body">
-          <div class="row">
-            <div class="col-md-4"> 
-              <div class="resource_inline">
-                <h4>{% trans 'Grade' %}</h4>
-              </div>
-              <div class="resource_inline">
-                {# dropdown de create exercício #}
-                <div class="dropdown">
-                  <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                  <ul class="dropdown-menu" aria-labelledby="dLabel">
-                    <li><a href="javascript:modal.get('{% url 'course:exercise:create_exercise' topic.slug %}', '#createExercisesModal','#requisicoes_ajax')">{% trans 'Give a grade' %}</a></li>
-                  </ul>
-                </div>
-              </div>
-            </div>
-            <div class="col-md-4"> 
-              <div class="resource_inline">
-                <h4>{% trans 'Delivery' %}</h4>
-              </div>
-              {% for exercise in exercises %}
-                <li><a href="{{exercise.file.url}}" target="_blank">{{exercise.name_exercise}}</a></li>     
-              {% endfor %}               
-            </div>
-            <div class="col-md-4"> 
-              <div class="resource_inline">
-                <h4>{% trans 'Create' %}</h4>
-              </div>
-              <div class="resource_inline">
-                {# dropdown de create exercício #}
-                <div class="dropdown">
-                  <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                  <ul class="dropdown-menu" aria-labelledby="dLabel">
-                    <li><a href="javascript:modal.get('{% url 'course:exercise:create_exercise' topic.slug %}', '#createExercisesModal','#requisicoes_ajax')">{% trans 'Create a specific exercise' %}</a></li>
-                  </ul>
-                </div>
-              </div>
-              {% include "exercise/create_exercise.html" %}
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-</div>
 \ No newline at end of file
@@ -1,59 +0,0 @@
-{% load static widget_tweaks i18n %}
-
-<div class="col-lg-4 col-xs-4 col-sm-4">
-  <div class="panel panel-default">
-    <div class="panel-body">
-      <form class="form-horizontal">
-        <fieldset>
-          <center><legend>{{exercise.name_exercise}}</legend></center>
-          <div class="container-fluid">
-            <div class="form-group">
-              <label class="col-md-2 col-xs-2 col-sm-2 control-label">{% trans 'Description' %}: </label><br>
-              {% if exercise.description%}
-                {{exercise.description}}
-              {% else %}
-                {% trans "Don't have description" %}
-              {% endif %}
-            </div>
-            <div class="form-group">
-
-            </div>
-            <div class="form-group">
-              <label class="col-md-2 col-xs-2 col-sm-2 control-label">{% trans 'Delivery Date' %}: </label><br>{{exercise.end_date}}
-
-            </div>
-           <div class="form-group">
-              <label for="nota" class="col-md-2 control-label">{% trans 'Grade' %}: 
-                {% if exercise.grade %}
-                  <div class="col-md-4">
-                    <p id="nota" class="form-control">
-                      {{exercise.grade}}
-                    </p>
-                  </div>
-                {% else %}
-                    {% trans 'Not yet' %}
-                {% endif %}
-              </label>
-            </div>
-            {% if exercise.file %}
-              <div class="form-group">
-                <label for="DelExc" class="col-md-4 control-label"> <i class="fa fa-file-archive-o fa-3x" aria-hidden="true">
-                <a href="{{exercise.file.url}}" target="_blank">{% trans 'File' %}</a>
-                </i> 
-              </div>
-            {% else %}
-              <p>{% trans 'Exercise not yet' %}</p>
-            {% endif %}
-            {% if not exercise.grade %}
-              <div class="form-group">
-                <label class="col-md-6 control-label"><i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>{% trans 'Teacher waiting corretion' %}
-              </div>
-            {% endif %}
-          </div>
-
-        </fieldset>
-      </form>
-
-    </div>
-  </div>
-</div>
 \ No newline at end of file
@@ -1,113 +0,0 @@
-{% load widget_tweaks i18n static %}
-<!--MODAL CREATE EXERCISE-->
-<div class="modal fade" id="createExercisesModal" tabindex="-1" role="dialog" aria-labelledby="createExercise">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-        <h4 class="modal-title" id="createExercise">{% trans 'Create a New Material' %}</h4>
-      </div>
-      <div class="modal-body">
-        <!-- Card -->
-        <form class="form-horizontal" method="post" id="form-exercise" enctype="multipart/form-data">
-          {% csrf_token %}
-          {% if messages %}
-          {% for message in messages %}
-          <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-              <span aria-hidden="true">&times;</span>
-            </button>
-            <p>{{ message }}</p>
-          </div>
-          {% endfor %}
-          {% endif %}
-          <fieldset>
-            {% for field in form %}
-            <div class="form-group is-empy{% if form.has_error %} has-error {% endif %} is-fileinput">
-              <div class="col-md-12">
-                {% if field.field.required %}
-                <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}<span>*</span></label>
-                {% else %}
-                <label for="{{ field.auto_id }}" class=" control-label">{{ field.label }}</label>
-                {% endif %}
-                {% if field.auto_id == 'id_file' %}
-                {% render_field field class='form-control input-sm' %}
-                <div class="input-group">
-                  <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your file...' %}">
-                  <span class="input-group-btn input-group-sm">
-                    <button type="button" class="btn btn-fab btn-fab-mini">
-                      <i class="material-icons">attach_file</i>
-                    </button>
-                  </span>
-                </div>
-                {% else %}
-                  {% render_field field class='form-control input-sm' %}
-                  <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
-                {% endif %}
-                </div>
-
-              {% if field.errors %}
-              <div class="alert alert-danger alert-dismissible clearfix" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                  <span aria-hidden="true">&times;</span>
-                </button>
-                <ul>
-                  {% for error in field.errors %}
-                  <li>{{ error }}</li>
-                  {% endfor %}
-                </ul>
-              </div>
-              {% endif %}
-            </div>
-            {% endfor %}
-
-            <div class="form-group">
-              <div class="col-md-12 text-center">
-                <p><b>{% trans 'The file size shouldnt exceed 10MB' %}</b></p>
-              </div>
-            </div>
-
-            <div class="form-group">
-              <div class="col-md-12">
-               <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
-               <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
-             </div>
-           </div>
-         </fieldset>
-       </form>
-       <!-- .end Card -->
-     </div>
-   </div>
- </div>
-</div>
-<!-- EndModal -->
-<script type="text/javascript">
-  $("#form-exercise").submit(function(event) {
-    $("#createExercisesModal").modal("hide");
-    var data = new FormData($('#form-exercise').get(0));
-    $.ajax({
-      url: "{% url 'course:exercise:create_exercise' topic.slug %}",
-      type: $("#form-exercise").attr('method'),
-      data: data,
-      cache: false,
-      processData: false,
-      contentType: false,
-      success: function(data) {
-        $('#createExercisesModal').modal('hide');
-        $('#list-topic{{ topic.id }}-exercises').append(data);
-        $('#list-topic{{ topic.id }}-exercises-edit').append(data);
-        alertify.success('Exercise successfully created!')
-        setTimeout(function () { location.reload(1); }, 1000);
-      },
-      error: function(data){
-        $('#requisicoes_ajax').empty();
-        $('#requisicoes_ajax').append(data.responseText);
-        $('#createExercisesModal').modal('show');
-        alertify.alert('Invalid exercise, insert a valid one!');
-        $('div.modal-backdrop.fade.in').remove();
-
-      }
-    });
-    event.preventDefault();
-  });
-</script>
@@ -1,66 +0,0 @@
-{% load static widget_tweaks i18n %}
-
-<!-- MODAL DELETE LINK -->
-<exercise rel="stylesheet" type="text/css" href="{% static 'css/exercise.css' %}">
-
-<div class="erro-update">
-    <div class="modal fade" id="exerciseDeleteModal" tabindex="-1" role="dialog" aria-labelledby="deleteExerciseLabel" style="z-index: 10">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-                    <h4 class="modal-title" id="deleteExerciseLabel">{% trans 'Delete Exercise' %}</h4>
-                </div>
-                <div class="modal-body">
-                <!-- Card -->
-                    <form class="form-horizontal" method="post" id="form-delete-exercise" enctype="multipart/form-data">
-                    {% csrf_token %}
-                        <fieldset>
-                            <div class="col-md-12">
-                                {% trans "Are you sure to delete the exercise " %} <strong>"{{ exercise.name }}"</strong> </a> of {{ exercise.topic.name }}?
-                            </div>
-                            <div class="form-group">
-                                <div class="col-md-12">
-                                     <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
-                                    <button class="btn btn-raised btn-primary" type="submit">{% trans 'Delete' %}</button>
-                                </div>
-                            </div>
-                        </fieldset>
-                    </form>
-                <!-- .end Card -->
-              </div>
-            </div>
-        </div>
-    </div>
-</div>
-    <script src="{% static 'js/exercise.js' %}"></script>
-    <script type="text/javascript">
-      $("#form-delete-exercise").submit(function(event) {
-            var data = new FormData($('#form-delete-exercise').get(0));
-            $('#exerciseDeleteModal').modal('hide');
-            $.ajax({
-                url: "{% url 'course:exercises:delete_exercise' exercise.slug %}",
-                type: $("#form-delete-exercise").attr('method'),
-                data: data,
-                cache: false,
-                processData: false,
-                contentType: false,
-                success: function(data) {
-                    $('#requisicoes_ajax').empty();
-                    $('#exercise_{{ exercise.slug }}').remove();
-                    $('#exercise_edit_icon_{{ exercise.slug }}').remove();
-                    $('#exercise_edit_{{ exercise.slug }}').remove();
-                    alertify.alert('Exercise successfully deleted!')
-                },
-                error: function(data){
-                    $("div.modal-backdrop.fade.in").remove();
-                    $('#requisicoes_ajax').empty();
-                    $('#requisicoes_ajax').append(data.responseText);
-                    $('#exerciseDeleteModal').modal('show');
-                    alertify.alert('Error when trying to delete.');
-                }
-            });
-            event.preventDefault();
-          });
-  </script>
-<!-- EndModal -->
@@ -1,7 +0,0 @@
-{% load static i18n list_topic_foruns permission_tags %}
-<div id="exercise-topic{{ topic.id }}-exercises-edit">
-  {% for exercise in exercises %}
-    <li class="icon_edit_remove" id = "exercise_edit_icon_{{ exercise.slug }}"> <a href="javascript:modal.get('{% url 'course:exercise:update_exercise' exercise.slug %}', '#exercisesModalEdit', '#requisicoes_ajax')"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a>  <a href="javascript:modal.get('', '#exerciseDeleteModal', '#requisicoes_ajax')"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
-    <li id = "exercise_edit_{{ exercise.slug }}"><i class="fa fa-file" aria-hidden="true"></i>  <a href="javascript:modal.get('', '#viewExerciseModal','#requisicoes_ajax')">{{exercise.name_exercise}}</a></li>
-  {% endfor %}
-</div>
@@ -1,6 +0,0 @@
-{% load static i18n list_topic_foruns permission_tags %}
-<div id="list-topic{{ topic.id }}-exercises">
-{% for exercise in exercises %}
-    <li id="exercise_{{ exercise.slug }}"><i class="fa fa-file" aria-hidden="true"></i>  <a href="{{exercise.file.url}}">{{exercise.name_exercise}}</a></li>
-{% endfor %}
-</div>
@@ -1 +0,0 @@
-<li id="exercise_{{ exercise.slug }}"><i class="material-icons">{{ exercise.file_type.icon }}</i> <a href="{{ exercise.file_url.url }}" target="_blank">{{ exercise.name }}</a></li>
 \ No newline at end of file
@@ -1,120 +0,0 @@
-{% load static widget_tweaks i18n %}
-
-<!-- MODAL CREATE FILE -->
-<link rel="stylesheet" type="text/css" href="{% static 'css/file.css' %}">
-
-<div class="erro-update">
-    <div class="modal fade" id="exercisesModalEdit" tabindex="-1" role="dialog" aria-labelledby="updateFileLabel" style="z-index: 10">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-                    <h4 class="modal-title" id="updateFileLabel">{% trans 'Edit Material' %}</h4>
-                </div>
-                <div class="modal-body">
-                <!-- Card -->
-                    <form class="form-horizontal" method="post" id="form-update-exercise" enctype="multipart/form-data">
-                    {% csrf_token %}
-                        {% if messages %}
-                            {% for message in messages %}
-                                <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
-                                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                                        <span aria-hidden="true">&times;</span>
-                                    </button>
-                                    <p>{{ message }}</p>
-                                </div>
-                            {% endfor %}
-                        {% endif %}
-                        <fieldset>
-                            {% for field in form %}
-                                <div class="form-group is-empy{% if form.has_error %} has-error {% endif %} is-fileinput">
-                                    <div class="col-md-12">
-                                        {% if field.field.required %}
-                                            <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}<span>*</span></label>
-                                        {% else %}
-                                            <label for="{{ field.auto_id }}" class=" control-label">{{ field.label }}</label>
-                                        {% endif %}
-                                        {% if field.auto_id == 'id_file' %}
-                                            <input class="form-control input-sm" id="id_file_url" name="file_url" type="file">
-                                            <div class="input-group">
-                                                <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your file...' %}">
-                                                <span class="input-group-btn input-group-sm">
-                                                    <button type="button" class="btn btn-fab btn-fab-mini">
-                                                        <i class="material-icons">attach_file</i>
-                                                    </button>
-                                                </span>
-                                            </div>
-                                            <div class="crearfix">
-                                                <a href="{{ file.file_url.url }}" target="_blank">{% trans "See current file" %}</a>
-                                            </div>
-                                        {% else %}
-                                            {% render_field field class='form-control input-sm' %}
-                                            <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
-                                        {% endif %}
-                                    </div>
-
-                                    {% if field.errors %}
-                                        <div class="alert alert-danger alert-dismissible clearfix" role="alert">
-                                            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                                                <span aria-hidden="true">&times;</span>
-                                            </button>
-                                            <ul>
-                                                {% for error in field.errors %}
-                                                    <li>{{ error }}</li>
-                                                {% endfor %}
-                                            </ul>
-                                        </div>
-                                    {% endif %}
-                                </div>
-                            {% endfor %}
-
-                            <div class="form-group">
-                                <div class="col-md-12 text-center">
-                                    <p><b>{% trans 'The file size shouldnt exceed 10MB' %}</b></p>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <div class="col-md-12">
-                                     <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
-                                    <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
-                                </div>
-                            </div>
-                        </fieldset>
-                    </form>
-                <!-- .end Card -->
-              </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-{% block script_file %}
-
-    {# // <script src="{% static 'js/file.js' %}"></script> #}
-    <script type="text/javascript">
-      $("#form-update-exercise").submit(function(event) {
-            var data = new FormData($('#form-update-exercise').get(0));
-            $.ajax({
-                url: "{% url 'course:exercise:update_exercise' exercise.slug %}",
-                type: $("#form-update-exercise").attr('method'),
-                data: data,
-                cache: false,
-                processData: false,
-                contentType: false,
-                success: function(data) {
-                    $('#Carrinho').modal('hide');
-                    $('#file_edit_{{ exercise.slug }}').replaceWith(data);
-                    $('#file_{{ exercise.slug }}').replaceWith(data);
-                },
-                error: function(data){
-                    $('.erro-update').html(data.responseText);
-                    $('.modal-backdrop').remove();
-                    $('#Carrinho').modal();
-                }
-            });
-            event.preventDefault();
-          });
-  </script>
-{% endblock script_file %}
-<!-- EndModal -->
 \ No newline at end of file
@@ -1,25 +0,0 @@
-from django import template
-from exercise.models import Exercise
-
-register = template.Library()
-
-
-@register.inclusion_tag('exercise/exercise_list.html')
-def list_topic_exercise(request, topic):
-    context = {
-        'request': request,
-    }
-    context['exercises'] = Exercise.objects.filter(topic=topic)
-
-    return context
-
-
-@register.inclusion_tag('exercise/exercise_edit.html')
-def list_topic_exercise_edit(request, topic):
-    context = {
-        'request': request,
-    }
-    context['exercises'] = Exercise.objects.filter(topic=topic)
-    context['topic'] = topic
-
-    return context
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
@@ -1,9 +0,0 @@
-from django.conf.urls import url
-from . import views
-
-urlpatterns = [
-    url(r'^create_exercise/(?P<slug>[\w_-]+)/$', views.CreateExercise.as_view(), name='create_exercise'),
-    url(r'^delete_exercise/(?P<slug>[\w_-]+)/$', views.DeleteExercise.as_view(), name='delete_exercise'),
-    url(r'^update_exercise/(?P<slug>[\w_-]+)/$', views.UpdateExercise.as_view(), name='update_exercise'),
-    url(r'^render-exercise/(?P<id>[0-9]+)/$', views.render_exercise, name='render_exercise'),
-]
@@ -1,253 +0,0 @@
-from .forms import ExerciseForm, UpdateExerciseForm
-from .models import Exercise
-from core.decorators import log_decorator
-from core.mixins import LogMixin, NotificationMixin
-from core.models import Log, MimeType
-from courses.models import Topic
-from datetime import datetime
-from django.conf import settings
-from django.contrib import messages
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django.core.urlresolvers import reverse_lazy
-from django.shortcuts import render, get_object_or_404, redirect
-from django.urls import reverse
-from django.views import generic
-from files.utils import mime_type_to_material_icons
-from rolepermissions.mixins import HasRoleMixin
-from rolepermissions.verifications import has_role
-from users.models import User
-
-
-class CreateExercise(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMixin, generic.CreateView):
-    log_component = 'exercise'
-    log_resource = 'exercise'
-    log_action = 'create'
-    log_component = {}
-
-    allowed_roles = ['professor', 'student']
-    login_url = reverse_lazy("core:home")
-    redirect_field_name = 'next'
-    model = Exercise
-    template_name = 'exercise/create_exercise.html'
-    form_class = ExerciseForm
-    success_url = reverse_lazy('course:exercise:render_exercise')
-
-    log_component = "subject"
-    log_resource = "exercise"
-    log_action = "create"
-    log_context = {}
-
-    def form_invalid(self, form, **kwargs):
-        context = super(CreateExercise, self).form_invalid(form)
-        context.status_code = 400
-
-        return context
-
-    def form_valid(self, form):
-        self.object = form.save(commit = False)
-        topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
-        self.object.topic = topic
-
-        # Set MimeType
-        exercise = self.request.FILES['file']
-        try:
-            if exercise:
-                exercise_type = exercise.content_type
-
-                # Check if exist a mimetype in database
-                try:
-                    self.object.file_type = MimeType.objects.get(typ = exercise_type)
-                # Create if not
-                except:
-                    mtype = MimeType.objects.create(
-                        typ = exercise_type,
-                        icon = mime_type_to_material_icons[exercise_type]
-                    )
-                    mtype.save()
-                    self.object.file_type = mtype
-        except:
-            print('Exercise not uploaded')
-
-        self.object.save()
-        self.object.professors = topic.subject.professors.all()
-        self.object.students = topic.subject.students.all()
-        self.object.save()
-        #CREATE LOG 
-        self.log_context['topic_id'] = topic.id
-        self.log_context['topic_name'] = topic.name
-        self.log_context['topic_slug'] = topic.slug
-        self.log_context['subject_id'] = topic.subject.id
-        self.log_context['subject_name'] = topic.subject.name
-        self.log_context['subject_slug'] = topic.subject.slug
-
-        super(CreateExercise, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
-
-
-
-        #CREATE NOTIFICATION
-        super(CreateExercise, self).createNotification(message="uploaded a Exercise "+ self.object.name_exercise, actor=self.request.user,
-            resource_name=self.object.name_exercise, resource_link= reverse('course:view_topic', args=[self.object.topic.slug]), 
-            users=self.object.topic.subject.students.all())
-
-        self.log_context['exercise_id'] = self.object.id
-        self.log_context['exercise_name'] = self.object.name_exercise
-        self.log_context['topic_id'] = self.object.topic.id
-        self.log_context['topic_name'] = self.object.topic.name
-        self.log_context['topic_slug'] = self.object.topic.slug
-        self.log_context['subject_id'] = self.object.topic.subject.id
-        self.log_context['subject_name'] = self.object.topic.subject.name
-        self.log_context['subject_slug'] = self.object.topic.subject.slug
-        self.log_context['course_id'] = self.object.topic.subject.course.id
-        self.log_context['course_name'] = self.object.topic.subject.course.name
-        self.log_context['course_slug'] = self.object.topic.subject.course.slug
-        self.log_context['course_category_id'] = self.object.topic.subject.course.category.id
-        self.log_context['course_category_name'] = self.object.topic.subject.course.category.name
-
-        super(CreateExercise, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
-
-        return self.get_success_url()
-
-    def get_context_data(self, **kwargs):
-        context = super(CreateExercise, self).get_context_data(**kwargs)
-        topic = get_object_or_404(Topic, slug=self.kwargs.get('slug'))
-        context['topic'] = topic
-        context['subject'] = topic.subject
-        context['subjects'] = topic.subject.course.subjects.all()
-        context['form'] = self.form_class
-
-        try:
-            context['latest_exercise'] = Exercise.objects.latest('id')
-        except:
-            pass
-        return context
-
-    def get_success_url(self):
-        self.success_url = redirect('course:exercise:render_exercise', id = self.object.id)
-        
-        return self.success_url
-
-
-def render_exercise(request, id):
-    template_name = 'exercise/render_exercise.html'
-    exercise = get_object_or_404(Exercise, id = id)
-
-    context = {
-        'exercise': exercise
-    }
-
-    log_context = {}
-    log_context['exercise_id'] = exercise.id
-    log_context['exercise_name'] = exercise.name_exercise
-    log_context['topic_id'] = exercise.topic.id
-    log_context['topic_name'] = exercise.topic.name
-    log_context['topic_slug'] = exercise.topic.slug
-    log_context['subject_id'] = exercise.topic.subject.id
-    log_context['subject_name'] = exercise.topic.subject.name
-    log_context['subject_slug'] = exercise.topic.subject.slug
-    log_context['course_id'] = exercise.topic.subject.course.id
-    log_context['course_name'] = exercise.topic.subject.course.name
-    log_context['course_slug'] = exercise.topic.subject.course.slug
-    log_context['course_category_id'] = exercise.topic.subject.course.category.id
-    log_context['course_category_name'] = exercise.topic.subject.course.category.name
-
-    request.log_context = log_context
-
-    return render(request, template_name, context)
-
-
-class UpdateExercise(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.UpdateView):
-    log_component = 'exercise'
-    log_resource = 'exercise'
-    log_action = 'update'
-    log_context = {}
-
-    allowed_roles = ['student']
-    login_url = reverse_lazy("core:home")
-    redirect_field_name = 'next'
-    model = Exercise
-    template_name = 'exercise/update_exercise.html'
-    form_class = UpdateExerciseForm
-    context_object_name = 'exercise'
-    success_url = reverse_lazy('course:exercise:render_exercise')
-
-    def form_invalid(self, form, **kwargs):
-        context = super(UpdateExercise, self).form_invalid(form)
-        context.status_code = 400
-
-        return context
-
-    
-    def form_valid(self, form):
-        self.object = form.save()
-
-        self.log_context['exercise_id'] = self.object.id
-        self.log_context['exercise_name'] = self.object.name
-        self.log_context['topic_id'] = self.object.topic.id
-        self.log_context['topic_name'] = self.object.topic.name
-        self.log_context['topic_slug'] = self.object.topic.slug
-        self.log_context['subject_id'] = self.object.topic.subject.id
-        self.log_context['subject_name'] = self.object.topic.subject.name
-        self.log_context['subject_slug'] = self.object.topic.subject.slug
-        self.log_context['course_id'] = self.object.topic.subject.course.id
-        self.log_context['course_name'] = self.object.topic.subject.course.name
-        self.log_context['course_slug'] = self.object.topic.subject.course.slug
-        self.log_context['course_category_id'] = self.object.topic.subject.course.category.id
-        self.log_context['course_category_name'] = self.object.topic.subject.course.category.name
-
-        super(UpdateExercise, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
-
-        return super(UpdateExercise, self).form_valid(form)
-
-    def get_object(self, queryset=None):
-        return get_object_or_404(Exercise, slug = self.kwargs.get('slug'))
-
-    def get_success_url(self):
-        self.success_url = reverse_lazy('course:exercise:render_exercise', args = (self.object.id, ))
-        
-        return self.success_url
-
-
-class DeleteExercise(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.DeleteView):
-    log_component = 'exercise'
-    log_resource = 'exercise'
-    log_action = 'delete'
-    log_context = {}
-
-    allowed_roles = ['student']
-    login_url = reverse_lazy("core:home")
-    redirect_field_name = 'next'
-    model = Exercise
-    template_name = 'exercise/delete_exercise.html'
-
-    def dispatch(self, *args, **kwargs):
-        exercise = get_object_or_404(Exercise, slug = self.kwargs.get('slug'))
-        if(not (exercise.topic.owner == self.request.user) and not(has_role(self.request.user, 'system_admin')) ):
-            return self.handle_no_permission()
-        return super(DeleteExercise, self).dispatch(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        context = super(DeleteExercise, self).get_context_data(**kwargs)
-        context['course'] = self.object.topic.subject.course
-        context['subject'] = self.object.topic.subject
-        context['exercise'] = self.object
-        context["topic"] = self.object.topic
-        return context
-
-    def get_success_url(self):
-        self.log_context['exercise_id'] = self.object.id
-        self.log_context['exercise_name'] = self.object.name
-        self.log_context['topic_id'] = self.object.topic.id
-        self.log_context['topic_name'] = self.object.topic.name
-        self.log_context['topic_slug'] = self.object.topic.slug
-        self.log_context['subject_id'] = self.object.topic.subject.id
-        self.log_context['subject_name'] = self.object.topic.subject.name
-        self.log_context['subject_slug'] = self.object.topic.subject.slug
-        self.log_context['course_id'] = self.object.topic.subject.course.id
-        self.log_context['course_name'] = self.object.topic.subject.course.name
-        self.log_context['course_slug'] = self.object.topic.subject.course.slug
-        self.log_context['course_category_id'] = self.object.topic.subject.course.category.id
-        self.log_context['course_category_name'] = self.object.topic.subject.course.category.name
-
-        super(DeleteExercise, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
-
-        return reverse_lazy('course:view_topic', kwargs={'slug' : self.object.topic.slug})
 \ No newline at end of file
...	...	@@ -60,7 +60,6 @@ INSTALLED_APPS = [
60	60	'poll',
61	61	'links',
62	62	'files',
63		- 'exercise',
64	63
65	64	]
66	65
...	...
...	...	@@ -23,7 +23,6 @@ urlpatterns = [
23	23	url(r'^home/', include('app.urls', namespace = 'app')),
24	24	url(r'^courses/', include('courses.urls', namespace = 'course')),
25	25	url(r'^users/', include('users.urls', namespace = 'users')),
26		- url(r'^exercise/', include('exercise.urls', namespace = 'exercise')),
27	26	url(r'^admin/', admin.site.urls),
28	27	url(r'^', include('core.urls', namespace = 'core')),
29	28	#API
...	...
1		-{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access list_topic_exercises %}
	1	+{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access %}
2	2	{% professor_subject topic.subject user as professor_links %}
3	3
4	4	{% block javascript %}
...	...
1		-{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access list_topic_exercises course_value_field %}
	1	+{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access course_value_field %}
2	2
3	3	<form class="" id="form_topic_update_{{topic.slug}}" method="post" action="">
4	4	{% csrf_token %}
...	...	@@ -84,7 +84,6 @@
84	84	<ul class="dropdown-menu" aria-labelledby="dLabel">
85	85	<li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
86	86	<li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#requisicoes_ajax');">{% trans 'Create Poll' %}</a></li>
87		- <li><a href="javascript:modal.get('{% url 'course:exercise:create_exercise' topic.slug %}', '#createExercisesModal','#requisicoes_ajax')">{% trans 'Delivery Material' %}</a></li>
88	87	<li><a href="{% url 'course:exam:create_exam' topic.slug %}">{% trans 'Create exam' %}</a></li>
89	88	</ul>
90	89	</div>
...	...
1		-{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access list_topic_exercises %}
	1	+{% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access %}
2	2	<!-- Block with Log info -->
3	3	<input type="hidden" class="log_id" value="{{ topic_log_id }}" />
4	4	<input type="hidden" class="log_url" value="{% url 'course:topic_log' topic.id %}" />
...	...	@@ -51,7 +51,7 @@
51	51	<ul class="dropdown-menu" aria-labelledby="dLabel">
52	52	<li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
53	53	<li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#requisicoes_ajax');">{% trans 'Create Poll' %}</a></li>
54		- <li><a href="javascript:modal.get('{% url 'course:exercise:create_exercise' topic.slug %}', '#createExercisesModal','#requisicoes_ajax')">{% trans 'Delivery Material' %}</a></li>
	54	+
55	55	<li><a href="{% url 'course:exam:create_exam' topic.slug %}">{% trans 'Create exam' %}</a></li>
56	56	</ul>
57	57	</div>
...	...	@@ -61,7 +61,7 @@
61	61	<ul>
62	62	{% list_topic_poll request topic %}
63	63	{% list_topic_foruns request topic %}
64		- {% list_topic_exercise request topic %}
	64	+
65	65	</ul>
66	66	</div>
67	67	{% endif %}
...	...
...	...	@@ -33,7 +33,6 @@ urlpatterns = [
33	33	url(r'^upload-material/$', views.UploadMaterialView.as_view(), name='upload_material'),
34	34	url(r'^subjects/file-material-view/(?P<slug>[\w_-]+)/$', views.FileMaterialView.as_view(), name='file_material_view'),
35	35	url(r'^links/',include('links.urls',namespace = 'links')),
36		- url(r'^exercise/', include('exercise.urls', namespace='exercise')),
37	36	url(r'^topic/(?P<topic>[\w_-]+)/$', views.topic_log, name='topic_log'),
38	37	url(r'^(?P<slug>[\w_-]+)/', include([
39	38	url(r'^$', views.CourseView.as_view(), name='view'),
...	...
...	...	@@ -16,7 +16,7 @@ from django.shortcuts import get_object_or_404
16	16	from django.urls import reverse
17	17	from django.utils.translation import ugettext_lazy as _
18	18	from django.views import generic
19		-from exercise.models import Exercise
	19	+
20	20	from files.forms import FileForm
21	21	from files.models import TopicFile
22	22	from functools import reduce
...	...	@@ -623,7 +623,6 @@ class SubjectsView(AccessMixin, LogMixin, generic.ListView):
623	623	context['course'] = subject.course
624	624	context['subject'] = subject
625	625	context['topics'] = Topic.objects.filter(subject = subject)
626		- context['exercise'] = Exercise.objects.filter(topic__subject=subject)
627	626	context['title'] = subject.name
628	627	if has_role(self.request.user,'professor') or has_role(self.request.user,'system_admin'):
629	628	context['files'] = TopicFile.objects.filter(professor__name = self.request.user.name)
...	...
...	...	@@ -1,8 +0,0 @@
1		-from django.contrib import admin
2		-from .models import Exercise
3		-
4		-class ExerciseAdmin(admin.ModelAdmin):
5		- list_display = ['name_exercise']
6		- search_fields = ['name_exercise']
7		-
8		-admin.site.register(Exercise, ExerciseAdmin)
...	...	@@ -1,5 +0,0 @@
1		-from django.apps import AppConfig
2		-
3		-
4		-class ExerciseConfig(AppConfig):
5		- name = 'exercise'
...	...	@@ -1,32 +0,0 @@
1		-from .models import Exercise
2		-from django import forms
3		-from django.core.exceptions import ValidationError, FieldError
4		-from django.utils.translation import ugettext_lazy as _
5		-import requests
6		-
7		-
8		-class ExerciseForm(forms.ModelForm):
9		-
10		- def __init__(self, args, *kwargs):
11		- super(ExerciseForm, self).__init__(args, *kwargs)
12		- self.fields["allowed"].required = False
13		- self.fields["allowed"].initial = False
14		-
15		- # def clean_allowed(self):
16		- # if('allowed' in self.data):
17		- # allowed = self.data['allowed']
18		- # raise forms.ValidationError(_('It is required one these fields.'))
19		- # return True
20		-
21		- class Meta:
22		- model = Exercise
23		- fields = ['name_exercise', 'description',
24		- 'end_date', 'file', 'allowed']
25		-
26		-
27		-class UpdateExerciseForm(forms.ModelForm):
28		-
29		- class Meta:
30		- model = Exercise
31		- fields = ['name_exercise', 'description',
32		- 'end_date', 'file']