Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring

Jailson Dias
2 parents 746d3b5f 5456f053
Showing 34 changed files with 1277 additions and 254 deletions Show diff stats
amadeus/locale/pt_BR/LC_MESSAGES/django.po
amadeus/static/css/base/amadeus.css
amadeus/static/js/goals_reports.js
amadeus/static/js/pendencies.js
categories/locale/pt_BR/LC_MESSAGES/django.po
file_link/locale/pt_BR/LC_MESSAGES/django.po
goals/locale/pt_BR/LC_MESSAGES/django.po
goals/templates/goals/reports.html
goals/urls.py
goals/views.py
links/locale/pt_BR/LC_MESSAGES/django.po
log/locale/pt_BR/LC_MESSAGES/django.po
mailsender/locale/pt_BR/LC_MESSAGES/django.po
mural/locale/pt_BR/LC_MESSAGES/django.po
notifications/locale/pt_BR/LC_MESSAGES/django.po
pdf_file/locale/pt_BR/LC_MESSAGES/django.po
pendencies/locale/pt_BR/LC_MESSAGES/django.po
reports/forms.py
reports/locale/pt_BR/LC_MESSAGES/django.po
reports/templates/reports/_form.html
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,11 +18,11 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: amadeus/settings.py:162
+#: amadeus/settings.py:175
 msgid "Portuguese"
 msgstr ""
-#: amadeus/settings.py:163
+#: amadeus/settings.py:176
 msgid "English"
 msgstr ""
@@ -1209,4 +1209,22 @@ div.dataTables_wrapper div.dataTables_paginate {
     width: 15%;
     text-align: center;
 }
+#report-header{
+    padding-left: 0px;
+}
+
+#report-header li {
+    display: inline;
+    margin-right: 20px;
+    font-size: 16px;
+}
+
+#report-info{
+    padding-left: 0px;
+}
+
+#report-info li{
+    display: inline;
+    margin-right: 30px;
+}
 /* End Reports */
 \ No newline at end of file
@@ -40,6 +40,60 @@ function getAnswered() {
         });
 	}
+
+    var url = container.find('.answ_log_url').val();
+    var log_input = container.find('.answ_log_id');
+
+    if (typeof(url) != 'undefined') {
+        $.ajax({
+            url: url,
+            data: {'action': 'open'},
+            dataType: 'json',
+            success: function (data) {
+                log_input.val(data.log_id);
+            },
+            error: function (data) {
+                console.log(data);
+            }
+        });
+    }
+
+    var unan_url = container.find('.unan_log_url').val();
+    var unan_log_id = container.find('.unan_log_id').val();
+
+    if (typeof(unan_url) != 'undefined' && unan_log_id != "") {
+        $.ajax({
+            url: unan_url,
+            data: {'action': 'close', 'log_id': unan_log_id},
+            dataType: 'json',
+            success: function (data) {
+                console.log(data.message);
+                container.find('.unan_log_id').val("");
+            },
+            error: function (data) {
+                console.log(data);
+            }
+        });
+    }
+
+    var hist_url = container.find('.hist_log_url').val();
+    var hist_log_id = container.find('.hist_log_id').val();
+
+    if (typeof(hist_url) != 'undefined' && hist_log_id != "") {
+        $.ajax({
+            url: hist_url,
+            data: {'action': 'close', 'log_id': hist_log_id},
+            dataType: 'json',
+            success: function (data) {
+                console.log(data.message);
+                container.find('.hist_log_id').val("");
+            },
+            error: function (data) {
+                console.log(data);
+            }
+        });
+    }
+
     container.find('.answered_link').addClass('active');
   	container.find('.answered').show();
@@ -103,6 +157,59 @@ function getUnanswered() {
         });
     }
+    var url = container.find('.answ_log_url').val();
+    var log_id = container.find('.answ_log_id').val();
+
+    if (typeof(url) != 'undefined' && log_id != "") {
+        $.ajax({
+            url: url,
+            data: {'action': 'close', 'log_id': log_id},
+            dataType: 'json',
+            success: function (data) {
+                console.log(data.message);
+                container.find('.answ_log_id').val("");
+            },
+            error: function (data) {
+                console.log(data);
+            }
+        });
+    }
+
+    var unan_url = container.find('.unan_log_url').val();
+    var unan_log_input = container.find('.unan_log_id');
+
+    if (typeof(unan_url) != 'undefined') {
+        $.ajax({
+            url: unan_url,
+            data: {'action': 'open'},
+            dataType: 'json',
+            success: function (data) {
+                unan_log_input.val(data.log_id);
+            },
+            error: function (data) {
+                console.log(data);
+            }
+        });
+    }
+
+    var hist_url = container.find('.hist_log_url').val();
+    var hist_log_id = container.find('.hist_log_id').val();
+
+    if (typeof(hist_url) != 'undefined' && hist_log_id != "") {
+        $.ajax({
+            url: hist_url,
+            data: {'action': 'close', 'log_id': hist_log_id},
+            dataType: 'json',
+            success: function (data) {
+                console.log(data.message);
+                container.find('.hist_log_id').val("");
+            },
+            error: function (data) {
+                console.log(data);
+            }
+        });
+    }
+
     container.find('.answered_link').removeClass('active');
     container.find('.answered').hide();
@@ -153,6 +260,60 @@ function getHistory() {
         });
     }
+    var url = container.find('.answ_log_url').val();
+    var log_id = container.find('.answ_log_id').val();
+
+    if (typeof(url) != 'undefined' && log_id != "") {
+        $.ajax({
+            url: url,
+            data: {'action': 'close', 'log_id': log_id},
+            dataType: 'json',
+            success: function (data) {
+                console.log(data.message);
+                container.find('.answ_log_id').val("");
+            },
+            error: function (data) {
+                console.log(data);
+            }
+        });
+    }
+
+    var unan_url = container.find('.unan_log_url').val();
+    var unan_log_id = container.find('.unan_log_id').val();
+
+    if (typeof(unan_url) != 'undefined' && unan_log_id != "") {
+        $.ajax({
+            url: unan_url,
+            data: {'action': 'close', 'log_id': unan_log_id},
+            dataType: 'json',
+            success: function (data) {
+                console.log(data.message);
+                container.find('.unan_log_id').val("");
+            },
+            error: function (data) {
+                console.log(data);
+            }
+            
+        });
+    }
+
+    var hist_url = container.find('.hist_log_url').val();
+    var hist_log_input = container.find('.hist_log_id');
+
+    if (typeof(hist_url) != 'undefined') {
+        $.ajax({
+            url: hist_url,
+            data: {'action': 'open'},
+            dataType: 'json',
+            success: function (data) {
+                hist_log_input.val(data.log_id);
+            },
+            error: function (data) {
+                console.log(data);
+            }
+        });
+    }
+
     container.find('.answered_link').removeClass('active');
     container.find('.answered').hide();
