Commit 7c07a122ee8d7f5ac856c29ea58f2f910a829c7b
1 parent
e3cdad6a
Exists in
master
and in
2 other branches
colocando a tradução do tipo de ação realizada em pdf_file
Showing
2 changed files
with
4 additions
and
3 deletions
Show diff stats
pdf_file/templates/pdf_file/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' %}"}]; |
pdf_file/views.py
@@ -444,14 +444,15 @@ class StatisticsView(LoginRequiredMixin, LogMixin, generic.DetailView): | @@ -444,14 +444,15 @@ class StatisticsView(LoginRequiredMixin, LogMixin, generic.DetailView): | ||
444 | context["json_n_did"] = json_n_did | 444 | context["json_n_did"] = json_n_did |
445 | context["json_history"] = json_history | 445 | context["json_history"] = json_history |
446 | c_visualizou = vis_ou.distinct("user_email").count() | 446 | c_visualizou = vis_ou.distinct("user_email").count() |
447 | + column_view = str(_('View')) | ||
447 | re.append([str(_('PDF File')),did,n_did]) | 448 | re.append([str(_('PDF File')),did,n_did]) |
448 | - re.append([str(_('View')),c_visualizou, alunos.count() - c_visualizou]) | 449 | + re.append([column_view,c_visualizou, alunos.count() - c_visualizou]) |
449 | context['topic'] = pdf_file.topic | 450 | context['topic'] = pdf_file.topic |
450 | context['subject'] = pdf_file.topic.subject | 451 | context['subject'] = pdf_file.topic.subject |
451 | context['db_data'] = re | 452 | context['db_data'] = re |
452 | context['title_chart'] = _('Actions about resource') | 453 | context['title_chart'] = _('Actions about resource') |
453 | context['title_vAxis'] = _('Quantity') | 454 | context['title_vAxis'] = _('Quantity') |
454 | - | 455 | + context['view'] = column_view |
455 | context["n_did_table"] = n_did | 456 | context["n_did_table"] = n_did |
456 | context["did_table"] = did | 457 | context["did_table"] = did |
457 | context["history_table"] = history | 458 | context["history_table"] = history |