From a0df60685457f1f7cbf0885386c1ef1c6577812c Mon Sep 17 00:00:00 2001
From: Davi Galati <davigalati@gmail.com>
Date: Mon, 13 Dec 2021 10:11:50 -0300
Subject: [PATCH 1/4] Fix #128

---
 .../templates/convenios/change_list.html         | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/sigi/apps/convenios/templates/convenios/change_list.html b/sigi/apps/convenios/templates/convenios/change_list.html
index f9aae7b..d8856f7 100644
--- a/sigi/apps/convenios/templates/convenios/change_list.html
+++ b/sigi/apps/convenios/templates/convenios/change_list.html
@@ -14,6 +14,7 @@
       <a class="navbar-brand" href="#">Filtro de datas</a>
       <p class="navbar-text">Use AAAA, AAAA-MM ou AAAA-MM-DD</p>
     </div>
+    <br>
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
     <form class="navbar-form navbar-left" role="extra-search" id="changelist-extrasearch" action="" method="get">
       <div class="form-group">
@@ -23,23 +24,24 @@
         <input type="text" class="form-control search-query" size="10" name="data_retorno_assinatura__lte" value="" id="data_retorno_assinatura__lte">
       </div>
       <div class="form-group">
-        <label for="data_sigad__gte">{% trans 'SIGAD a partir de' %}:</label>
-        <input type="text" class="form-control search-query" size="10" name="data_sigad__gte" value="" id="data_sigad__gte">
-        <label for="data_sigad__lte">{% trans 'até' %}:</label>
-        <input type="text" class="form-control search-query" size="10" name="data_sigad__lte" value="" id="data_sigad__lte">
-      </div>
-      <div class="form-group">
-        <label for="data_sigi__gte">{% trans 'SIGI a partir de' %}:</label>
+        <label for="data_sigi__gte">{% trans 'SIGI de' %}:</label>
         <input type="text" class="form-control search-query" size="10" name="data_sigi__gte" value="" id="data_sigi__gte">
         <label for="data_sigi__lte">{% trans 'até' %}:</label>
         <input type="text" class="form-control search-query" size="10" name="data_sigi__lte" value="" id="data_sigi__lte">
       </div>
+      <br>
       <div class="form-group">
         <label for="data_solicitacao__gte">{% trans 'E-mail a partir de' %}:</label>
         <input type="text" class="form-control search-query" size="10" name="data_solicitacao__gte" value="" id="data_solicitacao__gte">
         <label for="data_solicitacao__lte">{% trans 'até' %}:</label>
         <input type="text" class="form-control search-query" size="10" name="data_solicitacao__lte" value="" id="data_solicitacao__lte">
       </div>
+      <div class="form-group">
+        <label for="data_sigad__gte">{% trans 'SIGAD a partir de' %}:</label>
+        <input type="text" class="form-control search-query" size="10" name="data_sigad__gte" value="" id="data_sigad__gte">
+        <label for="data_sigad__lte">{% trans 'até' %}:</label>
+        <input type="text" class="form-control search-query" size="10" name="data_sigad__lte" value="" id="data_sigad__lte">
+      </div>
       <button type="submit" class="btn btn-default navbar-btn ">
         <span class="glyphicon glyphicon-search"></span>
       </button>

From 2364aa77821e6e1a4d32879a6eae3a7e3d441eec Mon Sep 17 00:00:00 2001
From: Davi Galati <davigalati@gmail.com>
Date: Mon, 13 Dec 2021 10:19:33 -0300
Subject: [PATCH 2/4] Fix #128

---
 sigi/apps/convenios/templates/convenios/change_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sigi/apps/convenios/templates/convenios/change_list.html b/sigi/apps/convenios/templates/convenios/change_list.html
index d8856f7..bc0dfc0 100644
--- a/sigi/apps/convenios/templates/convenios/change_list.html
+++ b/sigi/apps/convenios/templates/convenios/change_list.html
@@ -18,7 +18,7 @@
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
     <form class="navbar-form navbar-left" role="extra-search" id="changelist-extrasearch" action="" method="get">
       <div class="form-group">
