Commit abe904f6855d278d3a78d6de2740bb7a2c45fe9e
1 parent
ccdc780e
Exists in
master
and in
2 other branches
colocando a tradução do tipo de ação realizada em webpage
Showing
2 changed files
with
4 additions
and
3 deletions
Show diff stats
webpage/templates/webpages/relatorios.html
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | 11 | ||
12 | var array_history = []; | 12 | var array_history = []; |
13 | {%for data_json in json_history.data %} | 13 | {%for data_json in json_history.data %} |
14 | - array_history.push(["{{data_json.0}}","{{data_json.1}}","{{data_json.2}}",{% if data_json.3 is not None %}new Date('{{data_json.3.isoformat}}'){% else%}null{% endif %}]); | 14 | + array_history.push(["{{data_json.0}}","{{data_json.1}}","{{view}}",{% if data_json.3 is not None %}new Date('{{data_json.3.isoformat}}'){% else%}null{% endif %}]); |
15 | {% endfor%} | 15 | {% endfor%} |
16 | var json_history = {"data":array_history}; | 16 | var json_history = {"data":array_history}; |
17 | var column_history = [{"string":'{% trans "User" %}'},{"string":'{% trans "Group" %}'},{"string":'{% trans "Action" %}'},{"date":'{% trans "Date of Action" %}'}]; | 17 | var column_history = [{"string":'{% trans "User" %}'},{"string":'{% trans "Group" %}'},{"string":'{% trans "Action" %}'},{"date":'{% trans "Date of Action" %}'}]; |
webpage/views.py
@@ -497,14 +497,15 @@ class StatisticsView(LoginRequiredMixin, LogMixin, generic.DetailView): | @@ -497,14 +497,15 @@ class StatisticsView(LoginRequiredMixin, LogMixin, generic.DetailView): | ||
497 | context["json_n_did"] = json_n_did | 497 | context["json_n_did"] = json_n_did |
498 | context["json_history"] = json_history | 498 | context["json_history"] = json_history |
499 | c_visualizou = vis_ou.distinct("user_email").count() | 499 | c_visualizou = vis_ou.distinct("user_email").count() |
500 | + column_view = str(_('View')) | ||
500 | re.append([str(_('Webpage')),did,n_did]) | 501 | re.append([str(_('Webpage')),did,n_did]) |
501 | - re.append([str(_('View')),c_visualizou, alunos.count() - c_visualizou]) | 502 | + re.append([column_view,c_visualizou, alunos.count() - c_visualizou]) |
502 | context['topic'] = webpage.topic | 503 | context['topic'] = webpage.topic |
503 | context['subject'] = webpage.topic.subject | 504 | context['subject'] = webpage.topic.subject |
504 | context['db_data'] = re | 505 | context['db_data'] = re |
505 | context['title_chart'] = _('Actions about resource') | 506 | context['title_chart'] = _('Actions about resource') |
506 | context['title_vAxis'] = _('Quantity') | 507 | context['title_vAxis'] = _('Quantity') |
507 | - | 508 | + context['view'] = column_view |
508 | context["n_did_table"] = n_did | 509 | context["n_did_table"] = n_did |
509 | context["did_table"] = did | 510 | context["did_table"] = did |
510 | context["history_table"] = history | 511 | context["history_table"] = history |