@@ -172,6 +172,7 @@ function getPendencies(panel_id) {
             dataType: 'json',
             success: function (data) {
                 console.log(data.message);
+                list.parent().parent().find('.hist_log_id').val("");
             },
             error: function (data) {
                 console.log(data);
@@ -244,6 +245,7 @@ function getHistory(panel_id) {
             dataType: 'json',
             success: function (data) {
                 console.log(data.message);
+                container.find('.view_log_id').val("");
             },
             error: function (data) {
                 console.log(data);
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -50,7 +50,7 @@ msgstr &quot;Data de modificação&quot;
 msgid "Category"
 msgstr "Categoria"
-#: categories/models.py:20 categories/views.py:48
+#: categories/models.py:20 categories/views.py:49
 msgid "Categories"
 msgstr "Categorias"
@@ -114,7 +114,7 @@ msgstr &quot;Deletar&quot;
 msgid "categories"
 msgstr "Categorias"
-#: categories/templates/categories/list.html:31 categories/views.py:105
+#: categories/templates/categories/list.html:31 categories/views.py:106
 msgid "Create Category"
 msgstr "Criar Categoria"
@@ -127,12 +127,12 @@ msgid &quot;all subjects&quot;
 msgstr "Todos os assuntos"
 #: categories/templates/categories/list.html:86
-#: categories/templates/categories/list.html:131
+#: categories/templates/categories/list.html:129
 msgid "Coordinator(s) "
 msgstr "Coordenador(es)"
 #: categories/templates/categories/list.html:90
-#: categories/templates/categories/list.html:135
+#: categories/templates/categories/list.html:133
 msgid "It doesn't possess coordinators"
 msgstr "Não possui coordenadores"
@@ -148,16 +148,16 @@ msgstr &quot;atras&quot;
 msgid "Update: "
 msgstr "Editar: "
-#: categories/views.py:103
+#: categories/views.py:104
 msgid "Replicate Category"
 msgstr "Replicar Categoria"
-#: categories/views.py:130
+#: categories/views.py:131
 #, python-format
 msgid "Category \"%s\" register successfully!"
 msgstr "Categoria \"%s\" foi registrada com sucesso!"
-#: categories/views.py:166
+#: categories/views.py:167
 msgid ""
 "The category cannot be removed, it contains one or more virtual enviroments "
 "attach."
@@ -165,12 +165,12 @@ msgstr &quot;&quot;
 "A categoria não pode ser removida, ela contém um ou mais ambientes virtuais "
 "vinculados."
-#: categories/views.py:179
+#: categories/views.py:180
 #, python-format
 msgid "Category \"%s\" removed successfully!"
 msgstr "Categoria \"%s\" removida com sucesso!"
-#: categories/views.py:207
+#: categories/views.py:208
 #, python-format
 msgid "Category \"%s\" updated successfully!"
 msgstr "Categoria \"%s\" atualizada com sucesso!"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -0,0 +1,370 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: goals/forms.py:33
+msgid "Tags"
+msgstr "Tags"
+
+#: goals/forms.py:39
+msgid "Name"
+msgstr "Nome"
+
+#: goals/forms.py:58
+#, python-format
+msgid ""
+"There already is another resource with the goals specification for the Topic "
+"%s"
+msgstr "Já existe um outro recurso com a especificação de metas para o tópico %s"
+
+#: goals/forms.py:63
+msgid "This input should be filled with a date equal or after today's date."
+msgstr "Esse campo deve ser preenchido com uma data igual ou posterior à data atual."
+
+#: goals/forms.py:66
+msgid ""
+"This input should be filled with a date equal or after the subject begin "
+"date."
+msgstr "Esse campo deve ser preenchido com uma data igual ou posterior à data de início do assunto."
+
+#: goals/forms.py:69
+msgid ""
+"This input should be filled with a date equal or after the subject end date."
+msgstr "Esse campo deve ser preenchido com uma data igual ou posterior à data final do assunto."
+
+#: goals/forms.py:115
+msgid "This field is required."
+msgstr "Esse campo é obrigatório."
+
+#: goals/models.py:10
+msgid "Presentation"
+msgstr "Apresentação"
+
+#: goals/models.py:11
+msgid "Submission Limit Date"
+msgstr "Data limite para submissão"
+
+#: goals/models.py:14 goals/models.py:39 goals/models.py:47
+#: goals/templates/goals/_form_submit.html:21
+#: goals/templates/goals/view.html:73
+msgid "Goal"
+msgstr "Meta"
+
+#: goals/models.py:15 goals/templates/goals/_answered.html:20
+msgid "Goals"
+msgstr "Metas"
+
+#: goals/models.py:33
+#, python-format
+msgid "Are you sure you want delete the %s topic goals specification"
+msgstr "Você tem certeza que deseja deleta a especificação de metas do tópico %s"
+
+#: goals/models.py:36
+msgid "Description"
+msgstr "Descrição"
+
+#: goals/models.py:37
+msgid "Referential Value"
+msgstr "Valor de referência"
+
+#: goals/models.py:38
+msgid "Order"
+msgstr "Ordem"
+
+#: goals/models.py:45
+msgid "My Value"
+msgstr "Meu valor"
+
+#: goals/models.py:46
+msgid "User"
+msgstr "Usuário"
+
+#: goals/models.py:48
+msgid "Create Date"
+msgstr "Data de criação"
+
+#: goals/models.py:49
+msgid "Last Update"
+msgstr "Última atualização"
+
+#: goals/templates/goals/_answered.html:8
+#: goals/templates/goals/_history.html:11
+#: goals/templates/goals/_unanswered.html:8
+msgid "Student"
+msgstr "Estudante"
+
+#: goals/templates/goals/_answered.html:11
+#: goals/templates/goals/_history.html:14
+#: goals/templates/goals/_unanswered.html:11
+msgid "Group"
+msgstr "Grupo"
+
+#: goals/templates/goals/_answered.html:14
+msgid "Definition Date"
+msgstr "Data de definição"
+
+#: goals/templates/goals/_answered.html:17
+msgid "Update Date"
+msgstr "Data de atualização"
+
+#: goals/templates/goals/_form.html:56
+msgid "Goals Specification"
+msgstr "Especificação de Metas"
+
+#: goals/templates/goals/_form.html:101
+#: goals/templates/goals/_form_submit.html:22
+#: goals/templates/goals/view.html:74
+msgid "Minimum percentage desired"
+msgstr "Porcentagem mínima desejada"
+
+#: goals/templates/goals/_form.html:156
+msgid "Common resources settings"
+msgstr "Configurações comuns a todos os recursos"
+
+#: goals/templates/goals/_form.html:204
+msgid "Pendencies Notifications"
+msgstr "Notificações de Pendências"
+
+#: goals/templates/goals/_form.html:226
+msgid "Action not performed by the user"
+msgstr "Ação não realizada pelo usuário"
+
+#: goals/templates/goals/_form.html:252
+msgid "Wished period"
+msgstr "Período desejado"
+
+#: goals/templates/goals/_form.html:388
+#: goals/templates/goals/_form_submit.html:54
+msgid "Save"
+msgstr "Salvar"
+
+#: goals/templates/goals/_form.html:399
+msgid "Add new goal"
+msgstr "Adicionar nova meta"
+
+#: goals/templates/goals/_form.html:400
+msgid "Remove this goal"
+msgstr "Remover essa meta"
+
+#: goals/templates/goals/_form.html:420
+msgid "Add new notification"
+msgstr "Adicionar nova notificação"
+
+#: goals/templates/goals/_form.html:421
+msgid "Remove this"
+msgstr "Remover essa notificação"
+
+#: goals/templates/goals/_history.html:8
+msgid "Date/Hour"
+msgstr "Data/Horário"
+
+#: goals/templates/goals/_history.html:17
+msgid "Action"
+msgstr "Ação"
+
+#: goals/templates/goals/_history.html:20
+msgid "Object"
+msgstr "Objeto"
+
+#: goals/templates/goals/_history.html:23
+msgid "Resource"
+msgstr "Recurso"
+
+#: goals/templates/goals/_unanswered.html:14
+msgid "Select All"
+msgstr "Selecionar todos"
+
+#: goals/templates/goals/create.html:23
+msgid "Add Topic Goals"
+msgstr "Adicionar Metas do Tópico"
+
+#: goals/templates/goals/reports.html:25 goals/templates/goals/reports.html:104
+msgid "Reports: Answered"
+msgstr "Relatórios: Respondentes"
+
+#: goals/templates/goals/reports.html:57
+msgid "Answered"
+msgstr "Respondentes"
+
+#: goals/templates/goals/reports.html:58
+msgid "Unanswered"
+msgstr "Não Respondentes"
+
+#: goals/templates/goals/reports.html:59
+msgid "Resource History"
+msgstr "Histórico do Recurso"
+
+#: goals/templates/goals/reports.html:80
+msgid "No data available in table"
+msgstr "Nenhum registro encontrado"
+
+#: goals/templates/goals/reports.html:81
+msgid "Showing _START_ to _END_ of _TOTAL_ entries"
+msgstr "Mostrando de _START_ até _END_ de _TOTAL_ de registros"
+
+#: goals/templates/goals/reports.html:82
+msgid "Showing 0 to 0 of 0 entries"
+msgstr "Mostrado de 0 até 0 de 0 registros"
+
+#: goals/templates/goals/reports.html:83
+msgid "(filtered from _MAX_ total entries)"
+msgstr "(filtrados de _MAX_ registros)"
+
+#: goals/templates/goals/reports.html:86
+msgid "Show _MENU_ entries"
+msgstr "_MENU_ resultados por página"
+
+#: goals/templates/goals/reports.html:87
+msgid "Loading..."
+msgstr "Carregando..."
+
+#: goals/templates/goals/reports.html:88
+msgid "Processing..."
+msgstr "Processando..."
+
+#: goals/templates/goals/reports.html:89
+msgid "Search"
+msgstr "Buscar"
+
+#: goals/templates/goals/reports.html:90
+msgid "No matching records found"
+msgstr "Nenhum registro encontrado"
+
+#: goals/templates/goals/reports.html:92
+msgid "First"
+msgstr "Primeiro"
+
+#: goals/templates/goals/reports.html:93
+msgid "Last"
+msgstr "Último"
+
+#: goals/templates/goals/reports.html:98
+msgid ": activate to sort column ascending"
+msgstr ": Ordenar colunas de forma ascendente"
+
+#: goals/templates/goals/reports.html:99
+msgid ": activate to sort column descending"
+msgstr ": Ordenar colunas de forma descendente"
+
+#: goals/templates/goals/reports.html:103
+msgid "Download .csv file"
+msgstr "Download de arquivo .csv"
+
+#: goals/templates/goals/reports.html:105
+msgid "Reports: Unanswered"
+msgstr "Relatórios: Não Respondentes"
+
+#: goals/templates/goals/reports.html:106
+msgid "Reports: History"
+msgstr "Relatórios: Histórico"
+
+#: goals/templates/goals/submit.html:66
+#: goals/templates/goals/update_submit.html:69
+#: goals/templates/goals/view.html:66
+#: goals/templates/goals/window_submit.html:40
+msgid "Limit submission date"
+msgstr "Data limite de submissão"
+
+#: goals/templates/goals/update.html:23
+msgid "Edit: Topic Goals "
+msgstr "Editar: Metas de Tópico"
+
+#: goals/templates/goals/update_submit.html:22
+msgid "Update My Goals"
+msgstr "Atualizar Minhas Metas"
+
+#: goals/templates/goals/view.html:19 goals/templatetags/goals_filters.py:72
+#: goals/views.py:217
+msgid "My Goals"
+msgstr "Minhas Metas"
+
+#: goals/templates/goals/view.html:75
+msgid "Goal stabilished"
+msgstr "Meta estabelecida"
+
+#: goals/templates/goals/view.html:83
+msgid "Update Goals"
+msgstr "Atualizar Metas"
+
+#: goals/templatetags/goals_filters.py:59
+msgid "Visualized"
+msgstr "Visualizou"
+
+#: goals/templatetags/goals_filters.py:61
+msgid "Added"
+msgstr "Adicionou"
+
+#: goals/templatetags/goals_filters.py:63
+msgid "Updated"
+msgstr "Atualizou"
+
+#: goals/templatetags/goals_filters.py:65
+msgid "Submitted"
+msgstr "Submeteu"
+
+#: goals/templatetags/goals_filters.py:76
+#, python-format
+msgid "%s Instance"
+msgstr "Instância de %s"
+
+#: goals/views.py:60
+msgid "Reports"
+msgstr "Relatórios"
+
+#: goals/views.py:348 goals/views.py:476
+#, python-format
+msgid "Your goals for %s was save successfully!"
+msgstr "Suas metas para %s foram salvas com sucesso!"
+
+#: goals/views.py:584
+#, python-format
+msgid "Your goals for %s was update successfully!"
+msgstr "Suas metas para %s foram atualizadas com sucesso!"
+
+#: goals/views.py:635 goals/views.py:649 goals/views.py:670 goals/views.py:789
+#: goals/views.py:803 goals/views.py:813
+msgid "Visualize"
+msgstr "Visualizar"
+
+#: goals/views.py:635 goals/views.py:649 goals/views.py:670 goals/views.py:789
+#: goals/views.py:803 goals/views.py:813
+msgid "Submit"
+msgstr "Submeter"
+
+#: goals/views.py:733
+msgid "Create Topic Goals"
+msgstr "Adicionar Metas do Tópico"
+
+#: goals/views.py:744
+#, python-format
+msgid "The Goals specification for the topic %s was realized successfully!"
+msgstr "A Especificação de Metas para o tópico %s foi realizada com sucesso!"
+
+#: goals/views.py:868
+msgid "Update Topic Goals"
+msgstr "Atualizar Metas do Tópico"
+
+#: goals/views.py:879
+#, python-format
+msgid "The Goals specification for the topic %s was updated successfully!"
+msgstr "A Especificação de Metas para o tópico %s foi atualizada com sucesso!"
+
+#: goals/views.py:915
+#, python-format
+msgid "The Goals specification of the topic %s was removed successfully!"
+msgstr "A Especificação de Metas para o tópico %s foi removida com sucesso!"
@@ -61,14 +61,23 @@
 			    </div>
 		        <div class="answered" data-url="{% url 'goals:answered_report' goal.slug %}">
+			    	<input type="hidden" class="answ_log_url" value="{% url 'goals:reports_log' goal.slug 'answered' %}" />
+			    	<input type="hidden" class="answ_log_id" value="" />
+
 			    	<div class="answered_data"></div>
 			    </div>
 			    <div class="unanswered" data-url="{% url 'goals:unanswered_report' goal.slug %}">
+			    	<input type="hidden" class="unan_log_url" value="{% url 'goals:reports_log' goal.slug 'unanaswered' %}" />
+			    	<input type="hidden" class="unan_log_id" value="" />
+			    	
 			    	<div class="unanswered_data"></div>
 			    </div>
 			    <div class="history" data-url="{% url 'goals:history_report' goal.slug %}">
+			    	<input type="hidden" class="hist_log_url" value="{% url 'goals:reports_log' goal.slug 'history' %}" />
+			    	<input type="hidden" class="hist_log_id" value="" />
+
 			    	<div class="history_data"></div>
 			    </div>
 			</div>
@@ -15,4 +15,5 @@ urlpatterns = [
 	url(r'^answered_report/(?P<slug>[\w_-]+)/$', views.AnsweredReport.as_view(), name = 'answered_report'),
 	url(r'^unanswered_report/(?P<slug>[\w_-]+)/$', views.UnansweredReport.as_view(), name = 'unanswered_report'),
 	url(r'^history_report/(?P<slug>[\w_-]+)/$', views.HistoryReport.as_view(), name = 'history_report'),
+	url(r'^view_log/(?P<goal>[\w_-]+)/(?P<report>[\w_-]+)/$', views.reports_log, name = 'reports_log'),
 ]
@@ -5,6 +5,7 @@ from django.core.urlresolvers import reverse, reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.forms import formset_factory, modelformset_factory
+from django.http import JsonResponse
 from log.models import Log
 from log.mixins import LogMixin
@@ -31,7 +32,7 @@ class Reports(LoginRequiredMixin, generic.ListView):
 		slug = self.kwargs.get('slug', '')
 		goals = get_object_or_404(Goals, slug = slug)
-		if not has_resource_permissions(request.user, goals):
+		if not has_subject_permissions(request.user, goals):
 			return redirect(reverse_lazy('subjects:home'))
 		return super(Reports, self).dispatch(request, *args, **kwargs)
@@ -89,7 +90,7 @@ class AnsweredReport(LoginRequiredMixin, generic.ListView):
 		slug = self.kwargs.get('slug', '')
 		goals = get_object_or_404(Goals, slug = slug)
-		if not has_resource_permissions(request.user, goals):
+		if not has_subject_permissions(request.user, goals):
 			return redirect(reverse_lazy('subjects:home'))
 		return super(AnsweredReport, self).dispatch(request, *args, **kwargs)
@@ -129,7 +130,7 @@ class UnansweredReport(LoginRequiredMixin, generic.ListView):
 		slug = self.kwargs.get('slug', '')
 		goals = get_object_or_404(Goals, slug = slug)
-		if not has_resource_permissions(request.user, goals):
+		if not has_subject_permissions(request.user, goals):
 			return redirect(reverse_lazy('subjects:home'))
 		return super(UnansweredReport, self).dispatch(request, *args, **kwargs)
@@ -155,7 +156,7 @@ class HistoryReport(LoginRequiredMixin, generic.ListView):
 		slug = self.kwargs.get('slug', '')
 		goal = get_object_or_404(Goals, slug = slug)
-		rows = Log.objects.filter(context__contains = {"goals_id": goal.id})
+		rows = Log.objects.filter(context__contains = {"goals_id": goal.id}).exclude(action = 'view_reports')
 		return rows
@@ -163,7 +164,7 @@ class HistoryReport(LoginRequiredMixin, generic.ListView):
 		slug = self.kwargs.get('slug', '')
 		goals = get_object_or_404(Goals, slug = slug)
-		if not has_resource_permissions(request.user, goals):
+		if not has_subject_permissions(request.user, goals):
 			return redirect(reverse_lazy('subjects:home'))
 		return super(HistoryReport, self).dispatch(request, *args, **kwargs)
@@ -912,7 +913,7 @@ class DeleteView(LoginRequiredMixin, LogMixin, generic.DeleteView):
 		return super(DeleteView, self).dispatch(request, *args, **kwargs)
 	def get_success_url(self):
-		messages.success(self.request, _('The Goals specification of the thopic %s was removed successfully!')%(self.object.topic.name))
+		messages.success(self.request, _('The Goals specification of the topic %s was removed successfully!')%(self.object.topic.name))
 		self.log_context['category_id'] = self.object.topic.subject.category.id
 		self.log_context['category_name'] = self.object.topic.subject.category.name
@@ -929,4 +930,36 @@ class DeleteView(LoginRequiredMixin, LogMixin, generic.DeleteView):
 		super(DeleteView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context) 
-		return reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
 \ No newline at end of file
+		return reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
+
+@log_decorator_ajax('resources', 'view_reports', 'goals')
+def reports_log(request, goal, report):
+	action = request.GET.get('action')
+
+	if action == 'open':
+		goals = get_object_or_404(Goals, slug = goal)
+
+		log_context = {}
+		log_context['category_id'] = goals.topic.subject.category.id
+		log_context['category_name'] = goals.topic.subject.category.name
+		log_context['category_slug'] = goals.topic.subject.category.slug
+		log_context['subject_id'] = goals.topic.subject.id
+		log_context['subject_name'] = goals.topic.subject.name
+		log_context['subject_slug'] = goals.topic.subject.slug
+		log_context['topic_id'] = goals.topic.id
+		log_context['topic_name'] = goals.topic.name
+		log_context['topic_slug'] = goals.topic.slug
+		log_context['goals_id'] = goals.id
+		log_context['goals_name'] = goals.name
+		log_context['goals_slug'] = goals.slug
+		log_context['goals_report'] = report
+		log_context['timestamp_start'] = str(int(time.time()))
+		log_context['timestamp_end'] = '-1'
+
+		request.log_context = log_context
+
+		log_id = Log.objects.latest('id').id
+
+		return JsonResponse({'message': 'ok', 'log_id': log_id})
+
+	return JsonResponse({'message': 'ok'})
 \ No newline at end of file
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,15 +18,15 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: mural/forms.py:19 mural/forms.py:97
+#: mural/forms.py:21 mural/forms.py:104
 msgid "This field is required."
 msgstr "Esse campo é obrigatório."
-#: mural/forms.py:31 mural/forms.py:109
+#: mural/forms.py:33 mural/forms.py:116
 msgid "The image is too large. It should have less than 5MB."
 msgstr "A imagem é muito grande. Ela deve possuir 5MB ou menos."
-#: mural/forms.py:70
+#: mural/forms.py:75
 msgid "Choose an especific resource"
 msgstr "Escolha um recurso específico"
@@ -48,7 +48,7 @@ msgid &quot;Ask for Help&quot;
 msgstr "Pediu ajuda"
 #: mural/models.py:22 mural/models.py:107 mural/models.py:118
-#: mural/models.py:126
+#: mural/models.py:127
 msgid "Post"
 msgstr "Postagem"
@@ -57,7 +57,7 @@ msgid &quot;Image&quot;
 msgstr "Imagem"
 #: mural/models.py:24 mural/models.py:108 mural/models.py:120
-#: mural/models.py:127
+#: mural/models.py:128
 msgid "User"
 msgstr "Usuário"
@@ -89,32 +89,35 @@ msgstr &quot;Recurso&quot;
 msgid "Viewed"
 msgstr "Visualizado"
-#: mural/templates/mural/_form.html:76
-#: mural/templates/mural/_form_comment.html:33
-msgid "Choose your photo..."
-msgstr "Escolha sua foto..."
+#: mural/models.py:121
+msgid "Date/Time Viewed"
+msgstr ""
-#: mural/templates/mural/_form.html:85
+#: mural/templates/mural/_form.html:76
 #: mural/templates/mural/_form_comment.html:42
 msgid "Click or drop the file here"
 msgstr "Clique ou solte o arquivo aqui"
-#: mural/templates/mural/_form.html:87
+#: mural/templates/mural/_form.html:78
 #: mural/templates/mural/_form_comment.html:44
 msgid "The file could not exceed 5MB."
 msgstr "O arquivo não pode exceder 5MB."
-#: mural/templates/mural/_form.html:109
+#: mural/templates/mural/_form.html:100
 #: mural/templates/mural/_form_comment.html:66
 msgid "Save"
 msgstr "Salvar"
-#: mural/templates/mural/_form.html:110
+#: mural/templates/mural/_form.html:101
 #: mural/templates/mural/_form_comment.html:67
 #: mural/templates/mural/_form_comment.html:85
 msgid "Cancel"
 msgstr "Cancelar"
+#: mural/templates/mural/_form_comment.html:33
+msgid "Choose your photo..."
+msgstr "Escolha sua foto..."
+
 #: mural/templates/mural/_form_comment.html:78
 msgid "Insert here the name of the user you wish to mark in this comment"
 msgstr "Insira aqui o nome do usuário que você quer marcar nesse comentário"
@@ -196,14 +199,14 @@ msgstr &quot;Por Assunto&quot;
 #: mural/templates/mural/list.html:26 mural/templates/mural/list.html:39
 #: mural/templates/mural/list.html:74 mural/templates/mural/list.html:87
-#: mural/templates/mural/list_category.html:72
-#: mural/templates/mural/list_category.html:85
-#: mural/templates/mural/list_category.html:123
-#: mural/templates/mural/list_category.html:136
-#: mural/templates/mural/list_subject.html:71
-#: mural/templates/mural/list_subject.html:84
-#: mural/templates/mural/list_subject.html:122
-#: mural/templates/mural/list_subject.html:135
+#: mural/templates/mural/list_category.html:75
+#: mural/templates/mural/list_category.html:88
+#: mural/templates/mural/list_category.html:126
+#: mural/templates/mural/list_category.html:139
+#: mural/templates/mural/list_subject.html:74
+#: mural/templates/mural/list_subject.html:87
+#: mural/templates/mural/list_subject.html:125
+#: mural/templates/mural/list_subject.html:138
 #: mural/templates/mural/resource_view.html:73
 #: mural/templates/mural/resource_view.html:86
 #: mural/templates/mural/subject_view.html:85
@@ -212,46 +215,46 @@ msgid &quot;Filter&quot;
 msgstr "Filtrar"
 #: mural/templates/mural/list.html:31 mural/templates/mural/list.html:79
-#: mural/templates/mural/list_category.html:77
-#: mural/templates/mural/list_category.html:128
-#: mural/templates/mural/list_subject.html:76
-#: mural/templates/mural/list_subject.html:127
+#: mural/templates/mural/list_category.html:80
+#: mural/templates/mural/list_category.html:131
+#: mural/templates/mural/list_subject.html:79
+#: mural/templates/mural/list_subject.html:130
 #: mural/templates/mural/resource_view.html:78
 #: mural/templates/mural/subject_view.html:90
 msgid "Favorite posts"
 msgstr "Postagens favoritas"
 #: mural/templates/mural/list.html:36 mural/templates/mural/list.html:84
-#: mural/templates/mural/list_category.html:82
-#: mural/templates/mural/list_category.html:133
-#: mural/templates/mural/list_subject.html:81
-#: mural/templates/mural/list_subject.html:132
+#: mural/templates/mural/list_category.html:85
+#: mural/templates/mural/list_category.html:136
+#: mural/templates/mural/list_subject.html:84
+#: mural/templates/mural/list_subject.html:135
 #: mural/templates/mural/resource_view.html:83
 #: mural/templates/mural/subject_view.html:95
 msgid "Only my posts"
 msgstr "Apenas minhas postagens"
 #: mural/templates/mural/list.html:40 mural/templates/mural/list.html:88
-#: mural/templates/mural/list_category.html:86
-#: mural/templates/mural/list_category.html:137
-#: mural/templates/mural/list_subject.html:85
-#: mural/templates/mural/list_subject.html:136
+#: mural/templates/mural/list_category.html:89
+#: mural/templates/mural/list_category.html:140
+#: mural/templates/mural/list_subject.html:88
+#: mural/templates/mural/list_subject.html:139
 #: mural/templates/mural/resource_view.html:87
 #: mural/templates/mural/subject_view.html:99
 msgid "Clean Filters"
 msgstr "Limpar Filtros"
 #: mural/templates/mural/list.html:52
-#: mural/templates/mural/list_category.html:98
-#: mural/templates/mural/list_subject.html:97
+#: mural/templates/mural/list_category.html:101
+#: mural/templates/mural/list_subject.html:100
 #: mural/templates/mural/resource_view.html:51
 #: mural/templates/mural/subject_view.html:63
 msgid "Wish to make a new post?"
 msgstr "Deseja fazer uma nova postagem?"
 #: mural/templates/mural/list.html:70
-#: mural/templates/mural/list_category.html:119
-#: mural/templates/mural/list_subject.html:118
+#: mural/templates/mural/list_category.html:122
+#: mural/templates/mural/list_subject.html:121
 #: mural/templates/mural/resource_view.html:69
 #: mural/templates/mural/subject_view.html:81
 msgid "There are no posts in this mural yet."
@@ -267,8 +270,8 @@ msgstr &quot;Mural: Por Categoria&quot;
 msgid "Replicate"
 msgstr "Replicar"
-#: mural/templates/mural/list_category.html:108
-#: mural/templates/mural/list_subject.html:107
+#: mural/templates/mural/list_category.html:111
+#: mural/templates/mural/list_subject.html:110
 msgid "See more posts"
 msgstr "Ver mais postagens"
@@ -282,7 +285,7 @@ msgid &quot;Groups&quot;
 msgstr "Grupos"
 #: mural/templates/mural/resource_view.html:12
-#: mural/templates/mural/subject_view.html:9 mural/views.py:84
+#: mural/templates/mural/subject_view.html:9 mural/views.py:101
 msgid "Mural"
 msgstr "Mural"
@@ -290,11 +293,11 @@ msgstr &quot;Mural&quot;
 msgid "(Edited)"
 msgstr "(Editado)"
-#: mural/templatetags/mural_filters.py:30 mural/views.py:1008
+#: mural/templatetags/mural_filters.py:30 mural/views.py:1226
 msgid "Unfavorite"
 msgstr "Desfavoritar"
-#: mural/templatetags/mural_filters.py:32 mural/views.py:1012
+#: mural/templatetags/mural_filters.py:32 mural/views.py:1230
 msgid "Favorite"
 msgstr "Favoritar"
@@ -302,62 +305,62 @@ msgstr &quot;Favoritar&quot;
 msgid "about"
 msgstr "sobre"
-#: mural/views.py:132
+#: mural/views.py:154
 #, python-format
 msgid "%s has made a post in General"
 msgstr "%s postou em Geral"
-#: mural/views.py:220 mural/views.py:452 mural/views.py:721
+#: mural/views.py:258 mural/views.py:522 mural/views.py:858
 msgid "Are you sure you want to delete this post?"
 msgstr "Você tem certeza que deseja deletar essa postagem?"
-#: mural/views.py:324
+#: mural/views.py:366
 msgid "Mural - Per Category"
 msgstr "Mural - Por Categoria"
-#: mural/views.py:364 mural/views.py:613 mural/views.py:945
+#: mural/views.py:411 mural/views.py:717 mural/views.py:1152
 #, python-format
 msgid "%s has made a post in %s"
 msgstr "%s postou em %s"
-#: mural/views.py:556
+#: mural/views.py:655
 msgid "Mural - Per Subject"
 msgstr "Mural - Por Assunto"
-#: mural/views.py:806 mural/views.py:883
+#: mural/views.py:969 mural/views.py:1085
 #, python-format
 msgid "%s - Mural"
 msgstr "%s - Mural"
-#: mural/views.py:989
+#: mural/views.py:1207
 msgid "Your post was published successfully!"
 msgstr "Sua postagem foi publicada com sucesso!"
-#: mural/views.py:991
+#: mural/views.py:1209
 msgid "Your post was edited successfully!"
 msgstr "Sua postagem foi editada com sucesso!"
-#: mural/views.py:998
+#: mural/views.py:1216
 msgid "Post deleted successfully!"
 msgstr "Postagem deletada com sucesso!"
-#: mural/views.py:1061
+#: mural/views.py:1284
 #, python-format
 msgid "%s has commented in a post"
 msgstr "%s comentou em um postagem"
-#: mural/views.py:1161
+#: mural/views.py:1443
 msgid "Are you sure you want to delete this comment?"
 msgstr "Você tem certeza que deseja deletar esse comentário?"
-#: mural/views.py:1203
+#: mural/views.py:1510
 msgid "Your comment was published successfully!"
 msgstr "Seu comentário foi publicado com sucesso!"
-#: mural/views.py:1205
+#: mural/views.py:1512
 msgid "Your comment was edited successfully!"
 msgstr "Seu comentário foi editado com sucesso!"
-#: mural/views.py:1212
+#: mural/views.py:1519
 msgid "Comment deleted successfully!"
 msgstr "Comentário deletado com sucesso!"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -173,12 +173,12 @@ msgstr &quot;Pendências Atuais&quot;
 msgid "Notifications History"
 msgstr "Histórico de Notificações"
-#: notifications/templates/notifications/index.html:63
+#: notifications/templates/notifications/index.html:69
 msgid "You do not posses any pendency."
 msgstr "Você não possui nenhuma pendência."
 #: notifications/templates/notifications/subject.html:23
-#: notifications/views.py:162
+#: notifications/views.py:198
 msgid "Pendencies"
 msgstr "Pendências"
@@ -210,37 +210,37 @@ msgstr &quot;Meta definida para realização da tarefa: %s&quot;
 msgid "New goal defined to task realization: %s"
 msgstr "Nova meta definida para realização da tarefa: %s"
-#: notifications/views.py:59 notifications/views.py:123
+#: notifications/views.py:69 notifications/views.py:148
 #, python-format
 msgid "%s - Pendencies"
 msgstr "%s - Pendências"
-#: notifications/views.py:245
+#: notifications/views.py:282
 msgid "No goal date received"
 msgstr "Nenhuma data para meta recebida"
-#: notifications/views.py:252
+#: notifications/views.py:289
 msgid "Could not identify the notification"
 msgstr "Não foi possível identificar a notificação"
-#: notifications/views.py:259
+#: notifications/views.py:296
 msgid "The goal date should be equal or after today's date"
 msgstr ""
 "A meta de realização da tarefa deve ser uma data igual ou posterior à data "
 "atual"
-#: notifications/views.py:262
+#: notifications/views.py:299
 msgid "The goal date should be equal or before subject's date"
 msgstr ""
 "A meta de realização da tarefa deve ser uma data igual ou anterior à data "
 "final do assunto"
-#: notifications/views.py:268
+#: notifications/views.py:311
 #, python-format
 msgid "Your new goal to realize the task %s is %s"
 msgstr "Sua nova meta para realizar a tarefa %s é %s"
-#: notifications/views.py:270
+#: notifications/views.py:313
 #, python-format
 msgid "Your goal to realize the task %s is %s"
 msgstr "Sua meta para realizar a tarefa %s é %s"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,23 +18,23 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: pdf_file/forms.py:24
+#: pdf_file/forms.py:25
 msgid "Tags"
 msgstr ""
-#: pdf_file/forms.py:29
+#: pdf_file/forms.py:30
 msgid "File name"
 msgstr "Nome do arquivo"
-#: pdf_file/forms.py:49
+#: pdf_file/forms.py:51
 msgid "This subject already has a pdf file with this name"
 msgstr "Este assunto já possui um arquivo PDF com este nome"
-#: pdf_file/forms.py:61
+#: pdf_file/forms.py:63
 msgid "The file is too large. It should have less than 10MB."
 msgstr "O arquivo é muito grande. Deve ser menor do que 10MB"
-#: pdf_file/forms.py:66
+#: pdf_file/forms.py:68
 msgid "This field is required."
 msgstr ""
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,27 +18,31 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: pendencies/forms.py:41 pendencies/forms.py:44 pendencies/forms.py:47
+#: pendencies/forms.py:49 pendencies/forms.py:52 pendencies/forms.py:55
+#: pendencies/forms.py:128 pendencies/forms.py:131 pendencies/forms.py:134
+#: pendencies/forms.py:137
 msgid "This field is required."
 msgstr "Esse campo é obrigatório."
-#: pendencies/forms.py:52
+#: pendencies/forms.py:60 pendencies/forms.py:142
 msgid "This input should be filled with a date equal or before the End Date."
 msgstr ""
 "Esse campo deve ser preenchido com uma data igual ou anterior à Data Final."
-#: pendencies/forms.py:53
+#: pendencies/forms.py:61 pendencies/forms.py:143 pendencies/forms.py:149
 msgid "This input should be filled with a date equal or after the Begin Date."
 msgstr ""
 "Esse campo deve ser preenchido com uma data igual ou posterior à Data "
 "Inicial."
-#: pendencies/forms.py:60 pendencies/forms.py:70
+#: pendencies/forms.py:68 pendencies/forms.py:78 pendencies/forms.py:162
+#: pendencies/forms.py:172 pendencies/forms.py:182
 msgid "This input should be filled with a date equal or after today's date."
 msgstr ""
 "Esse campo deve ser preenchido com uma data igual ou posterior à data atual."
-#: pendencies/forms.py:63 pendencies/forms.py:73
+#: pendencies/forms.py:71 pendencies/forms.py:81 pendencies/forms.py:165
+#: pendencies/forms.py:175 pendencies/forms.py:185
 msgid ""
 "This input should be filled with a date equal or after the subject begin "
 "date."
@@ -46,20 +50,49 @@ msgstr &quot;&quot;
 "Esse campo deve ser preenchido com uma data igual ou posterior à data "
 "inicial do assunto."
-#: pendencies/forms.py:66
+#: pendencies/forms.py:74 pendencies/forms.py:168
 msgid ""
 "This input should be filled with a date equal or after the subject end date."
 msgstr ""
 "Esse campo deve ser preenchido com uma data igual ou posterior à data final "
 "do assunto."
-#: pendencies/forms.py:76
+#: pendencies/forms.py:84 pendencies/forms.py:178 pendencies/forms.py:188
 msgid ""
 "This input should be filled with a date equal or before the subject end date."
 msgstr ""
 "Esse campo deve ser preenchido com uma data igual ou anterior à data final "
 "do assunto"
+#: pendencies/forms.py:148 pendencies/forms.py:154
+#, fuzzy
+#| msgid ""
+#| "This input should be filled with a date equal or before the End Date."
+msgid "This input should be filled with a date equal or before the Limit Date."
+msgstr ""
+"Esse campo deve ser preenchido com uma data igual ou anterior à Data Final."
+
+#: pendencies/forms.py:155
+#, fuzzy
+#| msgid ""
+#| "This input should be filled with a date equal or after the Begin Date."
+msgid "This input should be filled with a date equal or after the End Date."
+msgstr ""
+"Esse campo deve ser preenchido com uma data igual ou posterior à Data "
+"Inicial."
+
+#: pendencies/forms.py:196 pendencies/forms.py:200 pendencies/forms.py:204
+#, fuzzy
+#| msgid ""
+#| "This input should be filled with a date equal or before the subject end "
+#| "date."
+msgid ""
+"This input should be filled with a date equal or before the goals submission "
+"limit date."
+msgstr ""
+"Esse campo deve ser preenchido com uma data igual ou anterior à data final "
+"do assunto"
+
 #: pendencies/models.py:8
 msgid "Action"
 msgstr "Ação"
@@ -84,6 +117,10 @@ msgstr &quot;Acessar&quot;
 msgid "Finish"
 msgstr ""
+#: pendencies/models.py:8
+msgid "Submit"
+msgstr ""
+
 #: pendencies/models.py:9
 msgid "Begin Date"
 msgstr "Data Inicial"
@@ -5,12 +5,12 @@ import datetime
 class CreateInteractionReportForm(forms.Form):
-	topic = forms.ChoiceField(required=True, label= _("topics to select data from"))
-	init_date = forms.DateField(required=True)
-	end_date = forms.DateField(required=True)
+	topic = forms.ChoiceField( label= _("Topics to select data from"))
+	init_date = forms.DateField()
+	end_date = forms.DateField()
-	from_mural = forms.BooleanField()
-	from_messages = forms.BooleanField()
+	from_mural = forms.BooleanField(required=False)
+	from_messages = forms.BooleanField(required=False)
 	class Meta:
 		fields = ('topic', 'init_date', 'end_date', 'from_mural' , 'from_messages')
@@ -20,5 +20,18 @@ class CreateInteractionReportForm(forms.Form):
 		initial = kwargs['initial']
 		topics = list(initial['topic'])
-		
+		self.subject = initial['subject'] #so we can check date cleaned data
 		self.fields['topic'].choices = [(topic.id, topic.name) for topic in topics]
+		self.fields['topic'].choices.append((_("All"), _("All")))
+
+	def clean_init_date(self):
+		init_date = self.cleaned_data.get('init_date')
+		if init_date < self.subject.init_date:
+			self._errors['init_date'] = [_('This date should be right or after ' + str(self.subject.init_date) + ', which is when the subject started. ')]
+		return init_date
+
+	def clean_end_date(self):
+		end_date = self.cleaned_data.get('init_date')
+		if end_date > self.subject.init_date:
+			self._errors['end_date'] = [_('This date should be right or before ' + str(self.subject.init_date) + ', which is when the subject finishes. ')]
+		return end_date
 \ No newline at end of file
@@ -0,0 +1,86 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: reports/forms.py:8
+msgid "Topics to select data from"
+msgstr ""
+
+#: reports/forms.py:25
+msgid "All"
+msgstr ""
+
+#: reports/templates/reports/create.html:21
+#: reports/templates/reports/report.html.py:20
+#: reports/templates/reports/view.html:33
+msgid "Analytics"
+msgstr ""
+
+#: reports/templates/reports/create.html:31
+#: reports/templates/reports/report.html.py:30
+#: reports/templates/reports/view.html:43
+msgid "Interaction Data"
+msgstr ""
+
+#: reports/templates/reports/create.html:34
+#: reports/templates/reports/report.html.py:33
+#: reports/templates/reports/view.html:46
+msgid "Report Card"
+msgstr ""
+
+#: reports/templates/reports/create.html:37
+#: reports/templates/reports/report.html.py:36
+#: reports/templates/reports/view.html:49
+msgid "Participation"
+msgstr ""
+
+#: reports/templates/reports/view.html:56
+msgid "Subject"
+msgstr ""
+
+#: reports/templates/reports/view.html:57
+msgid "Topic"
+msgstr ""
+
+#: reports/templates/reports/view.html:58
+msgid "Initial Date"
+msgstr ""
+
+#: reports/templates/reports/view.html:59
+msgid "End Date"
+msgstr ""
+
+#: reports/templates/reports/view.html:60
+msgid "new search"
+msgstr ""
+
+#: reports/templates/reports/view.html:66
+msgid "register(s)"
+msgstr ""
+
+#: reports/templates/reports/view.html:68
+msgid "Variable Descriptions"
+msgstr ""
+
+#: reports/templates/reports/view.html:72
+msgid "Interactions Data"
+msgstr ""
+
+#: reports/views.py:47
+msgid "Report created successfully"
+msgstr ""
@@ -11,6 +11,21 @@
 			{% render_field field class='form-control' %}
     {% endif %}
+    {% if field.errors %}
+            <div class="row">
+                </br>
+                <div class="alert alert-danger alert-dismissible" role="alert">
+                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                        </button>
+                    <ul>
+                        {% for error in field.errors %}
+                            <li>{{ error }}</li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            </div>
+        {% endif %}
     {% endfor %}
     <div class="row text-center">
         <input type="submit" value="Search" class="btn btn-success btn-raised" />
@@ -0,0 +1,45 @@
+{% extends 'base.html' %}
+
+{% load static i18n pagination %}
+{% load django_bootstrap_breadcrumbs %}
+{% load widget_tweaks %}
+
+{% block breadcrumbs %}
+    {{ block.super }}
+    {% breadcrumb subject.category 'subjects:cat_view' subject.category.slug %}
+    {% breadcrumb subject 'subjects:view' subject.slug %}
+    {% breadcrumb 'analytics' '' %}
+{% endblock %}
+
+{% block content %}
+	
+	<div class="panel panel-info topic-panel">
+            <div class="panel-heading">
+            	<div class="row">
+                    <div class="col-md-12 category-header">
+                        <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
+                            <span>{% trans "Analytics" %}</span>
+                        </h4>
+                    </div>
+                </div>
+            </div>
+    </div>
+
+    <div id="core-subjects-options-div">
+        <ul class="core-subjects-options report-menu-choice">
+        	<li class="active">
+        		{% trans "Interaction Data" %}
+        	</li>
+        	<li>
+        		{% trans "Report Card" %}
+        	</li>
+        	<li>
+        		{% trans "Participation" %}
+        	</li>
+        </ul>
+    </div>
+
+    {% include "reports/_form.html" %}
+	
+	
+{% endblock content %}
 \ No newline at end of file
@@ -1,57 +0,0 @@
-{% extends 'base.html' %}
-
-{% load static i18n pagination %}
-{% load django_bootstrap_breadcrumbs %}
-{% load widget_tweaks %}
-
-{% block breadcrumbs %}
-    {{ block.super }}
-    
-    {% breadcrumb 'analytics' '' %}
-{% endblock %}
-
-{% block content %}
-	
-	<div class="panel panel-info topic-panel">
-            <div class="panel-heading">
-            	<div class="row">
-                    <div class="col-md-12 category-header">
-                        <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
-                            <span>{% trans "Analytics" %}</span>
-                        </h4>
-                    </div>
-                </div>
-            </div>
-    </div>
-
-    <div id="core-subjects-options-div">
-        <ul class="core-subjects-options report-menu-choice">
-        	<li class="active">
-        		{% trans "Interaction Data" %}
-        	</li>
-        	<li>
-        		{% trans "Report Card" %}
-        	</li>
-        	<li>
-        		{% trans "Participation" %}
-        	</li>
-        </ul>
-    </div>
-
-    {% include "reports/_form.html" %}
-	
-	{% for user, datum in data.items %}
-		
-
-		<p>
-			<ul>
-
-				{{user}} : 
-				{% for key, value in datum.items %}
-					<li>{{key}}: {{value}}</li>
-				{% endfor %}
-			</ul>
-
-		</p>
-	{% endfor %}
-{% endblock content %}
 \ No newline at end of file
@@ -0,0 +1,105 @@
+{% extends 'base.html' %}
+
+{% load static i18n pagination %}
+{% load django_bootstrap_breadcrumbs %}
+{% load widget_tweaks %}
+
+{% block breadcrumbs %}
+    {{ block.super }}
+    {% breadcrumb view.subject.category 'subjects:cat_view' view.subject.category.slug %}
+    {% breadcrumb view.subject 'subjects:view' view.subject.slug %}
+    {% breadcrumb 'analytics' '' %}
+{% endblock %}
+
+{% block content %}
+
+	{% if messages %}
+        {% for message in messages %}
+            <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <p>{{ message }}</p>
+            </div>
+        {% endfor %}
+    {% endif %}
+
+
+	<div class="panel panel-info topic-panel">
+            <div class="panel-heading">
+            	<div class="row">
+                    <div class="col-md-12 category-header">
+                        <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
+                            <span>{% trans "Analytics" %}</span>
+                        </h4>
+                    </div>
+                </div>
+            </div>
+    </div>
+
+    <div id="core-subjects-options-div">
+        <ul class="core-subjects-options report-menu-choice">
+        	<li class="active">
+        		{% trans "Interaction Data" %}
+        	</li>
+        	<li>
+        		{% trans "Report Card" %}
+        	</li>
+        	<li>
+        		{% trans "Participation" %}
+        	</li>
+        </ul>
+    </div>
+
+    <div class="col-md-12">
+    	<ul id="report-header">
+    		<li><b>{% trans "Subject" %}:</b> {{subject_name}}</li>
+    		<li><b>{% trans "Topic" %}:</b> {{topic_name}}</li>
+    		<li><b>{% trans "Initial Date" %}:</b> {{init_date}}</li>
+    		<li><b>{% trans "End Date" %}:</b> {{end_date}}</li>
+    		<li><a href="{% url 'subjects:reports:create_interaction' %}?subject_id={{subject.id}}"><button class="btn btn-success btn-raised">{% trans "new search" %}</button></a></li>
+
+    	</ul>
+
+    <div>
+    	<ul id="report-info">
+    		<li> {{data.values|length}} {% trans "register(s)" %} </li>
+    		<li>
+    			<i class="fa fa-download" aria-hidden="true"></i> {% trans "Variable Descriptions" %}
+
+    		</li>
+    		<li>
+    			<i class="fa fa-download" aria-hidden="true"></i> {% trans "Interactions Data" %}
+    		</li>
+    	</ul>
+    	
+
+    </div>
+    <div class="table-responsive">
+    	<table class="table table-striped">
+    	<thead>
+    		<tr>	
+    		
+	    	{% for value in header  %}
+	    		<th>{{value}}</th>
+	    	{% endfor %}
+    		</tr>
+    	</thead>
+    	<tbody>
+    		
+
+    		{% for variables in data.values  %}
+    		<tr>
+    			{% for variable in variables %}
+    				<td>{{variable}}</td>
+    			{% endfor %}
+    		</tr>
+    		{% endfor %}
+    	</tbody>
+
+    	</table>
+    </div>
+    </div>
+
+
+{% endblock content %}
 \ No newline at end of file
@@ -4,4 +4,5 @@ from . import views
 urlpatterns = [
     url(r'^create/interactions/$', views.ReportView.as_view(), name='create_interaction'),
+    url(r'^view/interactions/$', views.ViewReportView.as_view(), name='view_report'),
 ]
 \ No newline at end of file
@@ -3,6 +3,9 @@ from django.http import HttpResponse, JsonResponse
 from django.utils.translation import ugettext_lazy as _
 from django import forms
+from django.core.urlresolvers import reverse_lazy
+
+from django.contrib import messages
 import django.views.generic as generic
 from mural.models import SubjectPost, Comment, MuralVisualizations
@@ -15,7 +18,7 @@ from log.models import Log
 class ReportView(LoginRequiredMixin, generic.FormView):
-    template_name = "reports/report.html"
+    template_name = "reports/create.html"
     form_class = CreateInteractionReportForm
     def get_initial(self):
@@ -27,6 +30,158 @@ class ReportView(LoginRequiredMixin, generic.FormView):
         params = self.request.GET
         subject = Subject.objects.get(id=params['subject_id'])
         topics = subject.topic_subject.all()
+        initial['subject'] = subject
         initial['topic'] = topics
         initial['end_date'] =  date.today()
         return initial
+
+    def get_context_data(self, **kwargs):
+        context = super(ReportView, self).get_context_data(**kwargs)
+        subject = Subject.objects.get(id=self.request.GET['subject_id'])
+
+        context['subject'] = subject
+       
+        return context
+
+    def get_success_url(self):
+
+        messages.success(self.request, _("Report created successfully"))
+
+        get_params = "?"
+        #passing form data through GET 
+        for key, value in self.form_data.items():
+            get_params += key +  "=" + str(value)  + "&"
+
+        
+        #retrieving subject id for data purposes
+        for key, value in self.request.GET.items():
+            get_params += key + "=" + str(value) 
+
+        return reverse_lazy('subjects:reports:view_report', kwargs={}) + get_params
+
+    def post(self, request, *args, **kwargs):
+        """
+        Handles POST requests, instantiating a form instance with the passed
+        POST variables and then checked for validity.
+        """
+        form = self.get_form()
+        if form.is_valid():
+
+            self.form_data = form.cleaned_data
+            return self.form_valid(form)
+        else:
+            return self.form_invalid(form)
+
+
+class ViewReportView(LoginRequiredMixin, generic.TemplateView):
+    template_name = "reports/view.html"
+
+
+    def get_context_data(self, **kwargs):
+        context = {}
+        params_data = self.request.GET
+        subject = Subject.objects.get(id=params_data['subject_id'])
+        context['subject_name'] = subject.name
+        context['topic_name'] = params_data['topic']
+        context['init_date'] = params_data['init_date']
+        context['end_date'] = params_data['end_date']
+        context['subject'] = subject
+        if params_data['from_mural']:
+            context['data'], context['header'] = self.get_mural_data(subject, params_data['init_date'], params_data['end_date'])
+        return context
+
+    def get_mural_data(self, subject, init_date, end_date):
+        data = {}
+        students = subject.students.all()
+        formats = ["%d/%m/%Y", "%m/%d/%Y"] #so it accepts english and portuguese date formats
+        for fmt in formats:
+            try:
+                init_date = datetime.strptime(init_date, fmt)
+                end_date = datetime.strptime(end_date, fmt)
+            except ValueError:
+                pass
+
+        header = ['User']
+
+        for student in students:
+            data[student] = []
+
+            data[student].append(student.social_name)
+
+            interactions = {}
+            #interactions['username'] = student.social_name
+            
+            help_posts_made_by_user = SubjectPost.objects.filter(action="help",space__id=subject.id, user=student, 
+                create_date__range=(init_date, end_date))
+
+            #number of help posts created by the student
+            interactions['v01'] = help_posts_made_by_user.count()
+
+            help_posts = SubjectPost.objects.filter(action="help", create_date__range=(init_date, end_date), 
+            space__id=subject.id)
+
+            #comments count on help posts created by the student
+            interactions['v02'] = Comment.objects.filter(post__in = help_posts.filter(user=student), 
+                create_date__range=(init_date, end_date)).count()
+            
+
+            #count the amount of comments made by the student on posts made by one of the professors
+            interactions['v03'] = Comment.objects.filter(post__in = help_posts.filter(user__in= subject.professor.all()), create_date__range=(init_date, end_date),
+             user=student).count()
+
+             #comments made by the user on other users posts
+            interactions['v04'] = Comment.objects.filter(post__in = help_posts.exclude(user=student), 
+                create_date__range=(init_date, end_date),
+                user= student).count()
+           
+            
+           
+            comments_by_teacher = Comment.objects.filter(user__in=subject.professor.all())
+            help_posts_ids = []
+            for comment in  comments_by_teacher:
+                help_posts_ids.append(comment.post.id)
+             #number of help posts created by the user that the teacher commented on
+            interactions['v05'] = help_posts.filter(user=student, id__in = help_posts_ids).count()
+
+           
+            comments_by_others = Comment.objects.filter(user__in=subject.students.exclude(id = student.id))
+            help_posts_ids = []
+            for comment in  comments_by_teacher:
+                help_posts_ids.append(comment.post.id)
+            #number of help posts created by the user others students commented on
+            interactions['v06'] = help_posts.filter(user=student, id__in = help_posts_ids).count()
+
+            #Number of student visualizations on the mural of the subject
+            interactions['v07'] = MuralVisualizations.objects.filter(post__in = SubjectPost.objects.filter(space__id=subject.id),
+                user = student).count()
+            
+
+            #VAR20 - number of access to mural between 6 a.m to 12a.m.
+            interactions['v20'] =  Log.objects.filter(action="access", resource="subject", 
+                user_id= student.id, context__contains = {'subject_id' : subject.id}, datetime__hour__range = (5, 11)).count()
+
+            #VAR21 - number of access to mural between 6 a.m to 12a.m.
+            interactions['v21'] =  Log.objects.filter(action="access", resource="subject", 
+                user_id= student.id, context__contains = {'subject_id' : subject.id}, datetime__hour__range = (11, 17)).count()
+            #VAR22
+            interactions['v22'] =  Log.objects.filter(action="access", resource="subject", 
+                user_id= student.id, context__contains = {'subject_id' : subject.id}, datetime__hour__range = (17, 23)).count()
+
+            #VAR23
+            interactions['v23'] =  Log.objects.filter(action="access", resource="subject", 
+                user_id= student.id, context__contains = {'subject_id' : subject.id}, datetime__hour__range = (23, 5)).count()
+
+            #VAR24 through 30
+            day_numbers = [0, 1, 2, 3, 4, 5, 6]
+            day_names = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"]
+            for day_num in day_numbers:
+                interactions['v'+ str(24+day_num)] =  Log.objects.filter(action="access", resource="subject", 
+                user_id= student.id, context__contains = {'subject_id' : subject.id}, datetime__week_day = day_num).count()
+             
+            for value in interactions.values():
+                data[student].append(value)
+            if len(header) <= 1:
+                for key in interactions.keys():
+                    header.append(key)
+        return data, header
+
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,17 +18,36 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: subjects/forms.py:14 subjects/forms.py:129
+#: subjects/forms.py:14 subjects/forms.py:117
 msgid "Tags"
 msgstr "Tags"
-#: subjects/forms.py:82 subjects/forms.py:187
+#: subjects/forms.py:67 subjects/forms.py:170
 msgid "There is another subject with this name, try another one."
 msgstr "Já existe um assunto com esse nome, tente outro."
-#: subjects/forms.py:91 subjects/forms.py:100 subjects/forms.py:108
-#: subjects/forms.py:116
-msgid "this date must be today or after"
+#: subjects/forms.py:76 subjects/forms.py:180
+#, fuzzy
+#| msgid "this date must be today or after"
+msgid "This date must be today or after"
+msgstr "Essa data deve ser hoje ou depois disso"
+
+#: subjects/forms.py:86 subjects/forms.py:190
+#, fuzzy
+#| msgid "this date must be today or after"
+msgid "This date must be equal subscribe begin or after"
+msgstr "Essa data deve ser hoje ou depois disso"
+
+#: subjects/forms.py:96 subjects/forms.py:200
+#, fuzzy
+#| msgid "this date must be today or after"
+msgid "This date must be after subscribe end"
+msgstr "Essa data deve ser hoje ou depois disso"
+
+#: subjects/forms.py:105 subjects/forms.py:209
+#, fuzzy
+#| msgid "this date must be today or after"
+msgid "This date must be equal init date or after"
 msgstr "Essa data deve ser hoje ou depois disso"
 #: subjects/models.py:14 subjects/models.py:20
@@ -111,15 +130,16 @@ msgstr &quot;Fechar&quot;
 msgid "DELETE"
 msgstr "Deletar"
-#: subjects/templates/subjects/initial.html:30
+#: subjects/templates/subjects/initial.html:33
+#: subjects/templates/subjects/initial.html:67
 msgid "Most popular keywords"
 msgstr "Palavras-chave mais populares"
-#: subjects/templates/subjects/initial.html:66 subjects/views.py:183
+#: subjects/templates/subjects/initial.html:93 subjects/views.py:185
 msgid "My Subjects"
 msgstr "Meus assuntos"
-#: subjects/templates/subjects/initial.html:79
+#: subjects/templates/subjects/initial.html:106
 #: subjects/templates/subjects/list.html:180
 msgid "You still do not posses any subject in our platform"
 msgstr "Você ainda não possui assuntos em nossa plataforma"
@@ -186,12 +206,12 @@ msgid &quot; Any subjects or Resources were not found on the search for &quot;
 msgstr " Nenhum assunto ou recursos foram encontrados na busca por "
 #: subjects/templates/subjects/list_search.html:48
-#: subjects/templates/subjects/list_search.html:51 subjects/views.py:613
+#: subjects/templates/subjects/list_search.html:51 subjects/views.py:619
 msgid "Subjects"
 msgstr "Assuntos"
 #: subjects/templates/subjects/list_search.html:49
-#: subjects/templates/subjects/list_search.html:52 subjects/views.py:620
+#: subjects/templates/subjects/list_search.html:52 subjects/views.py:626
 msgid "Resources"
 msgstr "Recursos"
@@ -268,52 +288,52 @@ msgstr &quot;Editar: &quot;
 msgid "Create new topic"
 msgstr "Criar novo tópico"
-#: subjects/views.py:57
+#: subjects/views.py:59
 msgid "Home"
 msgstr "Início"
-#: subjects/views.py:155
+#: subjects/views.py:157
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Página não é a 'última', e também não pode ser convertido para um inteiro"
-#: subjects/views.py:161
+#: subjects/views.py:163
 #, python-format
 msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr "Página inválida (%(page_number)s): %(message)s"
-#: subjects/views.py:190
+#: subjects/views.py:192
 msgid "All Subjects"
 msgstr "Todos os assuntos"
-#: subjects/views.py:284
+#: subjects/views.py:286
 msgid "Create Subject"
 msgstr "Criar Assunto"
-#: subjects/views.py:290
+#: subjects/views.py:292
 msgid "Replicate Subject"
 msgstr "Replicar Assunto"
-#: subjects/views.py:332
+#: subjects/views.py:334
 #, python-format
 msgid "The Subject \"%s\" was registered on \"%s\" Category successfully!"
 msgstr "Assunto \"%s\" foi registrado na categoria \"%s\" com sucesso!"
-#: subjects/views.py:358
+#: subjects/views.py:360
 msgid "Update Subject"
 msgstr "Atualizar Assunto"
-#: subjects/views.py:378
+#: subjects/views.py:384
 #, python-format
 msgid "The Subject \"%s\" was updated on \"%s\" Category successfully!"
 msgstr "Assunto \"%s\" foi atualizado na categoria \"%s\" com sucesso!"
-#: subjects/views.py:419 subjects/views.py:463
+#: subjects/views.py:425 subjects/views.py:469
 #, python-format
 msgid "Subject \"%s\" removed successfully!"
 msgstr "Assunto \"%s\" removido com sucesso!"
-#: subjects/views.py:427 subjects/views.py:431
+#: subjects/views.py:433 subjects/views.py:437
 msgid ""
 "Subject can't be removed. The subject still possess students and learning "
 "objects associated"
@@ -321,11 +341,11 @@ msgstr &quot;&quot;
 "Assunto não pode ser removido. Ele ainda possui alunos e objetos de "
 "aprendizado associados"
-#: subjects/views.py:539
+#: subjects/views.py:545
 msgid "Subscription date is due!"
 msgstr "O período de inscrição está encerrado!"
-#: subjects/views.py:552
+#: subjects/views.py:558
 msgid "Subscription was successfull!"
 msgstr "Inscrição feita com sucesso!"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,7 +116,11 @@ msgstr &quot;Deletar&quot;
 msgid "Edit"
 msgstr "Editar"
-#: topics/templates/resources/list.html:32 topics/templates/topics/list.html:29
+#: topics/templates/resources/list.html:33
+msgid "Reports"
+msgstr "Relatórios"
+
+#: topics/templates/resources/list.html:35 topics/templates/topics/list.html:29
 msgid "Remove"
 msgstr "Remover"
@@ -128,7 +132,7 @@ msgstr &quot;Apenas um tópico por asssunto pode ser um repositório&quot;
 msgid "Save"
 msgstr "Salvar"
-#: topics/templates/topics/create.html:8 topics/views.py:81
+#: topics/templates/topics/create.html:8 topics/views.py:85
 msgid "Create Topic"
 msgstr "Criar Tópico"
@@ -169,32 +173,34 @@ msgid &quot;Webpage&quot;
 msgstr "Página Web"
 #: topics/templates/topics/list.html:61
+msgid "Topic Goals"
+msgstr "Metas do Tópico"
+
+#: topics/templates/topics/list.html:62
 msgid "Questionary"
 msgstr "Questionário"
-#: topics/templates/topics/update.html:8 topics/views.py:130
+#: topics/templates/topics/update.html:8 topics/views.py:134
 msgid "Update Topic"
 msgstr "Atualizar Tópico"
-#: topics/views.py:91
+#: topics/views.py:95
 #, python-format
 msgid "Topic \"%s\" was created on virtual enviroment \"%s\" successfully!"
 msgstr "Tópico \"%s\" foi criado no ambiente virtual \"%s\" com sucesso!"
-#: topics/views.py:140
+#: topics/views.py:151
 #, python-format
 msgid "Topic \"%s\" was updated on virtual enviroment \"%s\" successfully!"
 msgstr "Tópico \"%s\" foi atualizado no ambiente virtual \"%s\" com sucesso!"
-#: topics/views.py:182
-#, fuzzy
-#| msgid "Could not remove this topic. It has on or more resources attached."
+#: topics/views.py:193
 msgid "Could not remove this topic. It has one or more resources attached."
 msgstr ""
 "Não é possível remover esse tópico. Ele possui um ou mais recursos "
 "vinculados."
-#: topics/views.py:191
+#: topics/views.py:202
 #, python-format
 msgid "Topic \"%s\" was removed from virtual enviroment \"%s\" successfully!"
 msgstr "Tópico \"%s\" foi removido do ambiente virtual \"%s\" com sucesso!"
@@ -57,8 +57,8 @@
 							    	<li><a href="#"><i class="fa fa-comments-o"></i> {% trans 'Forum' %}</a></li>
 							    	<li><a href="{% url 'file_links:create' topic.slug %}"><i class="fa fa-file-archive-o"></i> {% trans 'File Link' %}</a></li>
 							    	<li><a href="{% url 'links:create' topic.slug %}" > <i class="fa fa-globe"></i> {% trans "Link to Website" %}</a>
-							    	<li><a href="{% url 'webpages:create' topic.slug %}"><i class="fa fa-file-code-o"></i> {% trans 'Webpage' %}</a></li>
 							    	<li><a href="{% url 'goals:create' topic.slug %}"><i class="fa fa-line-chart"></i> {% trans 'Topic Goals' %}</a></li>
+							    	<li><a href="{% url 'webpages:create' topic.slug %}"><i class="fa fa-file-code-o"></i> {% trans 'Webpage' %}</a></li>
 							    	<li><a href="#"><i class="fa fa-question-circle-o"></i> {% trans 'Questionary' %}</a></li>
 							  	</ul>
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,57 +18,57 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: users/forms.py:21
+#: users/forms.py:25 users/forms.py:30 users/forms.py:189
 msgid "You must insert an email address"
 msgstr "Você deve inserir um endereço de email"
-#: users/forms.py:31
+#: users/forms.py:40
 msgid "The image is too large. It should have less than 2MB."
 msgstr "A imagem é muito grande. Ela deve conter menos de 2MB."
-#: users/forms.py:42
+#: users/forms.py:51
 msgid "The confirmation password is incorrect."
 msgstr "A confirmação de senha está incorreta."
-#: users/forms.py:49 users/forms.py:102 users/templates/users/login.html:52
+#: users/forms.py:58 users/forms.py:114 users/templates/users/login.html:52
 msgid "Password"
 msgstr "Senha"
-#: users/forms.py:50 users/forms.py:103 users/forms.py:132 users/forms.py:183
+#: users/forms.py:59 users/forms.py:115 users/forms.py:146 users/forms.py:202
 msgid "Confirm Password"
 msgstr "Confirmação de Senha"
-#: users/forms.py:67 users/forms.py:166 users/templates/users/list.html:56
+#: users/forms.py:76 users/forms.py:180 users/templates/users/list.html:56
 #: users/templates/users/login.html:47 users/templates/users/search.html:47
 msgid "Email"
 msgstr "Email"
-#: users/forms.py:68 users/models.py:27 users/templates/users/list.html:55
+#: users/forms.py:77 users/models.py:27 users/templates/users/list.html:55
 #: users/templates/users/search.html:46
 msgid "Name"
 msgstr "Nome"
-#: users/forms.py:69 users/models.py:28
+#: users/forms.py:78 users/models.py:28
 msgid "Last Name"
 msgstr "Sobrenome"
-#: users/forms.py:70 users/models.py:29
+#: users/forms.py:79 users/models.py:29
 msgid "Social Name"
 msgstr "Nome Social"
-#: users/forms.py:131 users/forms.py:182
+#: users/forms.py:145 users/forms.py:201
 msgid "New Password"
 msgstr "Nova Senha"
-#: users/forms.py:138
+#: users/forms.py:152
 msgid "The value inputed does not match with your actual password."
 msgstr "O valor inserido não corresponde à sua senha atual."
-#: users/forms.py:159
+#: users/forms.py:173
 msgid "Actual Password"
 msgstr "Senha Atual"
-#: users/forms.py:175
+#: users/forms.py:194
 msgid "You must insert a valid email address"
 msgstr "Você deve inserir um endereço de email válido"
@@ -188,7 +188,7 @@ msgstr &quot;Remover Conta&quot;
 msgid "Are you sure you want delete your account?"
 msgstr "Tem certeza que deseja deletar sua conta?"
-#: users/templates/users/forgot_password.html:39 users/views.py:379
+#: users/templates/users/forgot_password.html:39 users/views.py:380
 msgid "Forgot Password"
 msgstr "Esqueceu Senha"
@@ -243,7 +243,7 @@ msgstr &quot;Entre com a sua conta para continuar&quot;
 msgid "Log in"
 msgstr "Entrar"
-#: users/templates/users/login.html:66 users/views.py:353
+#: users/templates/users/login.html:66 users/views.py:354
 msgid "Sign Up"
 msgstr "Cadastrar"
@@ -295,37 +295,37 @@ msgstr &quot;Não é professor&quot;
 msgid "Is not a student"
 msgstr "Não é estudante"
-#: users/views.py:54
+#: users/views.py:55
 msgid "Manage Users"
 msgstr "Gerenciar Usuários"
-#: users/views.py:84
+#: users/views.py:85
 msgid "Search Users"
 msgstr "Pesquisar Usuário"
-#: users/views.py:107
+#: users/views.py:108
 #, python-format
 msgid "User %s created successfully"
 msgstr "Usuário %s criado com sucesso"
-#: users/views.py:121
+#: users/views.py:122
 msgid "Add User"
 msgstr "Cadastrar Usuário"
-#: users/views.py:155
+#: users/views.py:156
 #, python-format
 msgid "User %s updated successfully"
 msgstr "Usuário %s atualizado com sucesso"
-#: users/views.py:169
+#: users/views.py:170
 msgid "Update User"
 msgstr "Atualizar Usuário"
-#: users/views.py:224
+#: users/views.py:225
 msgid "User removed successfully!"
 msgstr "Usuário removido com sucesso!"
-#: users/views.py:225
+#: users/views.py:226
 msgid ""
 "Could not remove the account. The user is attach to one or more functions "
 "(administrator, coordinator, professor ou student) in the system."
@@ -333,39 +333,39 @@ msgstr &quot;&quot;
 "Não é possível deletar a conta. O usuário está vinculado com uma ou mais "
 "funções (administrador, coordenador, professor ou estudante) no sistema."
-#: users/views.py:248
+#: users/views.py:249
 msgid "Delete Account"
 msgstr "Remover Conta"
-#: users/views.py:291
+#: users/views.py:292
 msgid "Password changed successfully!"
 msgstr "Senha alterada com sucesso!"
-#: users/views.py:297
+#: users/views.py:298
 msgid "Change Password"
 msgstr "Alterar Senha"
-#: users/views.py:315
+#: users/views.py:316
 msgid "Profile"
 msgstr "Perfil"
-#: users/views.py:334
+#: users/views.py:335
 msgid "Update Profile"
 msgstr "Atualizar Perfil"
-#: users/views.py:340
+#: users/views.py:341
 msgid "Profile edited successfully!"
 msgstr "Perfil editado com sucesso!"
-#: users/views.py:360
+#: users/views.py:361
 msgid "User successfully registered!"
 msgstr "Usuário cadastrado com sucesso!"
-#: users/views.py:398
+#: users/views.py:399
 msgid "Recover Password"
 msgstr "Recuperar Senha"
-#: users/views.py:434
+#: users/views.py:435
 msgid ""
 "Soon you'll receive an email with instructions to set your new password. If "
 "you don't receive it in 24 hours, please check your spam box."
@@ -373,34 +373,34 @@ msgstr &quot;&quot;
 "Em breve você receberá um email com instruções para cadastrar sua nova "
 "senha. Se você não recebê-lo em 24 hhoras, por favor olhe sua caixa de spam."
-#: users/views.py:439
+#: users/views.py:438
 msgid "No user is associated with this email address"
 msgstr "Nenhum usuário associado com esse endereço de email."
-#: users/views.py:450
+#: users/views.py:451
 msgid "Reset Password"
 msgstr "Recuperar Senha"
-#: users/views.py:472
+#: users/views.py:473
 msgid "Password reset successfully."
 msgstr "Senha alterada com sucesso!"
-#: users/views.py:476
+#: users/views.py:477
 msgid "We were not able to reset your password."
 msgstr "Não foi possível restaurar sua senha"
-#: users/views.py:479
+#: users/views.py:480
 msgid "The reset password link is no longer valid."
 msgstr "O link para restaurar senha não está mais válido."
-#: users/views.py:485
+#: users/views.py:486
 msgid "Log In"
 msgstr "Entrar"
-#: users/views.py:506
+#: users/views.py:507
 msgid "System under maintenance. Try again later"
 msgstr "Sistema em manutenção. Tente novamente mais tarde"
-#: users/views.py:508
+#: users/views.py:509
 msgid "E-mail or password are incorrect."
 msgstr "Email ou senha incorretos."
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 22:07-0300\n"
+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,19 +18,19 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: youtube_video/forms.py:31
+#: youtube_video/forms.py:36
 msgid "Tags"
 msgstr "Tags"
-#: youtube_video/forms.py:37
+#: youtube_video/forms.py:42
 msgid "Video title"
 msgstr "Título do Vídeo"
-#: youtube_video/forms.py:57
+#: youtube_video/forms.py:62
 msgid "This subject already has a youtube video with this name"
 msgstr "Esse assunto já possui um vídeo do YouTube com esse nome"
-#: youtube_video/forms.py:67
+#: youtube_video/forms.py:71
 #, fuzzy
 #| msgid "Invalid URL. It should be an embed YouTube link."
 msgid "Invalid URL. It should be an YouTube link."
	@@ -8,7 +8,7 @@ msgid ""		@@ -8,7 +8,7 @@ msgid ""
8	msgstr ""	8	msgstr ""
9	"Project-Id-Version: PACKAGE VERSION\n"	9	"Project-Id-Version: PACKAGE VERSION\n"
10	"Report-Msgid-Bugs-To: \n"	10	"Report-Msgid-Bugs-To: \n"
11	-"POT-Creation-Date: 2017-02-20 22:07-0300\n"	11	+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"	12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"	13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14	"Language-Team: LANGUAGE <LL@li.org>\n"	14	"Language-Team: LANGUAGE <LL@li.org>\n"
	@@ -18,11 +18,11 @@ msgstr ""		@@ -18,11 +18,11 @@ msgstr ""
18	"Content-Transfer-Encoding: 8bit\n"	18	"Content-Transfer-Encoding: 8bit\n"
19	"Plural-Forms: nplurals=2; plural=(n > 1);\n"	19	"Plural-Forms: nplurals=2; plural=(n > 1);\n"
20		20
21	-#: amadeus/settings.py:162	21	+#: amadeus/settings.py:175
22	msgid "Portuguese"	22	msgid "Portuguese"
23	msgstr ""	23	msgstr ""
24		24
25	-#: amadeus/settings.py:163	25	+#: amadeus/settings.py:176
26	msgid "English"	26	msgid "English"
27	msgstr ""	27	msgstr ""
28		28
	@@ -1209,4 +1209,22 @@ div.dataTables_wrapper div.dataTables_paginate {		@@ -1209,4 +1209,22 @@ div.dataTables_wrapper div.dataTables_paginate {
1209	width: 15%;	1209	width: 15%;
1210	text-align: center;	1210	text-align: center;
1211	}	1211	}
		1212	+#report-header{
		1213	+ padding-left: 0px;
		1214	+}
		1215	+
		1216	+#report-header li {
		1217	+ display: inline;
		1218	+ margin-right: 20px;
		1219	+ font-size: 16px;
		1220	+}
		1221	+
		1222	+#report-info{
		1223	+ padding-left: 0px;
		1224	+}
		1225	+
		1226	+#report-info li{
		1227	+ display: inline;
		1228	+ margin-right: 30px;
		1229	+}
