Merge pull request #256 from gitnnolabs/indicators_improvements

Realiza melhorias no processamento dos indicadores ajusta dados no índice.

article/search_indexes.py

@@ -183,7 +183,7 @@ def prepare_thematic_level_2(self, obj):
         return thematics
 
     def prepare_programs(self, obj):
-        return ["AGRONOMIA".title(), "AGRONEGÓCIO".title()]
+        return []
 
     def get_model(self):
         return models.Article

article/tasks.py

@@ -209,7 +209,7 @@ def load_openalex(user_id, date=2012, length=None, country="BR"):
         logger.info(f"Unexpected error: {e}")
 
 
-@celery_app.task(name=_("ArticleSource to Article"))
+@celery_app.task(name=_("Load ArticleSource to Article"))
 def article_source_to_article(
     user_id,
     source_name="OPENALEX",
@@ -597,7 +597,7 @@ def load_sucupira(production_file_csv, detail_file_csv, authors):
         )
 
 
-@celery_app.task(name="Match between institutions and affiliations")
+@celery_app.task(name="Match between contributor institutions and set corresponding affiliations")
 def match_contrib_inst_aff(user_id):
     """
     This task loop to all contributor looking for contributor.institutions and find the affiliation
@@ -638,8 +638,8 @@ def match_contrib_aff_source_with_inst_MEC(user_id):
                 aff.save()
 
 
-@celery_app.task(name="Load concepts")
-def load_concepts(user_id, delete=True):
+@celery_app.task(name="Load OpenAlex Concepts")
+def load_openalex_concepts(user_id, delete=True):
     """
     This task add the concepts from a .csv file and Related theme between Concepts and Thematic Area(CAPES)
 

django_celery_beat/wagtail_hooks.py

@@ -35,7 +35,8 @@ class PeriodicTaskAdmin(ModelAdmin):
     celery_app = current_app
     date_hierarchy = "start_time"
     list_display = (
-        "__str__",
+        "name",
+        "description",
         "enabled",
         "interval",
         "start_time",

education_directory/search_indexes.py

@@ -44,6 +44,21 @@ class EducationIndex(indexes.SearchIndex, indexes.Indexable):
         model_attr="institutional_contribution", null=True
     )
 
+    # control fields
+    created = indexes.CharField(null=False)
+    updated = indexes.CharField(null=False)
+    creator = indexes.CharField(null=False)
+    updated_by = indexes.CharField(null=False)
+
+    def prepare_created(self, obj):
+        return obj.created.isoformat()
+
+    def prepare_updated(self, obj):
+        return obj.updated.isoformat()
+
+    def prepare_creator(self, obj):
+        return obj.creator
+
     def prepare_record_type(self, obj):
         return "directory"
 

event_directory/search_indexes.py

@@ -45,6 +45,21 @@ class EventIndex(indexes.SearchIndex, indexes.Indexable):
         model_attr="institutional_contribution", null=True
     )
 
+    # control fields
+    created = indexes.CharField(null=False)
+    updated = indexes.CharField(null=False)
+    creator = indexes.CharField(null=False)
+    updated_by = indexes.CharField(null=False)
+
+    def prepare_created(self, obj):
+        return obj.created.isoformat()
+
+    def prepare_updated(self, obj):
+        return obj.updated.isoformat()
+
+    def prepare_creator(self, obj):
+        return obj.creator
+
     def prepare_record_type(self, obj):
         return "directory"
 

indicator/tasks.py

@@ -35,7 +35,7 @@
 #     sciprod.generate_indicators(creator, filter_by, group_by, begin_year, end_year)
 
 
