fix #1801

sapl/sessao/migrations/0024_auto_20181004_0720.py → sapl/sessao/migrations/0024_auto_20181004_1126.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-10-04 10:20
+# Generated by Django 1.9.13 on 2018-10-04 14:26
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
                 ('data', models.DateField(verbose_name='Data')),
                 ('hora', models.CharField(max_length=5, verbose_name='Horário (hh:mm)')),
                 ('observacao', models.TextField(blank=True, max_length=150, verbose_name='Observação')),
-                ('ausencia', models.PositiveIntegerField(choices=[(1, 'Sessão'), (2, 'Matéria')], default=1, verbose_name='Ausente em')),
+                ('ausencia', models.PositiveIntegerField(choices=[(1, 'Matéria'), (2, 'Sessão')], default=1, verbose_name='Ausente em')),
                 ('parlamentar', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='parlamentares.Parlamentar')),
                 ('sessao_plenaria', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sessao.SessaoPlenaria', verbose_name='Sessão Plenária')),
             ],

sapl/sessao/models.py

@@ -583,8 +583,8 @@ class TipoJustificativa(models.Model):
 @reversion.register()
 class JustificativaAusencia(models.Model):
     TIPO_AUSENCIA_CHOICES = Choices(
-        (1, 'sessao', 'Sessão'),
-        (2, 'materia', 'Matéria'),
+        (1, 'materia', 'Matéria'),
+        (2, 'sessao', 'Sessão'),
     )
     parlamentar = models.ForeignKey(Parlamentar, on_delete=models.PROTECT)
     sessao_plenaria = models.ForeignKey(SessaoPlenaria,

sapl/sessao/views.py

@@ -2905,6 +2905,7 @@ class JustificativaAusenciaCrud(MasterDetailCrud):
     public = [RP_LIST, RP_DETAIL, ]
     parent_field = 'sessao_plenaria'
 
+
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
         context = self.get_context_data(object=self.object)
@@ -2915,7 +2916,23 @@ class JustificativaAusenciaCrud(MasterDetailCrud):
 
         parlamentares_sessao = [p.parlamentar for p in presencas]
 
-        context.update({'presenca_sessao': parlamentares_sessao})       
+        context.update({'presenca_sessao': parlamentares_sessao})  
+
+        expedientes = ExpedienteMateria.objects.filter(
+          sessao_plenaria_id=self.object.id) 
+
+        expedientes_materia = [e.materia for e in expedientes]
+
+        context.update({'expedientes': expedientes})  
+
+        ordens = OrdemDia.objects.filter(
+          sessao_plenaria_id=self.object.id)
+
+        ordem_materia = [o.materia for o in ordens]
+
+        context.update({'ordens': ordens})
+
+        import ipdb; ipdb.set_trace()
         return self.render_to_response(context)
 
     class BaseMixin(MasterDetailCrud.BaseMixin):

sapl/templates/sessao/justificativaausencia_create.html

@@ -1,12 +1,16 @@
 {% extends "crud/detail.html" %}
 {% load i18n %}
 {% load crispy_forms_tags %}
+{% load common_tags %}
 {% block actions %}{% endblock %}
 {% block detail_content %}
 	{% crispy form %}
-	<div class="output">
-	  <div id="show_materia" class="show_materia">  “Good artists copy, great artists steal” Pablo Picasso</div>
-	</div>
+
+<form method="post">
+	{% csrf_token %}
+			<div class="output">
+			  <div id="show_materia" class="show_materia" type="hidden"> {{ expedientes_materia }}</div>
+			</div>
 {% endblock detail_content %}
 
 
@@ -16,10 +20,10 @@
     $(function () {
       $("#id_ausencia").change(function() {
         var val = $(this).val();
-        if(val === "show_materia") {
+        if(val === "1") {
             $("#show_materia").show();
         }
-        else if(val === "show_materia") {
+        else if(val === "2") {
             $("#show_materia").hide();
         }
       });