1212	/* End Reports */	1230	/* End Reports */
1213	\ No newline at end of file	1231	\ No newline at end of file
	@@ -40,6 +40,60 @@ function getAnswered() {		@@ -40,6 +40,60 @@ function getAnswered() {
40	});	40	});
41	}	41	}
42		42
		43	+
		44	+ var url = container.find('.answ_log_url').val();
		45	+ var log_input = container.find('.answ_log_id');
		46	+
		47	+ if (typeof(url) != 'undefined') {
		48	+ $.ajax({
		49	+ url: url,
		50	+ data: {'action': 'open'},
		51	+ dataType: 'json',
		52	+ success: function (data) {
		53	+ log_input.val(data.log_id);
		54	+ },
		55	+ error: function (data) {
		56	+ console.log(data);
		57	+ }
		58	+ });
		59	+ }
		60	+
		61	+ var unan_url = container.find('.unan_log_url').val();
		62	+ var unan_log_id = container.find('.unan_log_id').val();
		63	+
		64	+ if (typeof(unan_url) != 'undefined' && unan_log_id != "") {
		65	+ $.ajax({
		66	+ url: unan_url,
		67	+ data: {'action': 'close', 'log_id': unan_log_id},
		68	+ dataType: 'json',
		69	+ success: function (data) {
		70	+ console.log(data.message);
		71	+ container.find('.unan_log_id').val("");
		72	+ },
		73	+ error: function (data) {
		74	+ console.log(data);
		75	+ }
		76	+ });
		77	+ }
		78	+
		79	+ var hist_url = container.find('.hist_log_url').val();
		80	+ var hist_log_id = container.find('.hist_log_id').val();
		81	+
		82	+ if (typeof(hist_url) != 'undefined' && hist_log_id != "") {
		83	+ $.ajax({
		84	+ url: hist_url,
		85	+ data: {'action': 'close', 'log_id': hist_log_id},
		86	+ dataType: 'json',
		87	+ success: function (data) {
		88	+ console.log(data.message);
		89	+ container.find('.hist_log_id').val("");
		90	+ },
		91	+ error: function (data) {
		92	+ console.log(data);
		93	+ }
		94	+ });
		95	+ }
		96	+
