Ajustes no form de Deliberação Remota

sapl/sdr/forms.py

@@ -4,6 +4,7 @@ from django import forms
 from django.forms import ModelForm
 from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone
+
 from sapl.sdr.models import DeliberacaoRemota
 from sapl.sessao.models import SessaoPlenaria
 
@@ -26,11 +27,12 @@ class DeliberacaoRemotaForm(ModelForm):
 
         widgets = {
             'created_by': forms.HiddenInput(),
+            'inicio': forms.HiddenInput(),
         }
 
     def clean(self):
         cleaned_data = super().clean()
-        
+
         if not self.is_valid():
             return self.cleaned_data
 
@@ -42,60 +44,3 @@ class DeliberacaoRemotaForm(ModelForm):
                 cleaned_data['termino'] = None
 
         return cleaned_data
-
-
-# class DeliberacaoRemotaForm(ModelForm):
-#
-#     logger = logging.getLogger(__name__)
-#
-#     class Meta:
-#         model = DeliberacaoRemota
-#         fields = ['chat_id', 'descricao']
-#     class AutoriaNormaForm(ModelForm):
-#
-#         tipo_autor = ModelChoiceField(label=_('Tipo Autor'),
-#                                       required=False,
-#                                       queryset=TipoAutor.objects.all(),
-#                                       empty_label=_('Selecione'), )
-#
-#         data_relativa = forms.DateField(
-#             widget=forms.HiddenInput(), required=False)
-#
-#         logger = logging.getLogger(__name__)
-#
-#         def __init__(self, *args, **kwargs):
-#             super(AutoriaNormaForm, self).__init__(*args, **kwargs)
-#
-#             row1 = to_row([('tipo_autor', 4),
-#                            ('autor', 4),
-#                            ('primeiro_autor', 4)])
-#
-#             self.helper = SaplFormHelper()
-#             self.helper.layout = Layout(
-#                 Fieldset(_('Autoria'),
-#                          row1, 'data_relativa', form_actions(label='Salvar')))
-#
-#             if not kwargs['instance']:
-#                 self.fields['autor'].choices = []
-#
-#         class Meta:
-#             model = AutoriaNorma
-#             fields = ['tipo_autor', 'autor', 'primeiro_autor', 'data_relativa']
-#
-#         def clean(self):
-#             cd = super(AutoriaNormaForm, self).clean()
-#
-#             if not self.is_valid():
-#                 return self.cleaned_data
-#
-#             autorias = AutoriaNorma.objects.filter(
-#                 norma=self.instance.norma, autor=cd['autor'])
-#             pk = self.instance.pk
-#
-#             if ((not pk and autorias.exists()) or
-#                     (pk and autorias.exclude(pk=pk).exists())):
-#                 self.logger.error(
-#                     "Autor ({}) já foi cadastrado.".format(cd['autor']))
-#                 raise ValidationError(_('Esse Autor já foi cadastrado.'))
-#
-#             return cd

sapl/sdr/migrations/0005_auto_20200402_1313.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-04-02 16:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sdr', '0004_auto_20200331_1933'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='deliberacaoremota',
+            options={'ordering': ['-inicio'], 'verbose_name': 'Deliberação Remota', 'verbose_name_plural': 'Deliberações Remotas'},
+        ),
+        migrations.AlterField(
+            model_name='deliberacaoremota',
+            name='inicio',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Data e Hora de Início'),
+        ),
+    ]

sapl/sdr/models.py

@@ -21,7 +21,7 @@ class DeliberacaoRemota(models.Model):
     titulo = models.CharField(max_length=100, verbose_name=_('Título'))
     descricao = models.CharField(max_length=256, blank=True,
                                  verbose_name=_('Descrição'))
-    inicio = models.DateTimeField(auto_now=timezone.now,
+    inicio = models.DateTimeField(blank=True, null=True,
                                   verbose_name=_('Data e Hora de Início'))
     #TODO: obrigatorio?
     sessao_plenaria = models.ForeignKey(SessaoPlenaria,
@@ -41,7 +41,7 @@ class DeliberacaoRemota(models.Model):
     class Meta:
         verbose_name = _('Deliberação Remota')
         verbose_name_plural = _('Deliberações Remotas')
-        ordering = ['chat_id', 'descricao']
+        ordering = ['-inicio']
 
     def __str__(self):
         return _('%(titulo)s') % {'titulo': self.titulo}

sapl/sdr/views.py

@@ -5,6 +5,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
 from django.core.urlresolvers import reverse, reverse_lazy
 from django.views.generic import TemplateView
+from django.utils import timezone
 
 from sapl.base.models import Autor
 from sapl.crud.base import Crud
@@ -34,6 +35,7 @@ class DeliberacaoRemotaCrud(Crud):
         def get_initial(self):
             initial = super().get_initial()
             initial['created_by'] = self.request.user
+            initial['inicio'] = timezone.now()
             return initial
     
     class UpdateView(Crud.UpdateView):

sapl/templates/sdr/deliberacaoremota_detail.html

@@ -50,27 +50,27 @@
             </div>
         </div>
     </div>
-    {% if user.is_superuser %}
+    <br/>
-            {% if deliberacao.created_by %}
+    <div class="row">
-                <br/>
+        <div class="col-sm-12">
-                <div class="row">
+            <div id="div_id_user" class="form-group">
-                    <div class="col-sm-12">
+                <p class="control-label">Criado por</p>
-                        <div id="div_id_user" class="form-group">
+                <div class="controls">
-                            <p class="control-label">Criado por</p>
+                    <div class="form-control-static">
-                            <div class="controls">
+                        <div class="dont-break-out">
-                                <div class="form-control-static">
+                            <a href="{% url 'sapl.base:user_edit' deliberacao.created_by.pk %}">
-                                    <div class="dont-break-out">
+                                {{ deliberacao.created_by }}
-                                        <a href="{% url 'sapl.base:user_edit' deliberacao.created_by.pk %}">
+                            </a>
-                                            {{ deliberacao.created_by }}
-                                          </a>
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                     </div>
                 </div>
-            {% endif %}
+            </div>
-    {% endif %}
+        </div>
+    </div>
     <br/>
-    <a href="{% url 'sapl.sdr:chat-session' object.pk %}"><strong>Link da sessão de vídeo</strong></a>
+    {% if not user.is_anonymous %}
+        {% if not deliberacao.finalizada %}
+            <a href="{% url 'sapl.sdr:chat-session' object.pk %}"><strong>Link da sessão de vídeo</strong></a>
+        {% endif %}
+    {% endif %}
 {% endblock detail_content %}