Skip to content

Commit 25d5686

Browse files
pitangainnovarepitangainnovare
authored
Merge pull request #702 from pitangainnovare/reconcile-silver-011
Reconcilia main com PRs silver 008 a 011
2 parents 614243d + d95ba3c commit 25d5686

102 files changed

Lines changed: 10004 additions & 7080 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/urls.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
from core.api import api_router
1616
from core.search_site import views as search_views # noqa isort:skip
1717
from indicator import urls as indicator_urls
18-
from indicator import views as indicator_views
18+
from indicator_journal import urls as indicator_journal_urls
1919
from search_gateway import urls as search_gateway_urls
2020

2121
urlpatterns = [
22-
path("", indicator_views.root_journal_metrics_redirect_view, name="root_home"),
2322
path("dash/", TemplateView.as_view(template_name="dash/dash.html"), name="dash"),
2423
# Django JS i18n catalog for gettext()/ngettext() usage in static JS.
2524
path("jsi18n/", JavaScriptCatalog.as_view(packages=("indicator", "search_gateway", "core")), name="javascript-catalog"),
@@ -31,7 +30,8 @@
3130
# get redirected to /<lang>/... and downgraded to GET.
3231
path("admin/autocomplete/", include(autocomplete_admin_urls)),
3332
path(settings.WAGTAIL_ADMIN_URL, include(wagtailadmin_urls)),
34-
path('indicators/', include(indicator_urls)),
33+
path('', include(indicator_urls)),
34+
path("indicator-journal/", include(indicator_journal_urls)),
3535
path('search-gateway/', include(search_gateway_urls)),
3636
re_path(r"^documents/", include(wagtaildocs_urls)),
3737
# API V1 endpoint to custom models

‎core/fixtures/pages.json‎

Lines changed: 138 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,58 @@
2727
"title": "Indicadores",
2828
"type": "FreePage",
2929
"publish": false,
30+
"slug": "indicadores",
3031
"children": [
3132
{
32-
"key": "indicators_global",
33-
"title": "Global",
34-
"type": "IndicatorGlobalPage",
35-
"slug": "global",
36-
"data_source": "journal_metrics_global_*"
33+
"key": "indicators_scientific_production_document",
34+
"title": "Produção Científica - Documentos",
35+
"type": "DocumentChartPage",
36+
"slug": "producao-cientifica",
37+
"data_source": "silver_scientific_production",
38+
"study_unit": "document",
39+
"intro": "<p>Visualize métricas e indicadores da produção científica baseada em documentos.</p>"
3740
},
3841
{
39-
"key": "indicators_scientific_production",
40-
"title": "Produção Científica",
41-
"type": "IndicatorByCategoryPage",
42-
"slug": "producao-cientifica",
42+
"key": "indicators_scientific_production_source",
43+
"title": "Produção Científica - Fontes",
44+
"type": "SourceChartPage",
45+
"slug": "fontes-cientificas",
4346
"data_source": "silver_scientific_production",
44-
"default_category_level": "field",
45-
"default_ranking_metric": "document_count"
47+
"study_unit": "source",
48+
"intro": "<p>Visualize métricas e indicadores baseados em fontes/publicações.</p>"
49+
},
50+
{
51+
"key": "indicators_journal_thematic_metrics",
52+
"title": "Métricas Temáticas de Periódicos",
53+
"type": "IndicatorByCategoryPage",
54+
"slug": "metricas-tematicas-periodicos",
55+
"data_source": "journal_thematic_metrics",
56+
"intro": "<p>Análise temática de periódicos por área do conhecimento.</p>",
57+
"children": [
58+
{
59+
"key": "indicators_journal_profile",
60+
"title": "Perfil de Periódico",
61+
"type": "JournalProfilePage",
62+
"slug": "perfil-periodico",
63+
"data_source": "journal_thematic_metrics",
64+
"show_global_metrics": true
65+
}
66+
]
67+
},
68+
{
69+
"key": "indicators_journal_global_metrics",
70+
"title": "Métricas Globais de Periódicos",
71+
"type": "IndicatorGlobalPage",
72+
"slug": "metricas-globais-periodicos",
73+
"data_source": "journal_global_metrics",
74+
"intro": "<p>Métricas globais comparativas de periódicos científicos.</p>"
4675
},
4776
{
4877
"key": "indicators_social_production",
4978
"title": "Produção Social",
50-
"type": "IndicatorByCategoryPage",
79+
"type": "FreePage",
5180
"slug": "producao-social",
52-
"data_source": "social_production",
53-
"default_category_level": "field",
54-
"default_ranking_metric": "document_count"
81+
"intro": "<p>Visualize métricas e indicadores da produção social.</p>"
5582
}
5683
]
5784
},
@@ -65,13 +92,15 @@
6592
"key": "observation_scientific_production",
6693
"title": "Produção Científica",
6794
"type": "ObservationPage",
68-
"slug": "producao-cientifica"
95+
"slug": "producao-cientifica",
96+
"data_source": "silver_scientific_production"
6997
},
7098
{
7199
"key": "observation_social_production",
72100
"title": "Produção Social",
73101
"type": "ObservationPage",
74-
"slug": "producao-social"
102+
"slug": "producao-social",
103+
"data_source": "social_production"
75104
}
76105
]
77106
},
@@ -157,31 +186,58 @@
157186
"title": "Indicators",
158187
"type": "FreePage",
159188
"publish": false,
189+
"slug": "indicators",
160190
"children": [
161191
{
162-
"key": "indicators_global",
163-
"title": "Global",
164-
"type": "IndicatorGlobalPage",
165-
"slug": "global",
166-
"data_source": "journal_metrics_global_*"
192+
"key": "indicators_scientific_production_document",
193+
"title": "Scientific Production - Documents",
194+
"type": "DocumentChartPage",
195+
"slug": "scientific-production",
196+
"data_source": "silver_scientific_production",
197+
"study_unit": "document",
198+
"intro": "<p>View metrics and indicators for document-based scientific production.</p>"
167199
},
168200
{
169-
"key": "indicators_scientific_production",
170-
"title": "Scientific Production",
171-
"type": "IndicatorByCategoryPage",
172-
"slug": "scientific-production",
201+
"key": "indicators_scientific_production_source",
202+
"title": "Scientific Production - Sources",
203+
"type": "SourceChartPage",
204+
"slug": "scientific-sources",
173205
"data_source": "silver_scientific_production",
174-
"default_category_level": "field",
175-
"default_ranking_metric": "document_count"
206+
"study_unit": "source",
207+
"intro": "<p>View metrics and indicators for source-based scientific production.</p>"
208+
},
209+
{
210+
"key": "indicators_journal_thematic_metrics",
211+
"title": "Journal Thematic Metrics",
212+
"type": "IndicatorByCategoryPage",
213+
"slug": "journal-thematic-metrics",
214+
"data_source": "journal_thematic_metrics",
215+
"intro": "<p>Thematic analysis of journals by knowledge area.</p>",
216+
"children": [
217+
{
218+
"key": "indicators_journal_profile",
219+
"title": "Journal Profile",
220+
"type": "JournalProfilePage",
221+
"slug": "journal-profile",
222+
"data_source": "journal_thematic_metrics",
223+
"show_global_metrics": true
224+
}
225+
]
226+
},
227+
{
228+
"key": "indicators_journal_global_metrics",
229+
"title": "Journal Global Metrics",
230+
"type": "IndicatorGlobalPage",
231+
"slug": "journal-global-metrics",
232+
"data_source": "journal_global_metrics",
233+
"intro": "<p>Global comparative metrics for scientific journals.</p>"
176234
},
177235
{
178236
"key": "indicators_social_production",
179237
"title": "Social Production",
180-
"type": "IndicatorByCategoryPage",
238+
"type": "FreePage",
181239
"slug": "social-production",
182-
"data_source": "social_production",
183-
"default_category_level": "field",
184-
"default_ranking_metric": "document_count"
240+
"intro": "<p>View metrics and indicators for social production.</p>"
185241
}
186242
]
187243
},
@@ -195,13 +251,15 @@
195251
"key": "observation_scientific_production",
196252
"title": "Scientific Production",
197253
"type": "ObservationPage",
198-
"slug": "scientific-production"
254+
"slug": "scientific-production",
255+
"data_source": "silver_scientific_production"
199256
},
200257
{
201258
"key": "observation_social_production",
202259
"title": "Social Production",
203260
"type": "ObservationPage",
204-
"slug": "social-production"
261+
"slug": "social-production",
262+
"data_source": "social_production"
205263
}
206264
]
207265
},
@@ -287,31 +345,58 @@
287345
"title": "Indicadores",
288346
"type": "FreePage",
289347
"publish": false,
348+
"slug": "indicadores",
290349
"children": [
291350
{
292-
"key": "indicators_global",
293-
"title": "Global",
294-
"type": "IndicatorGlobalPage",
295-
"slug": "global",
296-
"data_source": "journal_metrics_global_*"
351+
"key": "indicators_scientific_production_document",
352+
"title": "Producción Científica - Documentos",
353+
"type": "DocumentChartPage",
354+
"slug": "produccion-cientifica",
355+
"data_source": "silver_scientific_production",
356+
"study_unit": "document",
357+
"intro": "<p>Visualice métricas e indicadores de la producción científica basada en documentos.</p>"
297358
},
298359
{
299-
"key": "indicators_scientific_production",
300-
"title": "Producción Científica",
301-
"type": "IndicatorByCategoryPage",
302-
"slug": "produccion-cientifica",
360+
"key": "indicators_scientific_production_source",
361+
"title": "Producción Científica - Fuentes",
362+
"type": "SourceChartPage",
363+
"slug": "fuentes-cientificas",
303364
"data_source": "silver_scientific_production",
304-
"default_category_level": "field",
305-
"default_ranking_metric": "document_count"
365+
"study_unit": "source",
366+
"intro": "<p>Visualice métricas e indicadores basados en fuentes/publicaciones.</p>"
367+
},
368+
{
369+
"key": "indicators_journal_thematic_metrics",
370+
"title": "Métricas Temáticas de Revistas",
371+
"type": "IndicatorByCategoryPage",
372+
"slug": "metricas-tematicas-revistas",
373+
"data_source": "journal_thematic_metrics",
374+
"intro": "<p>Análisis temático de revistas por área del conocimiento.</p>",
375+
"children": [
376+
{
377+
"key": "indicators_journal_profile",
378+
"title": "Perfil de Revista",
379+
"type": "JournalProfilePage",
380+
"slug": "perfil-revista",
381+
"data_source": "journal_thematic_metrics",
382+
"show_global_metrics": true
383+
}
384+
]
385+
},
386+
{
387+
"key": "indicators_journal_global_metrics",
388+
"title": "Métricas Globales de Revistas",
389+
"type": "IndicatorGlobalPage",
390+
"slug": "metricas-globales-revistas",
391+
"data_source": "journal_global_metrics",
392+
"intro": "<p>Métricas globales comparativas de revistas científicas.</p>"
306393
},
307394
{
308395
"key": "indicators_social_production",
309396
"title": "Producción Social",
310-
"type": "IndicatorByCategoryPage",
397+
"type": "FreePage",
311398
"slug": "produccion-social",
312-
"data_source": "social_production",
313-
"default_category_level": "field",
314-
"default_ranking_metric": "document_count"
399+
"intro": "<p>Visualice métricas e indicadores de la producción social.</p>"
315400
}
316401
]
317402
},
@@ -325,13 +410,15 @@
325410
"key": "observation_scientific_production",
326411
"title": "Producción Científica",
327412
"type": "ObservationPage",
328-
"slug": "produccion-cientifica"
413+
"slug": "produccion-cientifica",
414+
"data_source": "silver_scientific_production"
329415
},
330416
{
331417
"key": "observation_social_production",
332418
"title": "Producción Social",
333419
"type": "ObservationPage",
334-
"slug": "produccion-social"
420+
"slug": "produccion-social",
421+
"data_source": "social_production"
335422
}
336423
]
337424
},

0 commit comments

Comments
 (0)