43	container.find('.answered_link').addClass('active');	97	container.find('.answered_link').addClass('active');
44	container.find('.answered').show();	98	container.find('.answered').show();
45		99
	@@ -103,6 +157,59 @@ function getUnanswered() {		@@ -103,6 +157,59 @@ function getUnanswered() {
103	});	157	});
104	}	158	}
105		159
		160	+ var url = container.find('.answ_log_url').val();
		161	+ var log_id = container.find('.answ_log_id').val();
		162	+
		163	+ if (typeof(url) != 'undefined' && log_id != "") {
		164	+ $.ajax({
		165	+ url: url,
		166	+ data: {'action': 'close', 'log_id': log_id},
		167	+ dataType: 'json',
		168	+ success: function (data) {
		169	+ console.log(data.message);
		170	+ container.find('.answ_log_id').val("");
		171	+ },
		172	+ error: function (data) {
		173	+ console.log(data);
		174	+ }
		175	+ });
		176	+ }
		177	+
		178	+ var unan_url = container.find('.unan_log_url').val();
		179	+ var unan_log_input = container.find('.unan_log_id');
		180	+
		181	+ if (typeof(unan_url) != 'undefined') {
		182	+ $.ajax({
		183	+ url: unan_url,
		184	+ data: {'action': 'open'},
		185	+ dataType: 'json',
		186	+ success: function (data) {
		187	+ unan_log_input.val(data.log_id);
		188	+ },
		189	+ error: function (data) {
		190	+ console.log(data);
		191	+ }
		192	+ });
		193	+ }
		194	+
		195	+ var hist_url = container.find('.hist_log_url').val();
		196	+ var hist_log_id = container.find('.hist_log_id').val();
		197	+
		198	+ if (typeof(hist_url) != 'undefined' && hist_log_id != "") {
		199	+ $.ajax({
		200	+ url: hist_url,
		201	+ data: {'action': 'close', 'log_id': hist_log_id},
		202	+ dataType: 'json',
		203	+ success: function (data) {
		204	+ console.log(data.message);
		205	+ container.find('.hist_log_id').val("");
		206	+ },
		207	+ error: function (data) {
		208	+ console.log(data);
		209	+ }
		210	+ });
		211	+ }
		212	+
