Merge pull request #153 from gitnnolabs/interface_improvements

Melhorias de interface.
scieloorg · Jan 30, 2023 · 688c343 · 688c343
2 parents a1557c1 + 980d0b2
commit 688c343
Show file tree

Hide file tree

Showing 19 changed files with 2,338 additions and 984 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 # Solr
 index/ocabr/data
+data/index
+data/tlog
 
 ### Python template
 # Byte-compiled / optimized / DLL files

diff --git a/config/settings/base.py b/config/settings/base.py
@@ -127,7 +127,7 @@
     "indicator",
     "search",
     "wagtailautocomplete",
-    "provided_data",
+    # "provided_data",
 ]
 
 # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
@@ -425,5 +425,5 @@
                      'thematic_areas',
                      'category',
                      'geo_scope',
-                     'thematic_scope',
+                    #  'thematic_scope',
                      ]
diff --git a/core/static/css/custom.css b/core/static/css/custom.css
@@ -7,4 +7,18 @@
 
 .lang-select {
 	margin-top: 28px;
-}
+}
+
+[class*="filter-collection-"] {
+  display: grid;
+  grid-template-columns: 1.8rem auto;
+  align-items: start;
+}
+
+[class*="filter-collection-"] label {
+  margin: 0 0 0 5px;
+}
+
+[class*="filter-collection-"] input[type='checkbox'] {
+  margin: 2px 0 0 0;
+}
diff --git a/core/static/css/style.css b/core/static/css/style.css
@@ -1481,7 +1481,7 @@ a.h-text-dark:hover {
 
 .gutter-40 {
 	margin-right: -20px;
-	margin-left: -20px;
+	margin-left: 0px;
 	margin-bottom: -40px;
 }
 

diff --git a/django_celery_beat/locale/en/LC_MESSAGES/django.po b/django_celery_beat/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-28 15:05+0000\n"
+"POT-Creation-Date: 2023-01-25 19:45+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

diff --git a/django_celery_beat/locale/es/LC_MESSAGES/django.po b/django_celery_beat/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-28 15:05+0000\n"
+"POT-Creation-Date: 2023-01-25 19:45+0000\n"
 "PO-Revision-Date: 2021-04-03 22:36-0300\n"
 "Last-Translator: Luis Saavedra <[email protected]>\n"
 "Language-Team: \n"

diff --git a/django_celery_beat/locale/pt_BR/LC_MESSAGES/django.po b/django_celery_beat/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-28 15:05+0000\n"
+"POT-Creation-Date: 2023-01-25 19:45+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

diff --git a/indicator/search_indexes.py b/indicator/search_indexes.py
@@ -67,14 +67,18 @@ def prepare_geo_priority(self, obj):
         regions = set()
 
         for item in obj.institutions.iterator():
-            cities.add(item.location.city)
-            states.add(item.location.state)
-            regions.add(item.location.state.region)
+            if item.location: 
+                cities.add(item.location.city)
+            if item.location and item.location.state: 
+                states.add(item.location.state)
+                regions.add(item.location.state.region)
 
         for item in obj.locations.iterator():
-            cities.add(item.city)
-            states.add(item.state)
-            regions.add(item.state.region)
+            if item.city:
+                cities.add(item.city)
+            if item.state:
+                states.add(item.state)
+                regions.add(item.state.region)
 
         n_cities = len(cities)
         n_states = len(states)
@@ -92,14 +96,18 @@ def prepare_geo_scope(self, obj):
 
         n_institutions = obj.institutions.count()
         for item in obj.institutions.iterator():
-            cities.add(item.location.city)
-            states.add(item.location.state)
-            regions.add(item.location.state.region)
+            if item.location: 
+                cities.add(item.location.city)
+            if item.location and item.location.state: 
+                states.add(item.location.state)
+                regions.add(item.location.state.region)
 
         for item in obj.locations.iterator():
-            cities.add(item.city)
-            states.add(item.state)
-            regions.add(item.state.region)
+            if item.city:
+                cities.add(item.city)
+            if item.state:
+                states.add(item.state)
+                regions.add(item.state.region)
 
         n_cities = len(cities)
         n_states = len(states)
@@ -164,9 +172,6 @@ def prepare_practice(self, obj):
     def prepare_record_type(self, obj):
         return "indicator"
 
-    def prepare_directory_type(self, obj):
-        return ""
-
     def prepare_institutions(self, obj):
         institutions = set()
         if obj.institutions:

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo