Skip to content

Commit 8531425

Browse files
rafaelpezzutorafaelpezzuto
authored
Merge pull request #164 from rafaelpezzuto/add-sushi-page
Adiciona página com links para relatórios SUSHI de periódico
2 parents 3c0ae18 + 4b76f64 commit 8531425

10 files changed

Lines changed: 120 additions & 35 deletions

‎analytics/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def add_chartsconfig(request):
4545
config.add_route('accesses_bymonthandyear', '/ajx/accesses/bymonthandyear')
4646
config.add_route('accesses_lifetime', '/ajx/accesses/lifetime')
4747
config.add_route('accesses_heat', '/ajx/accesses/heat')
48+
config.add_route('accesses_journal_usage_data_web', '/w/accesses/journal/usage_data')
4849
config.add_route('publication_size_web', '/w/publication/size')
4950
config.add_route('publication_size', '/ajx/publication/size')
5051
config.add_route('publication_journal_web', '/w/publication/journal')

‎analytics/controller.py‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2938,8 +2938,8 @@ def _get_j1_chart(self, json_results):
29382938
serie_total_requests = []
29392939
serie_unique_requests = []
29402940

2941-
for i in json_results.get('Report_Items', []):
2942-
for p in i.get('Performance', []):
2941+
for i in json_results.get('Report_Items', {}):
2942+
for p in i.get('Performance', {}):
29432943
p_metric_label = p.get('Instance', {}).get('Metric_Type', '')
29442944
p_metric_value = p.get('Instance', {}).get('Count', 0)
29452945
p_period_begin = p.get('Period', {}).get('Begin_Date', '')
@@ -2979,6 +2979,12 @@ def get_usage_report(self, issn, collection, begin_date, end_date, granularity='
29792979
params=params
29802980
)
29812981

2982-
if response.status_code == 200:
2983-
if report_code in ('cr_j1', 'tr_j1'):
2984-
return self._get_j1_chart(response.json())
2982+
try:
2983+
response.raise_for_status()
2984+
except requests.HTTPError:
2985+
...
2986+
2987+
if response.status_code == 200 and report_code in ('cr_j1', 'tr_j1'):
2988+
return self._get_j1_chart(response.json())
2989+
2990+
return {}

‎analytics/templates/website/access_datepicker.mako‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## coding: utf-8
2-
<div class="row container-fluid" style="padding-left: 30px;">
2+
<div class="row container-fluid">
33
<form class="form-inline">
44
<div class="form-group">
55
<label class="sr-only" for="exampleInputAmount">${_(u'Período')}</label>
@@ -9,7 +9,7 @@
99
<div class="input-group-addon"><a href="?range_start=${y3}&amp;range_end=${today}" data-toggle="tooltip" data-placement="bottom" title="${_(u'acessos nos últimos 36 meses')}">${_(u'3 anos')}</a></div>
1010
<div class="input-group-addon"><a href="?range_start=${y2}&amp;range_end=${today}" data-toggle="tooltip" data-placement="bottom" title="${_(u'acessos nos últimos 24 meses')}">${_(u'2 anos')}</a></div>
1111
<div class="input-group-addon"><a href="?range_start=${y1}&amp;range_end=${today}" data-toggle="tooltip" data-placement="bottom" title="${_(u'acessos nos últimos 12 meses')}">${_(u'1 ano')}</a></div>
12-
<div class="input-group-addon"><a href="?range_start=0&amp;range_end=${today}" data-toggle="tooltip" data-placement="bottom" title="${_(u'todos acessos disponíveis')}">${_(u'tudo')}</a></div>
12+
<div class="input-group-addon"><a href="?range_start=1998-01-01&amp;range_end=${today}" data-toggle="tooltip" data-placement="bottom" title="${_(u'todos acessos disponíveis')}">${_(u'tudo')}</a></div>
1313
<div class="input-group-addon">
1414
<span class="glyphicon glyphicon-question-sign" data-toggle="popover" data-container="body" data-placement="bottom" title="${_(u'Seletor de período de acessos')}" data-content="${_(u'Utilize o campo com datas para selecionar um período customizado para recuperação dos dados de acesso. Você pode também selecionar o período de 1, 2 e 3 anos, através dos links rápidos ou todos os acessos disponíveis selecionando tudo.')}"></span>
1515
</div>

‎analytics/templates/website/accesses.mako‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
<h3>${_(u'Gráfico da evolução de acessos aos documentos')}</h3>
77
<center>
88
<div class="chart">
9-
<%include file="access_by_month_and_year.mako"/>
9+
% if selected_journal_code:
10+
<%include file="usage_tr_j1.mako"/>
11+
% else:
12+
<%include file="usage_cr_j1.mako"/>
13+
% endif
1014
</div>
1115
</center>
1216
<h3>${_(u'Gráfico de calor de acessos')}</h3>