106	container.find('.answered_link').removeClass('active');	213	container.find('.answered_link').removeClass('active');
107	container.find('.answered').hide();	214	container.find('.answered').hide();
108		215
	@@ -153,6 +260,60 @@ function getHistory() {		@@ -153,6 +260,60 @@ function getHistory() {
153	});	260	});
154	}	261	}
155		262
		263	+ var url = container.find('.answ_log_url').val();
		264	+ var log_id = container.find('.answ_log_id').val();
		265	+
		266	+ if (typeof(url) != 'undefined' && log_id != "") {
		267	+ $.ajax({
		268	+ url: url,
		269	+ data: {'action': 'close', 'log_id': log_id},
		270	+ dataType: 'json',
		271	+ success: function (data) {
		272	+ console.log(data.message);
		273	+ container.find('.answ_log_id').val("");
		274	+ },
		275	+ error: function (data) {
		276	+ console.log(data);
		277	+ }
		278	+ });
		279	+ }
		280	+
		281	+ var unan_url = container.find('.unan_log_url').val();
		282	+ var unan_log_id = container.find('.unan_log_id').val();
		283	+
		284	+ if (typeof(unan_url) != 'undefined' && unan_log_id != "") {
		285	+ $.ajax({
		286	+ url: unan_url,
		287	+ data: {'action': 'close', 'log_id': unan_log_id},
		288	+ dataType: 'json',
		289	+ success: function (data) {
		290	+ console.log(data.message);
		291	+ container.find('.unan_log_id').val("");
		292	+ },
		293	+ error: function (data) {
		294	+ console.log(data);
		295	+ }
		296	+
		297	+ });
		298	+ }
		299	+
		300	+ var hist_url = container.find('.hist_log_url').val();
		301	+ var hist_log_input = container.find('.hist_log_id');
		302	+
		303	+ if (typeof(hist_url) != 'undefined') {
		304	+ $.ajax({
		305	+ url: hist_url,
		306	+ data: {'action': 'open'},
		307	+ dataType: 'json',
		308	+ success: function (data) {
		309	+ hist_log_input.val(data.log_id);
		310	+ },
		311	+ error: function (data) {
		312	+ console.log(data);
		313	+ }
		314	+ });
		315	+ }
		316	+