-@celery_app.task(bind=True, name=_("Geração de indicadores científicos"))
+@celery_app.task(bind=True, name=_("Generate scientific indicator"))
 def task_generate_article_indicators(self, user_id, indicators):
     """
     This task receive a indicators list, something like:
@@ -60,6 +60,9 @@ def task_generate_article_indicators(self, user_id, indicators):
 
     user = User.objects.get(id=user_id)
 
+    models.Indicator.objects.all().delete()
+    models.IndicatorFile.objects.all().delete()
+
     for ind in indicators:
         ind = indicator.Indicator(**ind)
         serie_list = []
@@ -86,16 +89,17 @@ def task_generate_article_indicators(self, user_id, indicators):
         serie_json = json.dumps(
             {"keys": [key for key in ind.get_keys()], "series": serie_list}
         )
-
+        
         # check if the indicator file existe and if ids is not empty.
-        if ind.get_ids() and not models.IndicatorFile.objects.filter(
+        if not models.IndicatorFile.objects.filter(
             data_ids=ind.get_ids()
         ):
+
             indicator_model = models.Indicator(
                 title=ind.title,
                 creator=user,
                 summarized=serie_json,
-                record_status="PUBLISHED",
+                record_status= "PUBLISHED" if ind.get_ids() else "NOT PUBLISHED",
                 description=ind.description,
             )
 

infrastructure_directory/search_indexes.py

@@ -46,6 +46,21 @@ class InfraStructureIndex(indexes.SearchIndex, indexes.Indexable):
         model_attr="institutional_contribution", null=True
     )
 
+    # control fields
+    created = indexes.CharField(null=False)
+    updated = indexes.CharField(null=False)
+    creator = indexes.CharField(null=False)
+    updated_by = indexes.CharField(null=False)
+
+    def prepare_created(self, obj):
+        return obj.created.isoformat()
+
+    def prepare_updated(self, obj):
+        return obj.updated.isoformat()
+
+    def prepare_creator(self, obj):
+        return obj.creator
+
     def prepare_record_type(self, obj):
         return "directory"
 

policy_directory/search_indexes.py

@@ -38,6 +38,21 @@ class PolicyIndex(indexes.SearchIndex, indexes.Indexable):
     institutional_contribution = indexes.CharField(
         model_attr="institutional_contribution", null=True
     )
+
+    # control fields
+    created = indexes.CharField(null=False)
+    updated = indexes.CharField(null=False)
+    creator = indexes.CharField(null=False)
+    updated_by = indexes.CharField(null=False)
+
+    def prepare_created(self, obj):
+        return obj.created.isoformat()
+
+    def prepare_updated(self, obj):
+        return obj.updated.isoformat()
+
+    def prepare_creator(self, obj):
+        return obj.creator
 
     def prepare_record_type(self, obj):
         return "directory"

search/templates/indicator/indicator_detail.html

@@ -89,10 +89,10 @@ <h2 style="margin-bottom: 5px;">{{ object.title }}</h2>
                     <a class="nav-link" id="ex2-tab-2" data-toggle="tab" href="#ex2-tabs-2" role="tab"
                         aria-controls="ex2-tabs-2" aria-selected="false">Dados</a>
                 </li>
-                <li class="nav-item" role="presentation">
+                <!-- <li class="nav-item" role="presentation">
                     <a class="nav-link" id="ex2-tab-3" data-toggle="tab" href="#ex2-tabs-3" role="tab"
                         aria-controls="ex2-tabs-3" aria-selected="false">Sobre</a>
-                </li>
+                </li> -->
             </ul>
             <!-- Tabs navs -->
 
@@ -106,9 +106,9 @@ <h2 style="margin-bottom: 5px;">{{ object.title }}</h2>
                 <div class="tab-pane fade" id="ex2-tabs-2" role="tabpanel" aria-labelledby="ex2-tab-2">
                     Download dados brutos: <a href="{% get_media_prefix %}{{ object.indicator_file.raw_data }}">{{ object.indicator_file }}</a>
                 </div>
-                <div class="tab-pane fade" id="ex2-tabs-3" role="tabpanel" aria-labelledby="ex2-tab-3">
+                <!-- <div class="tab-pane fade" id="ex2-tabs-3" role="tabpanel" aria-labelledby="ex2-tab-3">
                     sobre
-                </div>
+                </div> -->
             </div>
 
             <br>