‎analytics/templates/website/accesses_journal_usage_data.mako‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
## coding: utf-8
2+
<%inherit file="central_container_without_filters.mako"/>
3+
4+
<%block name="central_container">
5+
% if not selected_journal_code:
6+
<div class="col-md-8">
7+
<div class="panel panel-warning">
8+
<div class="panel-heading">
9+
<h3 class="panel-title">${_(u'Atenção')}</h3>
10+
</div>
11+
<div class="panel-body">
12+
${_(u'É necessário selecionar um periódico para visualizar os relatórios de acesso disponíveis.')}
13+
</div>
14+
</div>
15+
</div>
16+
17+
% else:
18+
<div class="col-md-8">
19+
<h1>${_(u'Dados de acessos')}</h1>
20+
21+
<p>${_(u'O módulo Analytics do SciELO fornece para cada periódico um conjunto de tabelas em formato TSV ou JSON com métricas de acesso.')}</p>
22+
23+
<p>${_(u'Essas tabelas são resultado de um processo computacional baseado no método COUNTER Release 5 e são disponibilizadas por meio da SciELO SUSHI API.')}</p>
24+
25+
<p>${_(u'Para mais informações acerca desse método, acesse')} <a href="https://github.com/scieloorg/scielo-sushi-api/blob/master/docs/guide.md" target="_blank"> ${_(u'a documentação oficial da SciELO SUSHI API')}</a>.</p>
26+
27+
<p>${_(u'Ao todo são disponibilizadas seis tabelas (arquivos em formato tabular).')}</p>
28+
29+
<p>${_(u'Escolha um período e acesse os endereços indicados na coluna "Links" da tabela seguinte para obter os relatórios de acesso.')}</p>
30+
31+
<%include file="access_datepicker.mako"/>
32+
33+
<table class="table table-striped table-bordered" style="margin-top:20px;">
34+
<thead>
35+
<tr>
36+
<th>Nome</th>
37+
<th>Descrição</th>
38+
<th>Links</th>
39+
</tr>
40+
</thead>
41+
<tbody>
42+
<tr>
43+
<td>Title Report J1</td>
44+
<td>Acessos mensais</td>
45+
<td>
46+
<a target="_blank" href="http://usage.apis.scielo.org/reports/tr_j1?begin_date=${range_start}&end_date=${range_end}&issn=${selected_journal_code}&fmt=tsv&api=v2&collection=${selected_collection_code}">Tabular</a> | <a target="_blank" href="http://usage.apis.scielo.org/reports/tr_j1?begin_date=${range_start}&end_date=${range_end}&issn=${selected_journal_code}&fmt=json&api=v2&collection=${selected_collection_code}">JSON</a>
47+
</td>
48+
</tr>
49+
<tr>
50+
<td>Language Report J1</td>
51+
<td>Acessos mensais agregados por idioma de documento</td>
52+
<td>
53+
<a target="_blank" href="http://usage.apis.scielo.org/reports/lr_j1?begin_date=${range_start}&end_date=${range_end}&issn=${selected_journal_code}&fmt=tsv&api=v2&collection=${selected_collection_code}">Tabular</a> | <a target="_blank" href="http://usage.apis.scielo.org/reports/lr_j1?begin_date=${range_start}&end_date=${range_end}&issn=${selected_journal_code}&fmt=json&api=v2&collection=${selected_collection_code}">JSON</a>
54+
</td>
55+
</tr>
56+
<tr>
57+
<td>Language Report J4</td>
58+
<td>Acessos mensais agregados por ano de publicação e idioma de documento</td>
59+
<td>
60+
<a target="_blank" href="http://usage.apis.scielo.org/reports/lr_j4?begin_date=${range_start}&end_date=${range_end}&issn=${selected_journal_code}&fmt=tsv&api=v2&collection=${selected_collection_code}">Tabular</a> | <a target="_blank" href="http://usage.apis.scielo.org/reports/lr_j4?begin_date=${range_start}&end_date=${range_end}&issn=${selected_journal_code}&fmt=json&api=v2&collection=${selected_collection_code}">JSON</a>
61+
</td>
62+
</tr>
63+
<tr>
64+
<td>Geolocation Report J1</td>
65+
<td>Acessos mensais agregados por país de origem de acesso</td>
66+
<td>
67+
<a target="_blank" href="http://usage.apis.scielo.org/reports/gr_j1?begin_date=${range_start}&end_date=${range_end}&issn=${selected_journal_code}&fmt=tsv&api=v2&collection=${selected_collection_code}">Tabular</a> | <a target="_blank" href="http://usage.apis.scielo.org/reports/gr_j1?begin_date=${range_start}&end_date=${range_end}&issn=${selected_journal_code}&fmt=json&api=v2&collection=${selected_collection_code}">JSON</a>
68+
</td>
69+
</tr>
70+
<tr>
71+
<td>Geolocation Report J4</td>
72+
<td>Acessos mensais agregados por país de origem de acesso e ano de publicação de documento</td>
73+
<td>
74+
<a target="_blank" href="http://usage.apis.scielo.org/reports/gr_j4?begin_date=${range_start}&end_date=${range_end}&issn=${selected_journal_code}&fmt=tsv&api=v2&collection=${selected_collection_code}">Tabular</a> | <a target="_blank" href="http://usage.apis.scielo.org/reports/gr_j4?begin_date=${range_start}&end_date=${range_end}&issn=${selected_journal_code}&fmt=json&api=v2&collection=${selected_collection_code}">JSON</a>
75+
</td>
76+
</tr>
77+
</tbody>
78+
</table>
79+
</div>
80+
% endif
81+
</%block>