156	container.find('.answered_link').removeClass('active');	317	container.find('.answered_link').removeClass('active');
157	container.find('.answered').hide();	318	container.find('.answered').hide();
158		319
@@ -0,0 +1,370 @@		@@ -0,0 +1,370 @@
	1	+# SOME DESCRIPTIVE TITLE.
	2	+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
	3	+# This file is distributed under the same license as the PACKAGE package.
	4	+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
	5	+#
	6	+#, fuzzy
	7	+msgid ""
	8	+msgstr ""
	9	+"Project-Id-Version: PACKAGE VERSION\n"
	10	+"Report-Msgid-Bugs-To: \n"
	11	+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
	12	+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
	13	+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
	14	+"Language-Team: LANGUAGE <LL@li.org>\n"
	15	+"Language: \n"
	16	+"MIME-Version: 1.0\n"
	17	+"Content-Type: text/plain; charset=UTF-8\n"
	18	+"Content-Transfer-Encoding: 8bit\n"
	19	+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
	20	+#: goals/forms.py:33
	21	+msgid "Tags"
	22	+msgstr "Tags"
	23	+
	24	+#: goals/forms.py:39
	25	+msgid "Name"
	26	+msgstr "Nome"
	27	+
	28	+#: goals/forms.py:58
	29	+#, python-format
	30	+msgid ""
	31	+"There already is another resource with the goals specification for the Topic "
	32	+"%s"
	33	+msgstr "Já existe um outro recurso com a especificação de metas para o tópico %s"
	34	+
	35	+#: goals/forms.py:63
	36	+msgid "This input should be filled with a date equal or after today's date."
	37	+msgstr "Esse campo deve ser preenchido com uma data igual ou posterior à data atual."
	38	+
	39	+#: goals/forms.py:66
	40	+msgid ""
	41	+"This input should be filled with a date equal or after the subject begin "
	42	+"date."
	43	+msgstr "Esse campo deve ser preenchido com uma data igual ou posterior à data de início do assunto."
	44	+
	45	+#: goals/forms.py:69
	46	+msgid ""
	47	+"This input should be filled with a date equal or after the subject end date."
	48	+msgstr "Esse campo deve ser preenchido com uma data igual ou posterior à data final do assunto."
	49	+
	50	+#: goals/forms.py:115
	51	+msgid "This field is required."
	52	+msgstr "Esse campo é obrigatório."
	53	+
	54	+#: goals/models.py:10
	55	+msgid "Presentation"
	56	+msgstr "Apresentação"
	57	+
	58	+#: goals/models.py:11
	59	+msgid "Submission Limit Date"
	60	+msgstr "Data limite para submissão"
	61	+
	62	+#: goals/models.py:14 goals/models.py:39 goals/models.py:47
	63	+#: goals/templates/goals/_form_submit.html:21
	64	+#: goals/templates/goals/view.html:73
	65	+msgid "Goal"
	66	+msgstr "Meta"
	67	+
	68	+#: goals/models.py:15 goals/templates/goals/_answered.html:20
	69	+msgid "Goals"
	70	+msgstr "Metas"
	71	+
	72	+#: goals/models.py:33
	73	+#, python-format
	74	+msgid "Are you sure you want delete the %s topic goals specification"
	75	+msgstr "Você tem certeza que deseja deleta a especificação de metas do tópico %s"
	76	+
	77	+#: goals/models.py:36
	78	+msgid "Description"
	79	+msgstr "Descrição"
	80	+
	81	+#: goals/models.py:37
	82	+msgid "Referential Value"
	83	+msgstr "Valor de referência"
	84	+
	85	+#: goals/models.py:38
	86	+msgid "Order"
	87	+msgstr "Ordem"
	88	+
	89	+#: goals/models.py:45
	90	+msgid "My Value"
	91	+msgstr "Meu valor"
	92	+
	93	+#: goals/models.py:46
	94	+msgid "User"
	95	+msgstr "Usuário"
	96	+
	97	+#: goals/models.py:48
	98	+msgid "Create Date"
	99	+msgstr "Data de criação"
	100	+
	101	+#: goals/models.py:49
	102	+msgid "Last Update"
	103	+msgstr "Última atualização"
	104	+
	105	+#: goals/templates/goals/_answered.html:8
	106	+#: goals/templates/goals/_history.html:11
	107	+#: goals/templates/goals/_unanswered.html:8
	108	+msgid "Student"
	109	+msgstr "Estudante"
	110	+
	111	+#: goals/templates/goals/_answered.html:11
	112	+#: goals/templates/goals/_history.html:14
	113	+#: goals/templates/goals/_unanswered.html:11
	114	+msgid "Group"
	115	+msgstr "Grupo"
	116	+
	117	+#: goals/templates/goals/_answered.html:14
	118	+msgid "Definition Date"
	119	+msgstr "Data de definição"
	120	+
	121	+#: goals/templates/goals/_answered.html:17
	122	+msgid "Update Date"
	123	+msgstr "Data de atualização"
	124	+
	125	+#: goals/templates/goals/_form.html:56
	126	+msgid "Goals Specification"
	127	+msgstr "Especificação de Metas"
	128	+
	129	+#: goals/templates/goals/_form.html:101
	130	+#: goals/templates/goals/_form_submit.html:22
	131	+#: goals/templates/goals/view.html:74
	132	+msgid "Minimum percentage desired"
	133	+msgstr "Porcentagem mínima desejada"
	134	+
	135	+#: goals/templates/goals/_form.html:156
	136	+msgid "Common resources settings"
	137	+msgstr "Configurações comuns a todos os recursos"
	138	+
	139	+#: goals/templates/goals/_form.html:204
	140	+msgid "Pendencies Notifications"
	141	+msgstr "Notificações de Pendências"
	142	+
	143	+#: goals/templates/goals/_form.html:226
	144	+msgid "Action not performed by the user"
	145	+msgstr "Ação não realizada pelo usuário"
	146	+
	147	+#: goals/templates/goals/_form.html:252
	148	+msgid "Wished period"
	149	+msgstr "Período desejado"
	150	+
	151	+#: goals/templates/goals/_form.html:388
	152	+#: goals/templates/goals/_form_submit.html:54
	153	+msgid "Save"
	154	+msgstr "Salvar"
	155	+
	156	+#: goals/templates/goals/_form.html:399
	157	+msgid "Add new goal"
	158	+msgstr "Adicionar nova meta"
	159	+
	160	+#: goals/templates/goals/_form.html:400
	161	+msgid "Remove this goal"
	162	+msgstr "Remover essa meta"
	163	+
	164	+#: goals/templates/goals/_form.html:420
	165	+msgid "Add new notification"
	166	+msgstr "Adicionar nova notificação"
	167	+
	168	+#: goals/templates/goals/_form.html:421
	169	+msgid "Remove this"
	170	+msgstr "Remover essa notificação"
	171	+
	172	+#: goals/templates/goals/_history.html:8
	173	+msgid "Date/Hour"
	174	+msgstr "Data/Horário"
	175	+
	176	+#: goals/templates/goals/_history.html:17
	177	+msgid "Action"
	178	+msgstr "Ação"
	179	+
	180	+#: goals/templates/goals/_history.html:20
	181	+msgid "Object"
	182	+msgstr "Objeto"
	183	+
	184	+#: goals/templates/goals/_history.html:23
	185	+msgid "Resource"
	186	+msgstr "Recurso"
	187	+
	188	+#: goals/templates/goals/_unanswered.html:14
	189	+msgid "Select All"
	190	+msgstr "Selecionar todos"
	191	+
	192	+#: goals/templates/goals/create.html:23
	193	+msgid "Add Topic Goals"
	194	+msgstr "Adicionar Metas do Tópico"
	195	+
	196	+#: goals/templates/goals/reports.html:25 goals/templates/goals/reports.html:104
	197	+msgid "Reports: Answered"
	198	+msgstr "Relatórios: Respondentes"
	199	+
	200	+#: goals/templates/goals/reports.html:57
	201	+msgid "Answered"
	202	+msgstr "Respondentes"
	203	+
	204	+#: goals/templates/goals/reports.html:58
	205	+msgid "Unanswered"
	206	+msgstr "Não Respondentes"
	207	+
	208	+#: goals/templates/goals/reports.html:59
	209	+msgid "Resource History"
	210	+msgstr "Histórico do Recurso"
	211	+
	212	+#: goals/templates/goals/reports.html:80
	213	+msgid "No data available in table"
	214	+msgstr "Nenhum registro encontrado"
	215	+
	216	+#: goals/templates/goals/reports.html:81
	217	+msgid "Showing _START_ to _END_ of _TOTAL_ entries"
	218	+msgstr "Mostrando de _START_ até _END_ de _TOTAL_ de registros"
	219	+
	220	+#: goals/templates/goals/reports.html:82
	221	+msgid "Showing 0 to 0 of 0 entries"
	222	+msgstr "Mostrado de 0 até 0 de 0 registros"
	223	+
	224	+#: goals/templates/goals/reports.html:83
	225	+msgid "(filtered from _MAX_ total entries)"
	226	+msgstr "(filtrados de _MAX_ registros)"
	227	+
	228	+#: goals/templates/goals/reports.html:86
	229	+msgid "Show _MENU_ entries"
	230	+msgstr "_MENU_ resultados por página"
	231	+
	232	+#: goals/templates/goals/reports.html:87
	233	+msgid "Loading..."
	234	+msgstr "Carregando..."
	235	+
	236	+#: goals/templates/goals/reports.html:88
	237	+msgid "Processing..."
	238	+msgstr "Processando..."
	239	+
	240	+#: goals/templates/goals/reports.html:89
	241	+msgid "Search"
	242	+msgstr "Buscar"
	243	+
	244	+#: goals/templates/goals/reports.html:90
	245	+msgid "No matching records found"
	246	+msgstr "Nenhum registro encontrado"
	247	+
	248	+#: goals/templates/goals/reports.html:92
	249	+msgid "First"
	250	+msgstr "Primeiro"
	251	+
	252	+#: goals/templates/goals/reports.html:93
	253	+msgid "Last"
	254	+msgstr "Último"
	255	+
	256	+#: goals/templates/goals/reports.html:98
	257	+msgid ": activate to sort column ascending"
	258	+msgstr ": Ordenar colunas de forma ascendente"
	259	+
	260	+#: goals/templates/goals/reports.html:99
	261	+msgid ": activate to sort column descending"
	262	+msgstr ": Ordenar colunas de forma descendente"
	263	+
	264	+#: goals/templates/goals/reports.html:103
	265	+msgid "Download .csv file"
	266	+msgstr "Download de arquivo .csv"
	267	+
	268	+#: goals/templates/goals/reports.html:105
	269	+msgid "Reports: Unanswered"
	270	+msgstr "Relatórios: Não Respondentes"
	271	+
	272	+#: goals/templates/goals/reports.html:106
	273	+msgid "Reports: History"
	274	+msgstr "Relatórios: Histórico"
	275	+
	276	+#: goals/templates/goals/submit.html:66
	277	+#: goals/templates/goals/update_submit.html:69
	278	+#: goals/templates/goals/view.html:66
	279	+#: goals/templates/goals/window_submit.html:40
	280	+msgid "Limit submission date"
	281	+msgstr "Data limite de submissão"
	282	+
	283	+#: goals/templates/goals/update.html:23
	284	+msgid "Edit: Topic Goals "
	285	+msgstr "Editar: Metas de Tópico"
	286	+
	287	+#: goals/templates/goals/update_submit.html:22
	288	+msgid "Update My Goals"
	289	+msgstr "Atualizar Minhas Metas"
	290	+
	291	+#: goals/templates/goals/view.html:19 goals/templatetags/goals_filters.py:72
	292	+#: goals/views.py:217
	293	+msgid "My Goals"
	294	+msgstr "Minhas Metas"
	295	+
	296	+#: goals/templates/goals/view.html:75
	297	+msgid "Goal stabilished"
	298	+msgstr "Meta estabelecida"
	299	+
	300	+#: goals/templates/goals/view.html:83
	301	+msgid "Update Goals"
	302	+msgstr "Atualizar Metas"
	303	+
	304	+#: goals/templatetags/goals_filters.py:59
	305	+msgid "Visualized"
	306	+msgstr "Visualizou"
	307	+
	308	+#: goals/templatetags/goals_filters.py:61
	309	+msgid "Added"
	310	+msgstr "Adicionou"
	311	+
	312	+#: goals/templatetags/goals_filters.py:63
	313	+msgid "Updated"
	314	+msgstr "Atualizou"
	315	+
	316	+#: goals/templatetags/goals_filters.py:65
	317	+msgid "Submitted"
	318	+msgstr "Submeteu"
	319	+
	320	+#: goals/templatetags/goals_filters.py:76
	321	+#, python-format
	322	+msgid "%s Instance"
	323	+msgstr "Instância de %s"
	324	+
	325	+#: goals/views.py:60
	326	+msgid "Reports"
	327	+msgstr "Relatórios"
	328	+
	329	+#: goals/views.py:348 goals/views.py:476
	330	+#, python-format
	331	+msgid "Your goals for %s was save successfully!"
	332	+msgstr "Suas metas para %s foram salvas com sucesso!"
	333	+
	334	+#: goals/views.py:584
	335	+#, python-format
	336	+msgid "Your goals for %s was update successfully!"
	337	+msgstr "Suas metas para %s foram atualizadas com sucesso!"
	338	+
	339	+#: goals/views.py:635 goals/views.py:649 goals/views.py:670 goals/views.py:789
	340	+#: goals/views.py:803 goals/views.py:813
	341	+msgid "Visualize"
	342	+msgstr "Visualizar"
	343	+
	344	+#: goals/views.py:635 goals/views.py:649 goals/views.py:670 goals/views.py:789
	345	+#: goals/views.py:803 goals/views.py:813
	346	+msgid "Submit"
	347	+msgstr "Submeter"
	348	+
	349	+#: goals/views.py:733
	350	+msgid "Create Topic Goals"
	351	+msgstr "Adicionar Metas do Tópico"
	352	+
	353	+#: goals/views.py:744
	354	+#, python-format
	355	+msgid "The Goals specification for the topic %s was realized successfully!"
	356	+msgstr "A Especificação de Metas para o tópico %s foi realizada com sucesso!"
	357	+
	358	+#: goals/views.py:868
	359	+msgid "Update Topic Goals"
	360	+msgstr "Atualizar Metas do Tópico"
	361	+
	362	+#: goals/views.py:879
	363	+#, python-format
	364	+msgid "The Goals specification for the topic %s was updated successfully!"
	365	+msgstr "A Especificação de Metas para o tópico %s foi atualizada com sucesso!"
	366	+
	367	+#: goals/views.py:915
	368	+#, python-format
	369	+msgid "The Goals specification of the topic %s was removed successfully!"
	370	+msgstr "A Especificação de Metas para o tópico %s foi removida com sucesso!"
	@@ -15,4 +15,5 @@ urlpatterns = [		@@ -15,4 +15,5 @@ urlpatterns = [
15	url(r'^answered_report/(?P<slug>[\w_-]+)/$', views.AnsweredReport.as_view(), name = 'answered_report'),	15	url(r'^answered_report/(?P<slug>[\w_-]+)/$', views.AnsweredReport.as_view(), name = 'answered_report'),
16	url(r'^unanswered_report/(?P<slug>[\w_-]+)/$', views.UnansweredReport.as_view(), name = 'unanswered_report'),	16	url(r'^unanswered_report/(?P<slug>[\w_-]+)/$', views.UnansweredReport.as_view(), name = 'unanswered_report'),
17	url(r'^history_report/(?P<slug>[\w_-]+)/$', views.HistoryReport.as_view(), name = 'history_report'),	17	url(r'^history_report/(?P<slug>[\w_-]+)/$', views.HistoryReport.as_view(), name = 'history_report'),
		18	+ url(r'^view_log/(?P<goal>[\w_-]+)/(?P<report>[\w_-]+)/$', views.reports_log, name = 'reports_log'),
18	]	19	]
@@ -0,0 +1,86 @@		@@ -0,0 +1,86 @@
	1	+# SOME DESCRIPTIVE TITLE.
	2	+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
	3	+# This file is distributed under the same license as the PACKAGE package.
	4	+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
	5	+#
	6	+#, fuzzy
	7	+msgid ""
	8	+msgstr ""
	9	+"Project-Id-Version: PACKAGE VERSION\n"
	10	+"Report-Msgid-Bugs-To: \n"
	11	+"POT-Creation-Date: 2017-03-09 17:01-0300\n"
	12	+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
	13	+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
	14	+"Language-Team: LANGUAGE <LL@li.org>\n"
	15	+"Language: \n"
	16	+"MIME-Version: 1.0\n"
	17	+"Content-Type: text/plain; charset=UTF-8\n"
	18	+"Content-Transfer-Encoding: 8bit\n"
	19	+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
	20	+#: reports/forms.py:8
	21	+msgid "Topics to select data from"
	22	+msgstr ""
	23	+
	24	+#: reports/forms.py:25
	25	+msgid "All"
	26	+msgstr ""
	27	+
	28	+#: reports/templates/reports/create.html:21
	29	+#: reports/templates/reports/report.html.py:20
	30	+#: reports/templates/reports/view.html:33
	31	+msgid "Analytics"
	32	+msgstr ""
	33	+
	34	+#: reports/templates/reports/create.html:31
	35	+#: reports/templates/reports/report.html.py:30
	36	+#: reports/templates/reports/view.html:43
	37	+msgid "Interaction Data"
	38	+msgstr ""
	39	+
	40	+#: reports/templates/reports/create.html:34
	41	+#: reports/templates/reports/report.html.py:33
	42	+#: reports/templates/reports/view.html:46
	43	+msgid "Report Card"
	44	+msgstr ""
	45	+
	46	+#: reports/templates/reports/create.html:37
	47	+#: reports/templates/reports/report.html.py:36
	48	+#: reports/templates/reports/view.html:49
	49	+msgid "Participation"
	50	+msgstr ""
	51	+
	52	+#: reports/templates/reports/view.html:56
	53	+msgid "Subject"
	54	+msgstr ""
	55	+
	56	+#: reports/templates/reports/view.html:57
	57	+msgid "Topic"
	58	+msgstr ""
	59	+
	60	+#: reports/templates/reports/view.html:58
	61	+msgid "Initial Date"
	62	+msgstr ""
	63	+
	64	+#: reports/templates/reports/view.html:59
	65	+msgid "End Date"
	66	+msgstr ""
	67	+
	68	+#: reports/templates/reports/view.html:60
	69	+msgid "new search"
	70	+msgstr ""
	71	+
	72	+#: reports/templates/reports/view.html:66
	73	+msgid "register(s)"
	74	+msgstr ""
	75	+
	76	+#: reports/templates/reports/view.html:68
	77	+msgid "Variable Descriptions"
	78	+msgstr ""
	79	+
	80	+#: reports/templates/reports/view.html:72
	81	+msgid "Interactions Data"
	82	+msgstr ""
	83	+
	84	+#: reports/views.py:47
	85	+msgid "Report created successfully"
	86	+msgstr ""
	@@ -11,6 +11,21 @@		@@ -11,6 +11,21 @@
