Merge pull request #339 from gitnnolabs/refactory

Nova lista de universo e na lista de objetos e ano aleatório para os repositórios

education_directory/search_indexes.py

@@ -1,8 +1,10 @@
 # coding: utf-8
+import random
 from haystack import indexes
 from django.conf import settings
 from django.utils.translation import gettext as _
 
+
 from education_directory import models
 
 
@@ -59,6 +61,9 @@ def prepare_year(self, obj):
 
         if obj.end_date:
             return obj.end_date.year
+
+        if not obj.end_date and not obj.start_date:
+            return random.randint(2014, 2023)
 
     def prepare_created(self, obj):
         return obj.created.isoformat()

event_directory/search_indexes.py

@@ -1,4 +1,5 @@
 # coding: utf-8
+import random 
 from haystack import indexes
 from django.conf import settings
 from django.utils.translation import gettext as _
@@ -60,6 +61,9 @@ def prepare_year(self, obj):
 
         if obj.end_date:
             return obj.end_date.year
+
+        if not obj.end_date and not obj.start_date:
+            return random.randint(2014, 2023)
 
     def prepare_created(self, obj):
         return obj.created.isoformat()

infrastructure_directory/search_indexes.py

@@ -1,4 +1,5 @@
 # coding: utf-8
+import random 
 from haystack import indexes
 from django.conf import settings
 from django.utils.translation import gettext as _
@@ -29,6 +30,7 @@ class InfraStructureIndex(indexes.SearchIndex, indexes.Indexable):
     states = indexes.MultiValueField(null=True)
     regions = indexes.MultiValueField(null=True)
     thematic_level_0 = indexes.MultiValueField(null=True)
+    year = indexes.CharField(null=True)
 
     text = indexes.CharField(document=True, use_template=True)
     title = indexes.CharField(model_attr="title", null=True)
@@ -55,6 +57,9 @@ class InfraStructureIndex(indexes.SearchIndex, indexes.Indexable):
     creator = indexes.CharField(null=False)
     updated_by = indexes.CharField(null=False)
 
+    def prepare_year(self, obj):
+        return random.randint(2014, 2023)
+
     def prepare_created(self, obj):
         return obj.created.isoformat()
 

policy_directory/search_indexes.py

@@ -1,4 +1,5 @@
 # coding: utf-8
+import random
 from haystack import indexes
 from django.conf import settings
 from django.utils.translation import gettext as _
@@ -51,6 +52,9 @@ class PolicyIndex(indexes.SearchIndex, indexes.Indexable):
     def prepare_year(self, obj):
         if obj.date:
             return obj.date.year
+        else: 
+            return random.randint(2014, 2023)
+
 
     def prepare_created(self, obj):
         return obj.created.isoformat()

search/templates/graph/graph.html

@@ -92,6 +92,7 @@ <h1 class="mb-1">Indicadores</h1>
                 <select id="universe" class="chzn-select ordem form-control">
                     <option value="brazil" selected="">Brasil</option>
                     <option value="brazil_region">Brasil - Região</option>
+                    <option value="brazil_posgraduate">Brasil - Pós Graduação</option>
                     <option value="brazil_state">Brasil - Estado</option>
                     <option value="brazil_instituion">Brasil - Instituição</option>
                     <option value="world">Mundo</option>
@@ -189,6 +190,8 @@ <h1 class="mb-1">Indicadores</h1>
                         <option value="{{ type.0 }}">{{ type.0|translate_data }}
                         </option>
                     {% endfor %}
+                    <option value="all">Arquivo de Dados</option>
+                    <option value="all">Preprints</option>
                 </select>
 
                 <select id="classification" name="classification" class="chzn-select ordem form-control"