‎analytics/templates/website/home_collection.mako‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,8 @@
2323
<div class="row">
2424
<h3>${_(u'Gráficos')}</h3>
2525
</div>
26-
## Garante que seja apresentado somente o gráfico do Sushi para a coleção
27-
## Brasil
28-
% if selected_collection_code == 'scl':
29-
<div class="col-md-12">
30-
<%include file="usage_cr_j1.mako"/>
31-
</div>
32-
% else:
33-
<div class="col-md-12">
34-
<%include file="access_by_month_and_year.mako"/>
35-
</div>
36-
% endif
26+
<%include file="usage_cr_j1.mako"/>
27+
</div>
3728
<div class="col-md-12">
3829
<%include file="publication_article_affiliations_map.mako"/>
3930
</div>

‎analytics/templates/website/home_journal.mako‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,12 @@
2828
</div>
2929
</div>
3030
31-
## Garante que seja apresentado somente o gráfico do Sushi para a coleção
32-
## Brasil
33-
% if selected_collection_code == 'scl':
34-
<div class="row container-fluid" style="margin-top: 100px;">
35-
<div class="col-md-12">
36-
<%include file="usage_tr_j1.mako"/>
37-
</div>
38-
</div>
39-
% else:
40-
<div class="row container-fluid" style="margin-top: 100px;">
41-
<div class="col-md-12">
42-
<%include file="access_by_month_and_year.mako"/>
43-
</div>
44-
</div>
45-
% endif
31+
<div class="row container-fluid" style="margin-top: 100px;">
32+
<div class="col-md-12">
33+
<%include file="usage_tr_j1.mako"/>
34+
</div>
35+
</div>
36+
4637
<div class="row container-fluid" style="margin-top: 100px;">
4738
<div class="col-md-12">
4839
<%include file="publication_article_affiliations_map.mako"/>

‎analytics/templates/website/navbar_journal.mako‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<li class="${'active' if page == 'accesses' else ''}">
77
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">${_(u'Acessos')} <span class="caret"></span></a>
88
<ul class="dropdown-menu">
9+
<li><a href="${request.route_url('accesses_journal_usage_data_web')}">${_(u'Dados de acessos')}</a></li>
910
<li><a href="${request.route_url('accesses_web')}">${_(u'Gráficos')}</a></li>
1011
<li><a href="${request.route_url('accesses_list_journals_web')}">${_(u'Periódicos')}</a></li>
1112
<li><a href="${request.route_url('accesses_list_issues_web')}">${_(u'Top 100 Issues')}</a></li>

‎analytics/views_website.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,16 @@ def accesses(request):
379379

380380
return data
381381

382+
383+
@view_config(route_name='accesses_journal_usage_data_web', renderer='templates/website/accesses_journal_usage_data.mako')
384+
@base_data_manager
385+
def accesses_journal_usage_data_web(request):
386+
data = request.data_manager
387+
data['page'] = 'accesses_journal_usage_data'
388+
389+
return data
390+
391+
382392
@view_config(route_name='bibliometrics_journal_citation_data_web', renderer='templates/website/bibliometrics_journal_citation_data.mako')
383393
@base_data_manager
384394
def bibliometrics_journal_citation_data_web(request):

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
setup(
3737
name="analytics",
38-
version='1.35.0',
38+
version='1.36.0',
3939
description="A analytics frontend for SciELO usage and publication statistics",
4040
author="SciELO",
4141
author_email="scielo-dev@googlegroups.com",

0 commit comments

Comments
 (0)