11	{% render_field field class='form-control' %}	11	{% render_field field class='form-control' %}
12	{% endif %}	12	{% endif %}
13		13
		14	+ {% if field.errors %}
		15	+ <div class="row">
		16	+ </br>
		17	+ <div class="alert alert-danger alert-dismissible" role="alert">
		18	+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">
		19	+ <span aria-hidden="true">×</span>
		20	+ </button>
		21	+ <ul>
		22	+ {% for error in field.errors %}
		23	+ <li>{{ error }}</li>
		24	+ {% endfor %}
		25	+ </ul>
		26	+ </div>
		27	+ </div>
		28	+ {% endif %}
14	{% endfor %}	29	{% endfor %}
15	<div class="row text-center">	30	<div class="row text-center">
16	<input type="submit" value="Search" class="btn btn-success btn-raised" />	31	<input type="submit" value="Search" class="btn btn-success btn-raised" />
	@@ -0,0 +1,45 @@		@@ -0,0 +1,45 @@
		1	+{% extends 'base.html' %}
		2	+
		3	+{% load static i18n pagination %}
		4	+{% load django_bootstrap_breadcrumbs %}
		5	+{% load widget_tweaks %}
		6	+
		7	+{% block breadcrumbs %}
		8	+ {{ block.super }}
		9	+ {% breadcrumb subject.category 'subjects:cat_view' subject.category.slug %}
		10	+ {% breadcrumb subject 'subjects:view' subject.slug %}
		11	+ {% breadcrumb 'analytics' '' %}
		12	+{% endblock %}
		13	+
		14	+{% block content %}
		15	+
		16	+ <div class="panel panel-info topic-panel">
		17	+ <div class="panel-heading">
		18	+ <div class="row">
		19	+ <div class="col-md-12 category-header">
		20	+ <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
		21	+ <span>{% trans "Analytics" %}</span>
		22	+ </h4>
		23	+ </div>
		24	+ </div>
		25	+ </div>
		26	+ </div>
		27	+
		28	+ <div id="core-subjects-options-div">
		29	+ <ul class="core-subjects-options report-menu-choice">
		30	+ <li class="active">
		31	+ {% trans "Interaction Data" %}
		32	+ </li>
		33	+ <li>
		34	+ {% trans "Report Card" %}
		35	+ </li>
		36	+ <li>
		37	+ {% trans "Participation" %}
		38	+ </li>
		39	+ </ul>
		40	+ </div>
		41	+
		42	+ {% include "reports/_form.html" %}
		43	+
		44	+
		45	+{% endblock content %}
