Merge

ailsoncgt
2 parents f60ad110 ba2e1913
Showing 12 changed files with 145 additions and 33 deletions Show diff stats
courses/templates/subject/form_view_teacher.html
exercise/forms.py
exercise/migrations/0004_auto_20161121_0922.py
exercise/migrations/0005_exercise_allowed.py
exercise/migrations/0006_auto_20161121_1008.py
exercise/migrations/0007_auto_20161121_1019.py
exercise/models.py
exercise/templates/exercise/card_topic_exercises.html
exercise/templates/exercise/create_exercise.html
exercise/templates/exercise/exercise_edit.html
exercise/templates/exercise/exercise_list.html
users/migrations/0002_auto_20161121_0922.py
-{% 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 list_topic_exercises %}
 <div class="panel panel-default cards-detail">
   <div class="panel-heading topic">
@@ -56,7 +56,7 @@
       {# materiais do topico#}
       <div class="row">
-        <div class="col-xs-4 col-md-4">
+        <div class="col-xs-6 col-md-6">
           <div class="resource_inline">
             <h4>{% trans 'Material' %}</h4>
           </div>
@@ -90,7 +90,7 @@
         </div>
         {# avaliações do topico #}
-        <div class="col-xs-4 col-md-4">
+        <div class="col-xs-6 col-md-6">
           <div class="resource_inline">
             <h4>{% trans 'Activities' %}</h4>
           </div>
@@ -101,8 +101,8 @@
               <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: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>
               </ul>
             </div>
           </div>
@@ -112,6 +112,7 @@
             <ul>
               {% list_topic_poll request topic %}
               {% list_topic_foruns request topic %}
+              {% list_topic_exercise request topic %}
             </ul>
           </div>
           <div class="editation editation_{{topic.slug}}">
@@ -122,19 +123,14 @@
               {% list_topic_foruns request topic %}
             </ul>
           </div>
-        </div>
-          <div class="resource_inline">
-            <h4>{% trans 'Exercises' %}</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 general exercise' %}</a></li>
-              </ul>
-            </div>
+          <div class="editation editation_{{topic.slug}}">
+
+            {# exercícios do tópico no modo de edição #}
+            <ul>
+              {% list_topic_exercise_edit request topic %}
+            </ul>
           </div>
+        </div>
       </div>
       {# opções de cancelar e editar no modo de edição #}
@@ -7,15 +7,26 @@ 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', 'init_date',
-                    'end_date', 'file']
+        fields = ['name_exercise', 'description',
+                    'end_date', 'file', 'allowed']
 class UpdateExerciseForm(forms.ModelForm):
     class Meta:
         model = Exercise
-        fields = ['name_exercise', 'description', 'init_date',
-                    'end_date', 'grade', 'file']
+        fields = ['name_exercise', 'description',
+                    'end_date', 'file']
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-21 12:22
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('exercise', '0003_auto_20161118_2242'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='exercise',
+            name='init_date',
+        ),
+        migrations.AlterField(
+            model_name='exercise',
+            name='end_date',
+            field=models.DateField(verbose_name='Delivery Date'),
+        ),
+    ]
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-21 12:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('exercise', '0004_auto_20161121_0922'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='exercise',
+            name='allowed',
+            field=models.BooleanField(default=False, verbose_name='Allowed delivery after end date?'),
+        ),
+    ]
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-21 13:08
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import exercise.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('exercise', '0005_exercise_allowed'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exercise',
+            name='file',
+            field=models.FileField(upload_to=exercise.models.file_path, verbose_name='File'),
+        ),
+    ]
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-21 13:19
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('exercise', '0006_auto_20161121_1008'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exercise',
+            name='file',
+            field=models.FileField(upload_to='uploads/%Y/%m/%d'),
+        ),
+    ]
@@ -23,14 +23,14 @@ class Exercise(models.Model):
     name_exercise = models.CharField(_('Name'), max_length=100)
     description = models.TextField(_('Description'), blank=True)
-    init_date = models.DateField(_('Begin of Subject Date'))
-    end_date = models.DateField(_('End of Subject Date'))
+    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
 \ No newline at end of file
+        return self.name_exercise
@@ -8,7 +8,7 @@
           <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">Describe: </label><br>
+              <label class="col-md-2 col-xs-2 col-sm-2 control-label">{% trans 'Description' %}: </label><br>
               {% if exercise.description%}
                 {{exercise.description}}
               {% else %}
@@ -16,15 +16,14 @@
               {% endif %}
             </div>
             <div class="form-group">
-              <label class="col-md-2 col-xs-2 col-sm-2 control-label">Opening: </label><br>{{exercise.init_date}}
             </div>
             <div class="form-group">