-        <label for="data_retorno_assinatura__gte">{% trans 'Conveniadas a partir de' %}:</label>
+        <label for="data_retorno_assinatura__gte">{% trans 'Vigência a partir de' %}:</label>
         <input type="text" class="form-control search-query" size="10" name="data_retorno_assinatura__gte" value="" id="data_retorno_assinatura__gte">
         <label for="data_retorno_assinatura__lte">{% trans 'até' %}:</label>
         <input type="text" class="form-control search-query" size="10" name="data_retorno_assinatura__lte" value="" id="data_retorno_assinatura__lte">

From f423566fbccef7ca14418efcd16743ec73441a07 Mon Sep 17 00:00:00 2001
From: Davi Galati <davigalati@gmail.com>
Date: Mon, 13 Dec 2021 10:25:24 -0300
Subject: [PATCH 3/4] Fix #128

---
 sigi/apps/convenios/templates/convenios/change_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sigi/apps/convenios/templates/convenios/change_list.html b/sigi/apps/convenios/templates/convenios/change_list.html
index bc0dfc0..1c5a553 100644
--- a/sigi/apps/convenios/templates/convenios/change_list.html
+++ b/sigi/apps/convenios/templates/convenios/change_list.html
@@ -24,7 +24,7 @@
         <input type="text" class="form-control search-query" size="10" name="data_retorno_assinatura__lte" value="" id="data_retorno_assinatura__lte">
       </div>
       <div class="form-group">
-        <label for="data_sigi__gte">{% trans 'SIGI de' %}:</label>
+        <label for="data_sigi__gte">{% trans 'SIGI a partir de' %}:</label>
         <input type="text" class="form-control search-query" size="10" name="data_sigi__gte" value="" id="data_sigi__gte">
         <label for="data_sigi__lte">{% trans 'até' %}:</label>
         <input type="text" class="form-control search-query" size="10" name="data_sigi__lte" value="" id="data_sigi__lte">

From efaa62d1c0abab36debc846a26349ead61e7afb0 Mon Sep 17 00:00:00 2001
From: Davi Galati <davigalati@gmail.com>
Date: Thu, 16 Dec 2021 11:19:48 -0300
Subject: [PATCH 4/4] fix #84

---
 sigi/apps/eventos/views.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/sigi/apps/eventos/views.py b/sigi/apps/eventos/views.py
index 8a3adb5..758c8dc 100644
--- a/sigi/apps/eventos/views.py
+++ b/sigi/apps/eventos/views.py
@@ -300,6 +300,13 @@ def deleta_itens_carrinho(request):
 
 @login_required
 def export_csv(request):
+    def rm_rows(lista,reg): 
+        for a in lista: 
+            if a in lista:
+                reg.pop(a,None)
+            else: 
+                pass
+    
     def serialize(r, field):
         value = (getattr(r, 'get_{0}_display'.format(field.name), None) or
                  getattr(r, field.name, ""))
@@ -332,7 +339,16 @@ def export_csv(request):
 
     response = HttpResponse(content_type='text/csv')
     response['Content-Disposition'] = 'attachment; filename=eventos.csv'
+    rm_list = ['Descrição do evento', 'Local do evento', 'Público alvo', 'Motivo do cancelamento', 'Observações_1', 
+    'Observações_2', 'Observações_3', 'Observações_4', 'Observações_5', 'Observações_6', 'Observações_7', 'Observações_8']
 
+  
+
+    for a in rm_list: 
+        if a in head: 
+            head.remove(a)
+        else: 
+            pass 
     writer = csv.DictWriter(response, fieldnames=head)
     writer.writeheader()
 
@@ -366,10 +382,14 @@ def export_csv(request):
                  for f in Convite._meta.fields
                  if f.name not in ('id', 'evento')}
             )
+            rm_rows(rm_list,reg)
             writer.writerow(reg)
+            
         if evento.convite_set.count() == 0:
-            writer.writerow(reg)
+            rm_rows(rm_list,reg)
 
+            writer.writerow(reg)
+            
     return response
 
 @login_required