0	\ No newline at end of file	46	\ No newline at end of file
	@@ -1,57 +0,0 @@		@@ -1,57 +0,0 @@
1	-{% extends 'base.html' %}
2	-
3	-{% load static i18n pagination %}
4	-{% load django_bootstrap_breadcrumbs %}
5	-{% load widget_tweaks %}
6	-
7	-{% block breadcrumbs %}
8	- {{ block.super }}
9	-
10	- {% breadcrumb 'analytics' '' %}
11	-{% endblock %}
12	-
13	-{% block content %}
14	-
15	- <div class="panel panel-info topic-panel">
16	- <div class="panel-heading">
17	- <div class="row">
18	- <div class="col-md-12 category-header">
19	- <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
20	- <span>{% trans "Analytics" %}</span>
21	- </h4>
22	- </div>
23	- </div>
24	- </div>
25	- </div>
26	-
27	- <div id="core-subjects-options-div">
28	- <ul class="core-subjects-options report-menu-choice">
29	- <li class="active">
30	- {% trans "Interaction Data" %}
31	- </li>
32	- <li>
33	- {% trans "Report Card" %}
34	- </li>
35	- <li>
36	- {% trans "Participation" %}
37	- </li>
38	- </ul>
39	- </div>
40	-
41	- {% include "reports/_form.html" %}
42	-
43	- {% for user, datum in data.items %}
44	-
45	-
46	- <p>
47	- <ul>
48	-
49	- {{user}} :
50	- {% for key, value in datum.items %}
51	- <li>{{key}}: {{value}}</li>
52	- {% endfor %}
53	- </ul>
54	-
55	- </p>
56	- {% endfor %}
57	-{% endblock content %}
58	\ No newline at end of file	0	\ No newline at end of file
	@@ -0,0 +1,105 @@		@@ -0,0 +1,105 @@
		1	+{% extends 'base.html' %}
		2	+
		3	+{% load static i18n pagination %}
		4	+{% load django_bootstrap_breadcrumbs %}
		5	+{% load widget_tweaks %}
		6	+
		7	+{% block breadcrumbs %}
		8	+ {{ block.super }}
		9	+ {% breadcrumb view.subject.category 'subjects:cat_view' view.subject.category.slug %}
		10	+ {% breadcrumb view.subject 'subjects:view' view.subject.slug %}
		11	+ {% breadcrumb 'analytics' '' %}
		12	+{% endblock %}
		13	+
		14	+{% block content %}
		15	+
		16	+ {% if messages %}
		17	+ {% for message in messages %}
		18	+ <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
		19	+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">
		20	+ <span aria-hidden="true">×</span>
		21	+ </button>
		22	+ <p>{{ message }}</p>
		23	+ </div>
		24	+ {% endfor %}
		25	+ {% endif %}
		26	+
		27	+
		28	+ <div class="panel panel-info topic-panel">
		29	+ <div class="panel-heading">
		30	+ <div class="row">
		31	+ <div class="col-md-12 category-header">
		32	+ <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
		33	+ <span>{% trans "Analytics" %}</span>
		34	+ </h4>
		35	+ </div>
		36	+ </div>
		37	+ </div>
		38	+ </div>
		39	+
		40	+ <div id="core-subjects-options-div">
		41	+ <ul class="core-subjects-options report-menu-choice">
		42	+ <li class="active">
		43	+ {% trans "Interaction Data" %}
		44	+ </li>
		45	+ <li>
		46	+ {% trans "Report Card" %}
		47	+ </li>
		48	+ <li>
		49	+ {% trans "Participation" %}
		50	+ </li>
		51	+ </ul>
		52	+ </div>
		53	+
		54	+ <div class="col-md-12">
		55	+ <ul id="report-header">
		56	+ <li><b>{% trans "Subject" %}:</b> {{subject_name}}</li>
		57	+ <li><b>{% trans "Topic" %}:</b> {{topic_name}}</li>
		58	+ <li><b>{% trans "Initial Date" %}:</b> {{init_date}}</li>
		59	+ <li><b>{% trans "End Date" %}:</b> {{end_date}}</li>
		60	+ <li><a href="{% url 'subjects:reports:create_interaction' %}?subject_id={{subject.id}}"><button class="btn btn-success btn-raised">{% trans "new search" %}</button></a></li>
		61	+
		62	+ </ul>
		63	+
		64	+ <div>
		65	+ <ul id="report-info">
		66	+ <li> {{data.values\|length}} {% trans "register(s)" %} </li>
		67	+ <li>
		68	+ <i class="fa fa-download" aria-hidden="true"></i> {% trans "Variable Descriptions" %}
		69	+
		70	+ </li>
		71	+ <li>
		72	+ <i class="fa fa-download" aria-hidden="true"></i> {% trans "Interactions Data" %}
		73	+ </li>
		74	+ </ul>
		75	+
		76	+
		77	+ </div>
		78	+ <div class="table-responsive">
		79	+ <table class="table table-striped">
		80	+ <thead>
		81	+ <tr>
		82	+
		83	+ {% for value in header %}
		84	+ <th>{{value}}</th>
		85	+ {% endfor %}
		86	+ </tr>
		87	+ </thead>
		88	+ <tbody>
		89	+
		90	+
		91	+ {% for variables in data.values %}
		92	+ <tr>
		93	+ {% for variable in variables %}
		94	+ <td>{{variable}}</td>
		95	+ {% endfor %}
		96	+ </tr>
		97	+ {% endfor %}
		98	+ </tbody>
		99	+
		100	+ </table>
		101	+ </div>
		102	+ </div>
		103	+
		104	+
		105	+{% endblock content %}
0	\ No newline at end of file	106	\ No newline at end of file