-              <label class="col-md-2 col-xs-2 col-sm-2 control-label">Ending: </label><br>{{exercise.end_date}}
+              <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">NOTA: 
+              <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">
@@ -5,7 +5,7 @@
     <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 Exercise' %}</h4>
+        <h4 class="modal-title" id="createExercise">{% trans 'Create a New Material' %}</h4>
       </div>
       <div class="modal-body">
         <!-- Card -->
@@ -41,10 +41,10 @@
                   </span>
                 </div>
                 {% else %}
-                {% render_field field class='form-control input-sm' %}
-                <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+                  {% render_field field class='form-control input-sm' %}
+                  <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
                 {% endif %}
-              </div>
+                </div>
               {% if field.errors %}
               <div class="alert alert-danger alert-dismissible clearfix" role="alert">
@@ -97,6 +97,7 @@
         $('#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();
@@ -2,6 +2,6 @@
 <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('', '#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-link" aria-hidden="true"></i>  <a href="javascript:modal.get('', '#viewExerciseModal','#requisicoes_ajax')">{{exercise.name}}</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>
 {% 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-link" aria-hidden="true"></i>  <a href="{{exercise.file.url}}">{{exercise.name}}</a></li>
+    <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>
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-21 12:22
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='is_staff',
+            field=models.BooleanField(default=False, verbose_name='Administrator'),
+        ),
+    ]
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-11-21 12:22
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations, models
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('exercise', '0003_auto_20161118_2242'),
	12	+ ]
	13	+
	14	+ operations = [
	15	+ migrations.RemoveField(
	16	+ model_name='exercise',
	17	+ name='init_date',
	18	+ ),
	19	+ migrations.AlterField(
	20	+ model_name='exercise',
	21	+ name='end_date',
	22	+ field=models.DateField(verbose_name='Delivery Date'),
	23	+ ),
	24	+ ]
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-11-21 12:50
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations, models
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('exercise', '0004_auto_20161121_0922'),
	12	+ ]
	13	+
	14	+ operations = [
	15	+ migrations.AddField(
	16	+ model_name='exercise',
	17	+ name='allowed',
	18	+ field=models.BooleanField(default=False, verbose_name='Allowed delivery after end date?'),
	19	+ ),
	20	+ ]
@@ -0,0 +1,21 @@		@@ -0,0 +1,21 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-11-21 13:08
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations, models
	6	+import exercise.models
	7	+
	8	+
	9	+class Migration(migrations.Migration):
	10	+
	11	+ dependencies = [
	12	+ ('exercise', '0005_exercise_allowed'),
	13	+ ]
	14	+
	15	+ operations = [
	16	+ migrations.AlterField(
	17	+ model_name='exercise',
	18	+ name='file',
	19	+ field=models.FileField(upload_to=exercise.models.file_path, verbose_name='File'),
	20	+ ),
	21	+ ]
	@@ -2,6 +2,6 @@		@@ -2,6 +2,6 @@
2	<div id="exercise-topic{{ topic.id }}-exercises-edit">	2	<div id="exercise-topic{{ topic.id }}-exercises-edit">
3	{% for exercise in exercises %}	3	{% for exercise in exercises %}
4	<li class="icon_edit_remove" id = "exercise_edit_icon_{{ exercise.slug }}"> <a href="javascript:modal.get('', '#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>	4	<li class="icon_edit_remove" id = "exercise_edit_icon_{{ exercise.slug }}"> <a href="javascript:modal.get('', '#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>
5	- <li id = "exercise_edit_{{ exercise.slug }}"><i class="fa fa-link" aria-hidden="true"></i> <a href="javascript:modal.get('', '#viewExerciseModal','#requisicoes_ajax')">{{exercise.name}}</a></li>	5	+ <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>
6	{% endfor %}	6	{% endfor %}
7	</div>	7	</div>
1	{% load static i18n list_topic_foruns permission_tags %}	1	{% load static i18n list_topic_foruns permission_tags %}
2	<div id="list-topic{{ topic.id }}-exercises">	2	<div id="list-topic{{ topic.id }}-exercises">
3	{% for exercise in exercises %}	3	{% for exercise in exercises %}
4	- <li id="exercise_{{ exercise.slug }}"><i class="fa fa-link" aria-hidden="true"></i> <a href="{{exercise.file.url}}">{{exercise.name}}</a></li>	4	+ <li id="exercise_{{ exercise.slug }}"><i class="fa fa-file" aria-hidden="true"></i> <a href="{{exercise.file.url}}">{{exercise.name_exercise}}</a></li>
5	{% endfor %}	5	{% endfor %}
6	</div>	6	</div>