From 6b1d7771e983b9ddf36090b71da568e995ecc458 Mon Sep 17 00:00:00 2001
From: VictorFabreF <victorfabre@me.com>
Date: Tue, 27 Mar 2018 10:03:24 -0300
Subject: [PATCH 1/2] Fix #1791

---
 sapl/comissoes/forms.py | 42 +++++++++++++++++++++++++++++------------
 sapl/comissoes/views.py |  6 ++++++
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/sapl/comissoes/forms.py b/sapl/comissoes/forms.py
index abcce24f7..b0f1e1867 100644
--- a/sapl/comissoes/forms.py
+++ b/sapl/comissoes/forms.py
@@ -134,6 +134,19 @@ class ComissaoForm(forms.ModelForm):
         model = Comissao
         fields = '__all__'
 
+    def __init__(self, user=None, **kwargs):
+        super(ComissaoForm, self).__init__(**kwargs)
+        inst = self.instance
+        if inst.pk:
+            if inst.tipo.natureza == 'P':
+                self.fields['apelido_temp'].widget.attrs['disabled'] = 'disabled'
+                self.fields['data_instalacao_temp'].widget.attrs['disabled'] = 'disabled'
+                self.fields['data_final_prevista_temp'].widget.attrs['disabled'] = 'disabled'
+                self.fields['data_prorrogada_temp'].widget.attrs['disabled'] = 'disabled'
+                self.fields['data_fim_comissao'].widget.attrs['disabled'] = 'disabled'
+
+
+
     def clean(self):
         super(ComissaoForm, self).clean()
 
@@ -149,18 +162,23 @@ class ComissaoForm(forms.ModelForm):
 
     @transaction.atomic
     def save(self, commit=True):
-        comissao = super(ComissaoForm, self).save(commit)
-        content_type = ContentType.objects.get_for_model(Comissao)
-        object_id = comissao.pk
-        tipo = TipoAutor.objects.get(descricao__icontains='Comiss')
-        nome = comissao.sigla + ' - ' + comissao.nome
-        Autor.objects.create(
-            content_type=content_type,
-            object_id=object_id,
-            tipo=tipo,
-            nome=nome
-        )
-        return comissao
+        inst = self.instance
+        if not inst.pk:
+            comissao = super(ComissaoForm, self).save(commit)
+            content_type = ContentType.objects.get_for_model(Comissao)
+            object_id = comissao.pk
+            tipo = TipoAutor.objects.get(descricao__icontains='Comiss')
+            nome = comissao.sigla + ' - ' + comissao.nome
+            Autor.objects.create(
+                content_type=content_type,
+                object_id=object_id,
+                tipo=tipo,
+                nome=nome
+            )
+            return comissao
+        else:
+            comissao = super(ComissaoForm, self).save(commit)
+            return comissao
 
 
 class ReuniaoForm(ModelForm):
diff --git a/sapl/comissoes/views.py b/sapl/comissoes/views.py
index b085eb83d..7f31bc1ed 100644
--- a/sapl/comissoes/views.py
+++ b/sapl/comissoes/views.py
@@ -127,6 +127,12 @@ class ComissaoCrud(Crud):
         def form_valid(self, form):
             return super(Crud.CreateView, self).form_valid(form)
 
+    class UpdateView(Crud.UpdateView):
+        form_class = ComissaoForm
+
+        def form_valid(self, form):
+            return super(Crud.UpdateView, self).form_valid(form)
+
 
 class MateriasTramitacaoListView(ListView):
     template_name = "comissoes/materias_em_tramitacao.html"

From 79baa59d4c73314f20fdc61171012d22b64128f0 Mon Sep 17 00:00:00 2001
From: VictorFabreF <victorfabre@me.com>
Date: Wed, 28 Mar 2018 13:40:42 -0300
Subject: [PATCH 2/2] Fix #1810 parcialmente

---
 sapl/templates/painel/index.html | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/sapl/templates/painel/index.html b/sapl/templates/painel/index.html
index 505d2c8f5..e4217f695 100644
--- a/sapl/templates/painel/index.html
+++ b/sapl/templates/painel/index.html
@@ -28,7 +28,7 @@
         ul, li {
           list-style-type: none;
         }
-        #sessao_plenaria, #sessao_plenaria_data, #sessao_plenaria_hora_inicio, #message, #cronometro_discurso, #cronometro_aparte, #cronometro_ordem, #relogio, #parlamentares, #votacao, #materia_legislativa_texto, #observacao_materia, #resultado_votacao, #orador {
+        #date, #sessao_plenaria, #sessao_plenaria_data, #sessao_plenaria_hora_inicio, #message, #cronometro_discurso, #cronometro_aparte, #cronometro_ordem, #relogio, #parlamentares, #votacao, #materia_legislativa_texto, #observacao_materia, #resultado_votacao, #orador {
           font-family: Verdana;
         }
       }
@@ -62,7 +62,14 @@
 
     <h2><font color="red"><p align="center"><span id="message"></span></p></font></h2>
 
-    <h2><font color="white"><p align="center"><span id="relogio"></span></p></font></h2>
+    <table style="width:90%">
+      <tr>
+        <td style="text-align:center"><font color="white" size="6"><span id="date"></span></font></td>
+
+        <td style="text-align:center"><font color="white" size="6"><span id="relogio"></span></font></td>
+      </tr>
+    </table>
+
 
     <div class="row container-detail clearfix">
       <div class="row-fluid">
@@ -132,7 +139,11 @@
   </body>
 
   <script type="text/javascript">
-     $(document).ready(function() {
+    var d = new Date();
+    var n = d.toLocaleDateString();
+    document.getElementById("date").innerHTML = n;
+
+      $(document).ready(function() {
          //TODO: replace by a fancy jQuery clock
          function checkTime(i) {
              if (i<10) {i = "0" + i};  // add zero in front of numbers < 10
@@ -269,7 +280,6 @@
 
               if (data['materia_legislativa_texto']){
 
-                //console.debug(presentes_ordem_dia)
                 var votacao = $("#votacao")
 
                 var num_presentes = data["num_presentes"];
@@ -366,11 +376,14 @@
               console.error(err);
            },
            dataType: "json",
-           complete: setTimeout(function() {poll()}, 500),
+           complete: setTimeout(function() {poll()}, 3000),
            timeout: 20000 // TODO: decrease
         })
       })();
-     });
+
+
+
+      });
 
      function show_voto(voto) {
       if (voto == "Sim"){