From 91ce78e008ca03f86d771219791b9a3096a5eab8 Mon Sep 17 00:00:00 2001
From: ulyssesBML <ulysses3353@gmail.com>
Date: Tue, 20 Oct 2020 14:23:14 -0300
Subject: [PATCH] =?UTF-8?q?Add=20observa=C3=A7=C3=A3o=20para=20leitura=20e?=
 =?UTF-8?q?m=20bloco?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sapl/sessao/views.py                          |  1 +
 .../sessao/votacao/votacao_bloco.html         | 39 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py
index fcb8d5336..664045298 100755
--- a/sapl/sessao/views.py
+++ b/sapl/sessao/views.py
@@ -4157,6 +4157,7 @@ class LeituraEmBloco(PermissionRequiredForAppCrudMixin, TemplateView):
                 rl = RegistroLeitura(materia=ordem.materia,ordem=ordem,user=request.user,ip=get_client_ip(request))
             elif origem == 'expediente':
                 rl = RegistroLeitura(materia=ordem.materia,expediente=ordem,user=request.user,ip=get_client_ip(request))
+            rl.observacao = self.request.POST.get('observacao',"")
             rl.save()
             ordem.save()
 
diff --git a/sapl/templates/sessao/votacao/votacao_bloco.html b/sapl/templates/sessao/votacao/votacao_bloco.html
index 855b7a443..a1b997249 100644
--- a/sapl/templates/sessao/votacao/votacao_bloco.html
+++ b/sapl/templates/sessao/votacao/votacao_bloco.html
@@ -99,7 +99,30 @@
             <a href="{% url 'sapl.sessao:ordemdia_list' pk %}" class="btn btn-warning mb-3" id="but_cancel">Voltar</a>
             <input type="hidden" id="origem" name="origem" value="ordem">
         {% endif %}
-        <input type="submit" value="Registrar votação" class="btn btn-primary mb-3 float-right" id="but_reg">
+        <a onclick="submit_button()" class="btn btn-primary mb-3 float-right" id="but_reg">Registrar votação</a>
+
+        <div class="modal fade" id="leituraModal" tabindex="-1" role="dialog" aria-labelledby="leituraModalLabel" aria-hidden="true">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+              <div class="modal-header">
+                <h5 class="modal-title" id="leituraModalLabel">Observação da Leitura</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                  <span aria-hidden="true">&times;</span>
+                </button>
+              </div>
+              <div class="modal-body">
+                 <div class="form-group">
+                    <label for="message-text" class="col-form-label">Observação:</label>
+                    <textarea class="form-control" id="observacao" name="observacao"></textarea>
+                </div>
+              </div>
+              <div class="modal-footer">
+                <a type="button" class="btn btn-secondary" data-dismiss="modal">Fechar</a>
+                <input type="submit" class="btn btn-primary mb-3 float-right" value="Salvar">
+              </div>
+            </div>
+          </div>
+        </div>
     </form>
     {% endif %}
 
@@ -155,7 +178,8 @@
                 document.getElementById('but_reg').style.display = '';
                 document.getElementById('nenhuma_mat').style.display = 'none';
             }
-
+            
+            $("#but_reg").text("Registrar Votação")
             if(tipo_votacao == "1"){
                 $('#form').attr("action", "{% url 'sapl.sessao:votacaoblocosimb' pk %}")
             }
@@ -163,8 +187,19 @@
                 $('#form').attr("action", "{% url 'sapl.sessao:votacaobloconom' pk %}")
             }
             else{
+                $("#but_reg").text("Registrar Leitura")
                 $('#form').attr("action", "{% url 'sapl.sessao:leitura_em_bloco' pk %}")
             }
         }
+
+        function submit_button(){
+            var radioValue = $("input[name='tipo_votacao']:checked").val();
+            if (radioValue == 4){
+                $('#leituraModal').modal('show')
+            }
+            else{
+                $("#form").submit()
+            }
+        }
 	</script>
 {% endblock extra_js%}