Merge pull request #542 from amadeusproject/refactoring

Daily Update - 22_08_2017

Merge pull request #542 from amadeusproject/refactoring
Daily Update - 22_08_2017
Erik Zambom · GitHub
2 parents 9dd584c4 72479841
Showing 41 changed files with 521 additions and 262 deletions Show diff stats
amadeus/locale/pt_BR/LC_MESSAGES/django.po
amadeus/static/css/.sass-cache/a7f87b90919294b62ab4f8079e31dcda8f485534/green.sassc
amadeus/static/css/themes/green.css
amadeus/static/css/themes/green.sass
amadeus/templates/base.html
analytics/locale/pt_BR/LC_MESSAGES/django.po
api/locale/pt_BR/LC_MESSAGES/django.po
bulletin/locale/pt_BR/LC_MESSAGES/django.po
categories/locale/pt_BR/LC_MESSAGES/django.po
chat/locale/pt_BR/LC_MESSAGES/django.po
dashboards/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/view.html
goals/templatetags/goals_filters.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
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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"
@@ -383,7 +383,7 @@ a.add-row {
   color: #FF0000; }
 .alert-low {
-  background-color: #FFD800; }
+  background-color: #dfbd31; }
 .alert-medium {
   background-color: #FF9000; }
@@ -526,7 +526,7 @@ a.add-row
     color: #FF0000
 .alert-low
-    background-color: #FFD800 
+    background-color: #dfbd31 
 .alert-medium
     background-color: #FF9000
@@ -332,6 +332,9 @@
       });
     </script>
+
+    {% block addtional_scripts %}
+    {% endblock %}
 	<div id="remove_acc"></div>
 </body>
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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"
-#: api/views.py:299
+#: api/views.py:332
 #, python-format
 msgid "Last message in %s"
 msgstr ""
-#: api/views.py:316
+#: api/views.py:349
 msgid "Message sent successfully!"
 msgstr ""
-#: api/views.py:320
+#: api/views.py:353
 msgid "Error while sending message!"
 msgstr ""
-#: api/views.py:327
+#: api/views.py:360
 msgid "No information received!"
 msgstr ""
-#: api/views.py:333
+#: api/views.py:366
 msgid "Amadeus"
 msgstr ""
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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"
@@ -70,7 +70,7 @@ msgstr &quot;Metas&quot;
 msgid "Relevant Indicators"
 msgstr "Indicadores Relevantes"
-#: bulletin/models.py:25 bulletin/views.py:847
+#: bulletin/models.py:25 bulletin/views.py:845
 msgid "Bulletin"
 msgstr "Boletim"
@@ -189,14 +189,14 @@ msgid &quot;The picture could not exceed 5MB.&quot;
 msgstr "A imagem não pode exceder 5MB."
 #: bulletin/templates/bulletin/send_message.html:62
-#: bulletin/templates/bulletin/view.html:145
-#: bulletin/templates/bulletin/window_view.html:127
+#: bulletin/templates/bulletin/view.html:209
+#: bulletin/templates/bulletin/window_view.html:219
 msgid "Close"
 msgstr "Fechar"
 #: bulletin/templates/bulletin/send_message.html:63
-#: bulletin/templates/bulletin/view.html:146
-#: bulletin/templates/bulletin/window_view.html:128
+#: bulletin/templates/bulletin/view.html:210
+#: bulletin/templates/bulletin/window_view.html:220
 msgid "Send"
 msgstr "Enviar"
@@ -204,37 +204,27 @@ msgstr &quot;Enviar&quot;
 msgid "Edit: "
 msgstr "Editar: "
-#: bulletin/templates/bulletin/view.html:61
-#: bulletin/templates/bulletin/window_view.html:70
-msgid "Check your goals"
-msgstr "Veja suas metas"
-
-#: bulletin/templates/bulletin/view.html:122
-#: bulletin/templates/bulletin/window_view.html:106
+#: bulletin/templates/bulletin/view.html:189
+#: bulletin/templates/bulletin/window_view.html:199
 msgid "There are obstructions to your activities?"
 msgstr "Existem impedimentos para as suas atividades?"
-#: bulletin/templates/bulletin/view.html:123
-#: bulletin/templates/bulletin/window_view.html:107
+#: bulletin/templates/bulletin/view.html:190
+#: bulletin/templates/bulletin/window_view.html:200
 msgid "Click here"
 msgstr "Clique aqui"
-#: bulletin/templates/bulletin/view.html:123
-#: bulletin/templates/bulletin/window_view.html:107
+#: bulletin/templates/bulletin/view.html:190
+#: bulletin/templates/bulletin/window_view.html:200
 msgid "to communicate the difficulties that may decrease your performance."
 msgstr "para informar as dificuldades que podem prejudicar seu desempenho."
-#: bulletin/templates/bulletin/view.html:135
-#: bulletin/templates/bulletin/window_view.html:117
-msgid "Inform difficulties"
-msgstr "Informe as dificuldades"
-
-#: bulletin/templates/bulletin/view.html:141
-#: bulletin/templates/bulletin/window_view.html:123
+#: bulletin/templates/bulletin/view.html:205
+#: bulletin/templates/bulletin/window_view.html:215
 msgid "Type here the dificulties that may harm your performance"
 msgstr "Escreva aqui as dificuldades que podem diminuir sua performance"
-#: bulletin/utils.py:50 bulletin/views.py:914
+#: bulletin/utils.py:50 bulletin/views.py:912
 #, python-format
 msgid "Last message in %s"
 msgstr "Última mensagem em %s"
@@ -262,15 +252,17 @@ msgstr &quot;O tópico %s não possui metas, então você não pode criar um Boletim.
 msgid ""
 "The deadline to submit the goals of the topic %s has not yet closed, so you "
 "can't create a Bulletin."
-msgstr "O prazo para submeter as metas do tópico %s ainda não foi fechado, então você não pode criar um Boletim."
+msgstr ""
+"O prazo para submeter as metas do tópico %s ainda não foi fechado, então "
+"você não pode criar um Boletim."
 #: bulletin/views.py:325
 #, python-format
 msgid "The topic %s already has a Bulletin, so you can't create another."
 msgstr "O tópico %s já possui um Boletim, então você não pode criar outro."
-#: bulletin/views.py:343 bulletin/views.py:356 bulletin/views.py:627
-#: bulletin/views.py:629 bulletin/views.py:645 bulletin/views.py:647
+#: bulletin/views.py:343 bulletin/views.py:356 bulletin/views.py:625
+#: bulletin/views.py:627 bulletin/views.py:643 bulletin/views.py:645
 msgid "Visualize"
 msgstr "Visualizar"
@@ -283,60 +275,66 @@ msgstr &quot;&quot;
 "O Boletim \"%s\" foi adicionado ao Tópio \"%s\" do ambiente virtual \"%s\" "
 "com sucesso!"
-#: bulletin/views.py:691
+#: bulletin/views.py:689
 msgid "Update Bulletin"
 msgstr "Atualizar boletim"
-#: bulletin/views.py:709
+#: bulletin/views.py:707
 #, python-format
 msgid "The Bulletin \"%s\" was updated successfully!"
 msgstr "O Boletim \"%s\" foi atualizado com sucesso!"
-#: bulletin/views.py:745
+#: bulletin/views.py:743
 #, python-format
 msgid ""
 "The bulletin \"%s\" was removed successfully from virtual environment \"%s\"!"
 msgstr "O boletim \"%s\" foi removido com sucesso do ambiente virtual \"%s\"! "
-#: bulletin/views.py:804
+#: bulletin/views.py:802
 msgid "Bulletin Reports"
 msgstr "Relatórios do Boletim"
-#: bulletin/views.py:823
+#: bulletin/views.py:821
 msgid "Realized"
 msgstr "Realizada"
-#: bulletin/views.py:823
+#: bulletin/views.py:821
 msgid "Unrealized"
 msgstr "Não realizada"
-#: bulletin/views.py:823
+#: bulletin/views.py:821
 msgid "Historic"
 msgstr "Histórico"
-#: bulletin/views.py:838 bulletin/views.py:846
+#: bulletin/views.py:836 bulletin/views.py:844
 msgid "View"
 msgstr "Visualizar"
-#: bulletin/views.py:852
+#: bulletin/views.py:850
 msgid "Actions about resource"
 msgstr "Ações sobre o recurso"
-#: bulletin/views.py:853
+#: bulletin/views.py:851
 msgid "Quantity"
 msgstr "Quantidade"
-#: bulletin/views.py:902
+#: bulletin/views.py:900
 msgid "[Photo]"
 msgstr "[Foto]"
-#: bulletin/views.py:923
+#: bulletin/views.py:921
 msgid "The message was successfull sent!"
 msgstr "A mensagem foi enviada com sucesso!"
-#: bulletin/views.py:925
+#: bulletin/views.py:923
 msgid "No user selected!"
 msgstr "Nenhum usuário selecionado!"
+#~ msgid "Check your goals"
+#~ msgstr "Veja suas metas"
+
+#~ msgid "Inform difficulties"
+#~ msgstr "Informe as dificuldades"
+
 #~ msgid "Bulletin Data (Goals)"
 #~ msgstr "Dados do boletim (Metas)"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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"
@@ -143,7 +143,7 @@ msgstr &quot;Ver Perfil&quot;
 #: chat/templates/chat/subject_view.html:9
 #: chat/templates/chat/subject_view.html:27
 #: chat/templates/chat/subject_view_participants.html:9
-#: chat/templates/chat/subject_view_participants.html:31 chat/views.py:65
+#: chat/templates/chat/subject_view_participants.html:31 chat/views.py:67
 msgid "Messages"
 msgstr "Mensagens"
@@ -250,33 +250,33 @@ msgstr &quot;Inativo&quot;
 msgid "Offline"
 msgstr "Offline"
-#: chat/templatetags/chat_tags.py:63 chat/views.py:422
+#: chat/templatetags/chat_tags.py:63 chat/views.py:429
 msgid "Unfavorite"
 msgstr "Desfavoritar"
-#: chat/templatetags/chat_tags.py:65 chat/views.py:426
+#: chat/templatetags/chat_tags.py:65 chat/views.py:433
 msgid "Favorite"
 msgstr "Favoritar"
-#: chat/views.py:104
+#: chat/views.py:106
 msgid "Messages - Participants"
 msgstr "Mensagems - Participantes"
-#: chat/views.py:159
+#: chat/views.py:161
 #, python-format
 msgid "%s - Participants"
 msgstr "%s - Participantes"
-#: chat/views.py:214
+#: chat/views.py:216
 #, python-format
 msgid "%s - Messages"
 msgstr "%s - Mensagens"
-#: chat/views.py:353
+#: chat/views.py:355
 msgid "[Photo]"
 msgstr "[Foto]"
-#: chat/views.py:365
+#: chat/views.py:367
 #, python-format
 msgid "Last message in %s"
 msgstr "Última mensagem em %s"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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"
@@ -76,12 +76,12 @@ msgstr &quot;Data limite para submissão&quot;
 #: 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
+#: goals/templates/goals/view.html:86
 msgid "Goal"
 msgstr "Meta"
 #: goals/models.py:15 goals/templates/goals/_answered.html:20
-#: goals/views.py:1108
+#: goals/views.py:1153
 msgid "Goals"
 msgstr "Metas"
@@ -148,7 +148,7 @@ msgstr &quot;Especificação de Metas&quot;
 #: goals/templates/goals/_form.html:109
 #: goals/templates/goals/_form_submit.html:22
-#: goals/templates/goals/view.html:74
+#: goals/templates/goals/view.html:87
 msgid "Minimum percentage desired"
 msgstr "Porcentagem mínima desejada"
@@ -169,7 +169,7 @@ msgid &quot;Wished period&quot;
 msgstr "Período desejado"
 #: goals/templates/goals/_form.html:402
-#: goals/templates/goals/_form_submit.html:63
+#: goals/templates/goals/_form_submit.html:69
 msgid "Save"
 msgstr "Salvar"
@@ -189,11 +189,11 @@ msgstr &quot;Adicionar nova notificação&quot;
 msgid "Remove this"
 msgstr "Remover essa notificação"
-#: goals/templates/goals/_form_submit.html:54
+#: goals/templates/goals/_form_submit.html:58
 msgid "There are obstacles to your activities?"
 msgstr "Existem impedimentos para as suas atividades?"
-#: goals/templates/goals/_form_submit.html:55
+#: goals/templates/goals/_form_submit.html:59
 msgid "Type here the dificulties that may harm your performance"
 msgstr "Digite aqui os obstáculos que podem prejudicar o seu desempenho."
@@ -356,7 +356,7 @@ msgstr &quot;Enviar&quot;
 #: goals/templates/goals/submit.html:66
 #: goals/templates/goals/update_submit.html:69
-#: goals/templates/goals/view.html:66
+#: goals/templates/goals/view.html:79
 #: goals/templates/goals/window_submit.html:40
 msgid "Limit submission date"
 msgstr "Data limite de submissão"
@@ -369,129 +369,138 @@ msgstr &quot;Editar: Metas de Tópico&quot;
 msgid "Update My Goals"
 msgstr "Atualizar Minhas Metas"
-#: goals/templates/goals/view.html:19 goals/templatetags/goals_filters.py:72
-#: goals/views.py:235
+#: goals/templates/goals/view.html:19 goals/templatetags/goals_filters.py:73
+#: goals/views.py:260
 msgid "My Goals"
 msgstr "Minhas Metas"
-#: goals/templates/goals/view.html:75
+#: goals/templates/goals/view.html:88
 msgid "Goal stabilished"
 msgstr "Meta estabelecida"
-#: goals/templates/goals/view.html:83
+#: goals/templates/goals/view.html:98
 msgid "Update Goals"
 msgstr "Atualizar Metas"
-#: goals/templatetags/goals_filters.py:59
+#: goals/templatetags/goals_filters.py:60
 msgid "Visualized"
 msgstr "Visualizou"
-#: goals/templatetags/goals_filters.py:61
+#: goals/templatetags/goals_filters.py:62
 msgid "Added"
 msgstr "Adicionou"
-#: goals/templatetags/goals_filters.py:63
+#: goals/templatetags/goals_filters.py:64
 msgid "Updated"
 msgstr "Atualizou"
-#: goals/templatetags/goals_filters.py:65 goals/views.py:1088
+#: goals/templatetags/goals_filters.py:66 goals/views.py:1133
 msgid "Submitted"
 msgstr "Submeteu"
-#: goals/templatetags/goals_filters.py:76
+#: goals/templatetags/goals_filters.py:77
 #, python-format
 msgid "%s Instance"
 msgstr "Instância de %s"
-#: goals/utils.py:59 goals/views.py:1179
+#: goals/utils.py:59 goals/views.py:1224
 #, python-format
 msgid "Last message in %s"
 msgstr "Última mensagem em %s"
-#: goals/views.py:354 goals/views.py:490 goals/views.py:608
+#: goals/views.py:386 goals/views.py:525 goals/views.py:647
 #, python-format
 msgid "#Dificulty(ies) found in %s"
 msgstr "#Dificuldade(s) comunicada(s) em %s"
-#: goals/views.py:376 goals/views.py:514
+#: goals/views.py:408 goals/views.py:549
 #, python-format
 msgid "Your goals for %s was save successfully!"
 msgstr "Suas metas para %s foram salvas com sucesso!"
-#: goals/views.py:632
+#: goals/views.py:596
+#, python-format
+msgid ""
+"The date limit to submit your Goals specification for the topic %s has "
+"passed, so you can't edit your values!"
+msgstr ""
+"A data limite para submeter suas Metas para o tópico %s passou, então você "
+"não pode editar seus valores!"
+
+#: goals/views.py:671
 #, python-format
 msgid "Your goals for %s was update successfully!"
 msgstr "Suas metas para %s foram atualizadas com sucesso!"
-#: goals/views.py:683 goals/views.py:697 goals/views.py:722 goals/views.py:841
-#: goals/views.py:855 goals/views.py:865
+#: goals/views.py:722 goals/views.py:736 goals/views.py:761 goals/views.py:883
+#: goals/views.py:897 goals/views.py:907
 msgid "Visualize"
 msgstr "Visualizar"
-#: goals/views.py:683 goals/views.py:697 goals/views.py:722 goals/views.py:841
-#: goals/views.py:855 goals/views.py:865
+#: goals/views.py:722 goals/views.py:736 goals/views.py:761 goals/views.py:883
+#: goals/views.py:897 goals/views.py:907
 msgid "Submit"
 msgstr "Submeter"
-#: goals/views.py:785
+#: goals/views.py:824
 msgid "Create Topic Goals"
 msgstr "Adicionar Metas do Tópico"
-#: goals/views.py:796
+#: goals/views.py:835
 #, 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:920
+#: goals/views.py:962
 msgid "Update Topic Goals"
 msgstr "Atualizar Metas do Tópico"
-#: goals/views.py:931
+#: goals/views.py:973
 #, 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:967
+#: goals/views.py:1012
 #, 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!"
-#: goals/views.py:1057
+#: goals/views.py:1102
 msgid "Goals Reports"
 msgstr "Relatórios de metas"
-#: goals/views.py:1076
+#: goals/views.py:1121
 msgid "Realized"
 msgstr "Realizada"
-#: goals/views.py:1076
+#: goals/views.py:1121
 msgid "Unrealized"
 msgstr "Não Realizada"
-#: goals/views.py:1076
+#: goals/views.py:1121
 msgid "Historic"
 msgstr "Histórico"
-#: goals/views.py:1088
+#: goals/views.py:1133
 msgid "View"
 msgstr "Visualizar"
-#: goals/views.py:1119
+#: goals/views.py:1164
 msgid "Actions about resource"
 msgstr "Ações sobre o recurso"
-#: goals/views.py:1120
+#: goals/views.py:1165
 msgid "Quantity"
 msgstr "Quantidade"
-#: goals/views.py:1167
+#: goals/views.py:1212
 msgid "[Photo]"
 msgstr "[Imagem]"
-#: goals/views.py:1187
+#: goals/views.py:1232
 msgid "The message was successfull sent!"
 msgstr "A mensagem foi enviada com sucesso!"
-#: goals/views.py:1189
+#: goals/views.py:1234
 msgid "No user selected!"
 msgstr "Nenhum usuário selecionado!"
 {% extends 'subjects/view.html' %}
-{% load static i18n pagination permissions_tags subject_counter %}
+{% load static i18n pagination permissions_tags subject_counter goals_filters %}
 {% load django_bootstrap_breadcrumbs %}
 {% block style %}
@@ -33,6 +33,7 @@
 	{% endif %}
 	{% resource_permissions request.user goal as has_resource_permissions %}
+	{% subject_permissions request.user goal.topic.subject as has_subject_permissions %}
     {% if goal.visible %}
 		<div class="panel panel-info topic-panel">
@@ -57,6 +58,18 @@
 				</div>
 			</div>
 			<div id="{{subject.slug}}" class="panel-collapse in collapse category-panel-content">
+				{% if has_subject_permissions %}
+					<form id="student_goals" action="" method="POST">
+						{% csrf_token %}
+						<select name="selected_student" onchange="$('#student_goals').submit();">
+							{% for stu in sub_students %}
+								<option value="{{ stu.email }}" {% if stu.email == student %}selected{% endif %}>{{ stu }}</option>
+							{% endfor %}
+						</select>
+					</form>
+					<br clear="all" />
+				{% endif %}
+
 				{% autoescape off %}
 					{{ goal.presentation }}
 				{% endautoescape %}
@@ -77,11 +90,22 @@
 					</div>
 				{% endfor %}
-				<hr />
+				{% if not has_subject_permissions %}
+					{% if not goal|is_close %}
+						<hr />
-				<div class="text-center">
-					<a href="{% url 'goals:update_submit' goal.slug %}" class="btn btn-success btn-raised">{% trans 'Update Goals' %}</a>
-				</div>
+						<div class="text-center">
+							<a href="{% url 'goals:update_submit' goal.slug %}" class="btn btn-success btn-raised">{% trans 'Update Goals' %}</a>
+						</div>
+					{% endif %}
+				{% endif %}
 			</div>
 		</div>
 {% endblock %}
+
+
+{% block addtional_scripts %}
+	<script type="text/javascript">
+		sessionSecurity.confirmFormDiscard = undefined;
+	</script>
+{% endblock %}
 \ No newline at end of file
 from django import template
+from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 from goals.models import MyGoals
@@ -73,4 +74,11 @@ def log_object(log):
 	name = log.context['goals_name']
-	return _("%s Instance")%(name)
 \ No newline at end of file
+	return _("%s Instance")%(name)
+
+@register.filter(name = 'is_close')
+def is_close(goal):
+	if goal.limit_submission_date < timezone.now():
+		return True
+
+	return False
 \ No newline at end of file
@@ -31,7 +31,7 @@ from webpage.forms import FormModalMessage
 from django.db.models import Q
 from django.template.loader import render_to_string
-from django.utils import formats
+from django.utils import formats, timezone
 import textwrap
 from django.utils.html import strip_tags
 import json
@@ -207,16 +207,41 @@ class InsideView(LoginRequiredMixin, LogMixin, generic.ListView):
 	template_name = 'goals/view.html'
 	model = Goals
-	context_object_name = 'itens'	
+	context_object_name = 'itens'
+
+	students = None
 	def get_queryset(self):
 		slug = self.kwargs.get('slug', '')
 		goal = get_object_or_404(Goals, slug = slug)
-		goals = MyGoals.objects.filter(user = self.request.user, item__goal = goal)
+		if has_subject_permissions(self.request.user, goal.topic.subject):
+			self.students = User.objects.filter(subject_student = goal.topic.subject).order_by('social_name', 'username')
+
+			goals = MyGoals.objects.filter(user = self.students.first(), item__goal = goal)
+		else:
+			goals = MyGoals.objects.filter(user = self.request.user, item__goal = goal)
 		return goals
+	def post(self, request, *args, **kwargs):
+		slug = self.kwargs.get('slug', '')
+		goal = get_object_or_404(Goals, slug = slug)
+
+		user = request.POST.get('selected_student', None)
+
+		if has_subject_permissions(request.user, goal.topic.subject):
+			self.students = User.objects.filter(subject_student = goal.topic.subject).order_by('social_name', 'username')
+
+			if not user is None:
+				self.object_list = MyGoals.objects.filter(user__email = user, item__goal = goal)
+			else:
+				self.object_list = MyGoals.objects.filter(user = self.request.user, item__goal = goal)	
+		else:
+			self.object_list = MyGoals.objects.filter(user = self.request.user, item__goal = goal)
+
+		return self.render_to_response(self.get_context_data())
+
 	def dispatch(self, request, *args, **kwargs):
 		slug = self.kwargs.get('slug', '')
 		goals = get_object_or_404(Goals, slug = slug)
@@ -238,6 +263,10 @@ class InsideView(LoginRequiredMixin, LogMixin, generic.ListView):
 		context['topic'] = goals.topic
 		context['subject'] = goals.topic.subject
+		if not self.students is None:
+			context['sub_students'] = self.students
+			context['student'] = self.request.POST.get('selected_student', self.students.first().email)
+
 		self.log_context['category_id'] = goals.topic.subject.category.id
 		self.log_context['category_name'] = goals.topic.subject.category.name
 		self.log_context['category_slug'] = goals.topic.subject.category.slug
@@ -277,6 +306,9 @@ class NewWindowSubmit(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
 		if not has_resource_permissions(request.user, goals):
 			return redirect(reverse_lazy('subjects:home'))
+		if has_subject_permissions(request.user, goals.topic.subject):
+			return redirect(reverse_lazy('goals:view', kwargs = {'slug': goals.slug}))
+
 		if MyGoals.objects.filter(item__goal = goals, user = request.user).exists():
 			return redirect(reverse_lazy('goals:view', args = (), kwargs = {'slug': slug}))
@@ -413,6 +445,9 @@ class SubmitView(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
 		if not has_resource_permissions(request.user, goals):
 			return redirect(reverse_lazy('subjects:home'))
+		if has_subject_permissions(request.user, goals.topic.subject):
+			return redirect(reverse_lazy('goals:view', kwargs = {'slug': goals.slug}))
+
 		if MyGoals.objects.filter(item__goal = goals, user = request.user).exists():
 			return redirect(reverse_lazy('goals:view', args = (), kwargs = {'slug': slug}))
@@ -557,6 +592,10 @@ class UpdateSubmit(LoginRequiredMixin, LogMixin, generic.UpdateView):
 		if not has_resource_permissions(request.user, goals):
 			return redirect(reverse_lazy('subjects:home'))
+		if goals.limit_submission_date < timezone.now():
+			messages.error(self.request, _('The date limit to submit your Goals specification for the topic %s has passed, so you can\'t edit your values!')%(goals.topic.name))
+			return redirect(reverse_lazy('goals:view', kwargs = {'slug': slug}))
+
 		return super(UpdateSubmit, self).dispatch(request, *args, **kwargs)
 	def get(self, request, *args, **kwargs):
@@ -795,14 +834,17 @@ class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
 	def get_success_url(self):
 		messages.success(self.request, _('The Goals specification for the topic %s was realized successfully!')%(self.object.topic.name))
-		success_url = reverse_lazy('goals:submit', kwargs = {'slug': self.object.slug})
+		if has_subject_permissions(self.request.user, self.object.topic.subject):
+			success_url = reverse_lazy('goals:view', kwargs = {'slug': self.object.slug})
+		else:
+			success_url = reverse_lazy('goals:submit', kwargs = {'slug': self.object.slug})
-		if self.object.show_window:
-			self.request.session['resources'] = {}
-			self.request.session['resources']['new_page'] = True
-			self.request.session['resources']['new_page_url'] = reverse('goals:window_submit', kwargs = {'slug': self.object.slug})
+			if self.object.show_window:
+				self.request.session['resources'] = {}
+				self.request.session['resources']['new_page'] = True
+				self.request.session['resources']['new_page_url'] = reverse('goals:window_submit', kwargs = {'slug': self.object.slug})
-			success_url = reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
+				success_url = reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
 		return success_url
@@ -930,14 +972,17 @@ class UpdateView(LoginRequiredMixin, LogMixin, generic.UpdateView):
 	def get_success_url(self):
 		messages.success(self.request, _('The Goals specification for the topic %s was updated successfully!')%(self.object.topic.name))
-		success_url = reverse_lazy('goals:submit', kwargs = {'slug': self.object.slug})
+		if has_subject_permissions(self.request.user, self.object.topic.subject):
+			success_url = reverse_lazy('goals:view', kwargs = {'slug': self.object.slug})
+		else:
+			success_url = reverse_lazy('goals:submit', kwargs = {'slug': self.object.slug})
-		if self.object.show_window:
-			self.request.session['resources'] = {}
-			self.request.session['resources']['new_page'] = True
-			self.request.session['resources']['new_page_url'] = reverse('goals:window_submit', kwargs = {'slug': self.object.slug})
+			if self.object.show_window:
+				self.request.session['resources'] = {}
+				self.request.session['resources']['new_page'] = True
+				self.request.session['resources']['new_page_url'] = reverse('goals:window_submit', kwargs = {'slug': self.object.slug})
-			success_url = reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
+				success_url = reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
 		return success_url
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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"
@@ -24,7 +24,7 @@ msgstr &quot;Meta&quot;
 #: notifications/models.py:9
 #: notifications/templates/notifications/_ajax_history.html:33
-#: notifications/templates/notifications/_history.html:32
+#: notifications/templates/notifications/_history.html:35
 msgid "Task"
 msgstr "Tarefa"
@@ -61,118 +61,118 @@ msgid &quot;Creation Date&quot;
 msgstr "Data de Criação"
 #: notifications/templates/notifications/_ajax_history.html:6
-#: notifications/templates/notifications/_history.html:6
+#: notifications/templates/notifications/_history.html:8
 msgid "rows"
 msgstr "registros"
 #: notifications/templates/notifications/_ajax_history.html:11
-#: notifications/templates/notifications/_history.html:11
+#: notifications/templates/notifications/_history.html:14
 msgid "Search"
 msgstr "Buscar"
 #: notifications/templates/notifications/_ajax_history.html:13
-#: notifications/templates/notifications/_history.html:13
+#: notifications/templates/notifications/_history.html:16
 msgid "Insert date or resource"
 msgstr "Digite uma data ou recurso"
 #: notifications/templates/notifications/_ajax_history.html:23
-#: notifications/templates/notifications/_history.html:22
+#: notifications/templates/notifications/_history.html:25
 msgid "Date"
 msgstr "Data"
 #: notifications/templates/notifications/_ajax_history.html:28
-#: notifications/templates/notifications/_history.html:27
+#: notifications/templates/notifications/_history.html:30
 msgid "Resource"
 msgstr "Recurso"
 #: notifications/templates/notifications/_ajax_history.html:38
-#: notifications/templates/notifications/_history.html:37
+#: notifications/templates/notifications/_history.html:40
 msgid "Final Date"
 msgstr "Data Final"
 #: notifications/templates/notifications/_ajax_history.html:43
-#: notifications/templates/notifications/_history.html:42
+#: notifications/templates/notifications/_history.html:45
 msgid "Notification"
 msgstr "Notificação"
 #: notifications/templates/notifications/_ajax_history.html:48
-#: notifications/templates/notifications/_history.html:47
+#: notifications/templates/notifications/_history.html:50
 msgid "Aware"
 msgstr "Ciente"
 #: notifications/templates/notifications/_ajax_history.html:53
-#: notifications/templates/notifications/_history.html:52
+#: notifications/templates/notifications/_history.html:55
 msgid "Observation"
 msgstr "Observação"
 #: notifications/templates/notifications/_ajax_history.html:64
-#: notifications/templates/notifications/_history.html:63
-#: notifications/templates/notifications/_view.html:28
+#: notifications/templates/notifications/_history.html:66
+#: notifications/templates/notifications/_view.html:30
 msgid "Not Informed"
 msgstr "Não Informado"
 #: notifications/templates/notifications/_ajax_history.html:72
-#: notifications/templates/notifications/_history.html:71
+#: notifications/templates/notifications/_history.html:74
 msgid "No results found"
 msgstr "Nenhum resultado encontrado"
-#: notifications/templates/notifications/_view.html:10
+#: notifications/templates/notifications/_view.html:12
 msgid "Home"
 msgstr "Início"
-#: notifications/templates/notifications/_view.html:28
+#: notifications/templates/notifications/_view.html:30
 msgid "Final Date/Time"
 msgstr "Data/Hora Final"
-#: notifications/templates/notifications/_view.html:31
+#: notifications/templates/notifications/_view.html:33
 msgid "Your goal was to realize this in"
 msgstr "Sua meta é realizar essa tarefa em"
-#: notifications/templates/notifications/_view.html:33
+#: notifications/templates/notifications/_view.html:35
 msgid "Task finished in"
 msgstr "Tarefa finalizada em"
-#: notifications/templates/notifications/_view.html:37
+#: notifications/templates/notifications/_view.html:39
 msgid "of the participants already realized this task."
 msgstr "dos participantes já realizaram essa tarefa."
-#: notifications/templates/notifications/_view.html:50
+#: notifications/templates/notifications/_view.html:53
 msgid "Access the task"
 msgstr "Acessar a Tarefa"
-#: notifications/templates/notifications/_view.html:52
+#: notifications/templates/notifications/_view.html:55
 msgid "Realize the task"
 msgstr "Realizar a Tarefa"
-#: notifications/templates/notifications/_view.html:57
+#: notifications/templates/notifications/_view.html:60
 msgid "or"
 msgstr "ou"
-#: notifications/templates/notifications/_view.html:60
+#: notifications/templates/notifications/_view.html:63
 msgid "Define goal to realization"
 msgstr "Definir meta para realização"
-#: notifications/templates/notifications/_view.html:62
+#: notifications/templates/notifications/_view.html:65
 msgid "Define new goal"
 msgstr "Definir nova meta"
-#: notifications/templates/notifications/_view.html:84
+#: notifications/templates/notifications/_view.html:87
 msgid "Save Goal"
 msgstr "Salvar Meta"
-#: notifications/templates/notifications/_view.html:87
+#: notifications/templates/notifications/_view.html:90
 msgid "Cancel"
 msgstr "Cancelar"
 #: notifications/templates/notifications/index.html:19
-#: notifications/templates/notifications/subject.html:29
+#: notifications/templates/notifications/subject.html:43
 msgid "This pendencies list is updated every 24 hours. Last update was in:"
 msgstr ""
 "Esta lista de pendências é atualizada a cada 24 horas. A última atualização "
 "ocorreu em:"
 #: notifications/templates/notifications/index.html:19
-#: notifications/templates/notifications/subject.html:29
+#: notifications/templates/notifications/subject.html:43
 msgid "Not determined"
 msgstr "Não Determinado"
@@ -181,12 +181,14 @@ msgid &quot;You got pendencies in the following subjects&quot;
 msgstr "Você possui pendências nos seguintes assuntos"
 #: notifications/templates/notifications/index.html:39
-#: notifications/templates/notifications/subject.html:32
+#: notifications/templates/notifications/subject.html:50
+#: notifications/templates/notifications/subject.html:58
 msgid "Actual Pendencies"
 msgstr "Pendências Atuais"
 #: notifications/templates/notifications/index.html:40
-#: notifications/templates/notifications/subject.html:33
+#: notifications/templates/notifications/subject.html:55
+#: notifications/templates/notifications/subject.html:59
 msgid "Notifications History"
 msgstr "Histórico de Notificações"
@@ -194,78 +196,91 @@ msgstr &quot;Histórico de Notificações&quot;
 msgid "You do not posses any pendency."
 msgstr "Você não possui nenhuma pendência."
-#: notifications/templates/notifications/subject.html:23
-#: notifications/views.py:204
+#: notifications/templates/notifications/subject.html:25
+#: notifications/views.py:279
 msgid "Pendencies"
 msgstr "Pendências"
-#: notifications/templates/notifications/subject.html:46
+#: notifications/templates/notifications/subject.html:74
+msgid "The student do not posses any pendency."
+msgstr "O estudante não possui nenhuma pendência."
+
+#: notifications/templates/notifications/subject.html:76
 msgid "You do not posses any pendency in this subject"
 msgstr "Você não possui nenhuma pendência nesse assunto"
-#: notifications/templatetags/notification_filters.py:27
-#: notifications/templatetags/notification_filters.py:29
+#: notifications/templatetags/notification_filters.py:28
+#: notifications/templatetags/notification_filters.py:33
+msgid "The student still did not realize this task"
+msgstr "O estudante ainda não realizou essa tarefa"
+
+#: notifications/templatetags/notification_filters.py:30
+#: notifications/templatetags/notification_filters.py:35
 msgid "You still did not realize this task"
 msgstr "Você ainda não realizou essa tarefa"
-#: notifications/templatetags/notification_filters.py:31
+#: notifications/templatetags/notification_filters.py:37
 msgid "This task is late"
 msgstr "Essa tarefa está atrasada"
-#: notifications/templatetags/notification_filters.py:33
+#: notifications/templatetags/notification_filters.py:40
+msgid "The student miss this task"
+msgstr "O estudante perdeu essa tarefa"
+
+#: notifications/templatetags/notification_filters.py:42
 msgid "You miss this task"
 msgstr "Você perdeu essa tarefa"
-#: notifications/templatetags/notification_filters.py:40
+#: notifications/templatetags/notification_filters.py:49
 msgid "Yes"
 msgstr "Sim"
-#: notifications/templatetags/notification_filters.py:42
+#: notifications/templatetags/notification_filters.py:51
 msgid "No"
 msgstr "Não"
-#: notifications/templatetags/notification_filters.py:129
-#: notifications/templatetags/notification_filters.py:133
+#: notifications/templatetags/notification_filters.py:154
+#: notifications/templatetags/notification_filters.py:158
 #, python-format
 msgid "Goal defined to task realization: %s"
 msgstr "Meta definida para realização da tarefa: %s"
-#: notifications/templatetags/notification_filters.py:135
+#: notifications/templatetags/notification_filters.py:160
 #, python-format
 msgid "New goal defined to task realization: %s"
 msgstr "Nova meta definida para realização da tarefa: %s"
-#: notifications/views.py:69 notifications/views.py:154
+#: notifications/views.py:96 notifications/views.py:223
 #, python-format
 msgid "%s - Pendencies"
 msgstr "%s - Pendências"
-#: notifications/views.py:294
+#: notifications/views.py:382
 msgid "No goal date received"
 msgstr "Nenhuma data para meta recebida"
-#: notifications/views.py:301
+#: notifications/views.py:389
 msgid "Could not identify the notification"
 msgstr "Não foi possível identificar a notificação"
-#: notifications/views.py:308
+#: notifications/views.py:396
 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:311
+#: notifications/views.py:399
 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:323
+#: notifications/views.py:411
 #, 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:325
+#: notifications/views.py:413
 #, python-format
 msgid "Your goal to realize the task %s is %s"
 msgstr "Sua meta para realizar a tarefa %s é %s"
@@ -62,7 +62,7 @@
 							<td>{{ notification.task.resource }}</td>
 							<td>{{ notification.task.get_action_display }}</td>
 							<td>{{ notification.task.end_date|date:"SHORT_DATE_FORMAT"|default:_('Not Informed') }}</td>
-							<td>{{ notification.level|warning_msg }}</td>
+							<td>{{ notification.level|warning_msg:False }}</td>
 							<td>{{ notification.viewed|viewed_msg }}</td>
 							<td>{{ notification|observation }}</td>
 						</tr>
-{% load i18n notification_filters pagination %}
+{% load i18n notification_filters pagination permissions_tags %}
+
+{% subject_permissions request.user subject as has_subject_permissions %}
 <div class="row">
 	<div class="col-md-12">
@@ -7,6 +9,7 @@
 		</div>
 		<div class="col-md-4">
 			<form action="" method="GET" class="form-horizontal">
+				<input type="hidden" value="{{ student }}" name="selected_student" />
 				<div class="form-group">
 	                <label class="col-md-4 history-control-label control-label">{% trans 'Search' %}:</label>
 	                <div class="col-md-8">
@@ -18,37 +21,37 @@
 		<table class="table table-striped table-bordered">
 			<thead>
 				<th>
-					<a href="{{ request|order_href:'creation_date' }}">
+					<a href="{{ request|add_student:student|order_href:'creation_date' }}">
 						{% trans 'Date' %} <i class="fa fa-fw {{ request|order_icon_class:'creation_date' }} pull-right"></i>
 					</a>
 				</th>
 				<th>
-					<a href="{{ request|order_href:'resource' }}">
+					<a href="{{ request|add_student:student|order_href:'resource' }}">
 						{% trans 'Resource' %} <i class="fa fa-fw {{ request|order_icon_class:'resource' }} pull-right"></i>
 					</a>
 				</th>
 				<th>
-					<a href="{{ request|order_href:'task' }}">
+					<a href="{{ request|add_student:student|order_href:'task' }}">
 						{% trans 'Task' %} <i class="fa fa-fw {{ request|order_icon_class:'task' }} pull-right"></i>
 					</a>
 				</th>
 				<th>
-					<a href="{{ request|order_href:'final_date' }}">
+					<a href="{{ request|add_student:student|order_href:'final_date' }}">
 						{% trans 'Final Date' %} <i class="fa fa-fw {{ request|order_icon_class:'final_date' }} pull-right"></i>
 					</a>
 				</th>
 				<th>
-					<a href="{{ request|order_href:'notification' }}">
+					<a href="{{ request|add_student:student|order_href:'notification' }}">
 						{% trans 'Notification' %} <i class="fa fa-fw {{ request|order_icon_class:'notification' }} pull-right"></i>
 					</a>
 				</th>
 				<th>
-					<a href="{{ request|order_href:'aware' }}">
+					<a href="{{ request|add_student:student|order_href:'aware' }}">
 						{% trans 'Aware' %} <i class="fa fa-fw {{ request|order_icon_class:'aware' }} pull-right"></i>
 					</a>
 				</th>	
 				<th>
-					<a href="{{ request|order_href:'obs' }}">
+					<a href="{{ request|add_student:student|order_href:'obs' }}">
 						{% trans 'Observation' %} <i class="fa fa-fw {{ request|order_icon_class:'obs' }} pull-right"></i>
 					</a>
 				</th>
@@ -61,7 +64,7 @@
 							<td>{{ notification.task.resource }}</td>
 							<td>{{ notification.task.get_action_display }}</td>
 							<td>{{ notification.task.end_date|date:"SHORT_DATE_FORMAT"|default:_('Not Informed') }}</td>
-							<td>{{ notification.level|warning_msg }}</td>
+							<td>{{ notification.level|warning_msg:has_subject_permissions }}</td>
 							<td>{{ notification.viewed|viewed_msg }}</td>
 							<td>{{ notification|observation }}</td>
 						</tr>
-{% load i18n notification_filters %}
+{% load i18n notification_filters permissions_tags %}
+
+{% subject_permissions request.user subject as has_subject_permissions %}
 {% for notification in notifications %}
 	<div class="row">
@@ -40,56 +42,58 @@
 						<div class="col-md-6">
 							<div class="alert {{ notification.level|warning_class }}">
 								<i class="fa fa-exclamation-triangle"></i>
-								<span>{{ notification.level|warning_msg }}</span>
+								<span>{{ notification.level|warning_msg:has_subject_permissions }}</span>
 							</div>
 						</div>
 					</div>
-					<div class="row text-center">
-						<a href="{{ notification.task.resource.access_link }}" class="btn btn-success btn-raised" {% if notification.task.resource.show_window %}target="_blank"{% endif %}>
-							{% if notification.level == 4 %}
-								{% trans 'Access the task' %}
-							{% else %}
-								{% trans 'Realize the task' %}
-							{% endif %}
-						</a>
-
-						{% if notification.level < 3 %}
-							<button class="btn btn-default no_button">{% trans 'or' %}</button>
-							<button class="btn btn-default btn-raised" data-toggle="popover" data-placement="right">
-								{% if notification.level == 1 %}
-									{% trans 'Define goal to realization' %}
+					{% if not has_subject_permissions %}
+						<div class="row text-center">
+							<a href="{{ notification.task.resource.access_link }}" class="btn btn-success btn-raised" {% if notification.task.resource.show_window %}target="_blank"{% endif %}>
+								{% if notification.level == 4 %}
+									{% trans 'Access the task' %}
 								{% else %}
-									{% trans 'Define new goal' %}
+									{% trans 'Realize the task' %}
 								{% endif %}
-							</button>
+							</a>
-							<div class="popover">
-	              				<div class="popover-content">
-									<form action="{% url 'notifications:set_goal' %}" role="form" method="post">
-										{% csrf_token %}
-		  								<div style="overflow:hidden;">
-										    <div class="form-group">
-										        <div class="row">
-										            <div class="col-md-12">
-										                <div class="datetimepicker"></div>
-										                <input type="hidden" name="id" value="{{ notification.id }}">
-										            </div>
-										        </div>
-										    </div>
-										</div>
-									</form>
-	              				</div>
-	              				<div class="popover-footer">
-	              					<button type="button" class="btn btn-raised btn-sm btn-success save pull-left">
-	              						{% trans 'Save Goal' %}
-	          						</button>
-	              					<button type="button" class="btn btn-default btn-sm btn-raised cancel pull-right">
-	              						{% trans 'Cancel' %}
-	          						</button>
-	      						</div>
-	  						</div>
-						{% endif %}
-					</div>
+							{% if notification.level < 3 %}
+								<button class="btn btn-default no_button">{% trans 'or' %}</button>
+								<button class="btn btn-default btn-raised" data-toggle="popover" data-placement="right">
+									{% if notification.level == 1 %}
+										{% trans 'Define goal to realization' %}
+									{% else %}
+										{% trans 'Define new goal' %}
+									{% endif %}
+								</button>
+
+								<div class="popover">
+		              				<div class="popover-content">
+										<form action="{% url 'notifications:set_goal' %}" role="form" method="post">
+											{% csrf_token %}
+			  								<div style="overflow:hidden;">
+											    <div class="form-group">
+											        <div class="row">
+											            <div class="col-md-12">
+											                <div class="datetimepicker"></div>
+											                <input type="hidden" name="id" value="{{ notification.id }}">
+											            </div>
+											        </div>
+											    </div>
+											</div>
+										</form>
+		              				</div>
+		              				<div class="popover-footer">
+		              					<button type="button" class="btn btn-raised btn-sm btn-success save pull-left">
+		              						{% trans 'Save Goal' %}
+		          						</button>
+		              					<button type="button" class="btn btn-default btn-sm btn-raised cancel pull-right">
+		              						{% trans 'Cancel' %}
+		          						</button>
+		      						</div>
+		  						</div>
+							{% endif %}
+						</div>
+					{% endif %}
 				</div>
 			</div>
 		</div>
@@ -67,7 +67,7 @@
 	{% else %}
 		<div class="text-center no-subjects">
 			<i class="fa fa-exclamation-triangle"></i>
-			<h4>{% trans 'You do not posses any pendency.' %}</h4>
+			<h4>{% trans 'You do not posses any pendency.' %}</h4>			
 		</div>
 	{% endif %}
@@ -10,6 +10,8 @@
 {% endblock %}
 {% block content %}
+	{% subject_permissions request.user subject as has_subject_permissions %}
+
 	{% if subject.visible %}
 		<div class="panel panel-info subject-panel">
         	<div class="panel-heading">
@@ -26,11 +28,36 @@
             </div>
     	</div>
     	<div id="{{subject.slug}}" class="panel-collapse in collapse pendencies-content subject-related-panel">
+    		{% if has_subject_permissions %}
+				<form id="student_goals" action="" method="POST">
+					{% csrf_token %}
+					<select name="selected_student" onchange="$('#student_goals').submit();">
+						{% for stu in sub_students %}
+							<option value="{{ stu.email }}" {% if stu.email == student %}selected{% endif %}>{{ stu }}</option>
+						{% endfor %}
+					</select>
+				</form>
+				<br clear="all" />
+			{% endif %}
+
 			<h5>{% trans 'This pendencies list is updated every 24 hours. Last update was in:' %} {{ last_update|default:_('Not determined') }}</h5>
             <div id="core-subjects-options-div">
 		        <ul class="core-subjects-options">
-	                <a href="{% url 'notifications:view' subject.slug %}"><li {% if not history %} class="active" {% endif %}>{% trans "Actual Pendencies" %} ({{ total }})</li></a>
-	                <a href="{% url 'notifications:history' subject.slug %}"><li {% if history %} class="active" {% endif %}>{% trans "Notifications History" %}</li></a>
+		        	{% if has_subject_permissions %}
+		        		<form id="student_pend" action="{% url 'notifications:view' subject.slug %}" method="POST">
+		        			{% csrf_token %}
+		        			<input type="hidden" value="{{ student }}" name="selected_student" />
+		        			<a onclick="$('#student_pend').submit();" style="cursor:pointer"><li {% if not history %} class="active" {% endif %}>{% trans "Actual Pendencies" %} ({{ total }})</li></a>
+		        		</form>
+		        		<form id="student_history" action="{% url 'notifications:history' subject.slug %}" method="POST">
+		        			{% csrf_token %}
+		        			<input type="hidden" value="{{ student }}" name="selected_student" />
+		        			<a onclick="$('#student_history').submit();" style="cursor:pointer"><li {% if history %} class="active" {% endif %}>{% trans "Notifications History" %}</li></a>
+		        		</form>
+		        	{% else %}
+		                <a href="{% url 'notifications:view' subject.slug %}"><li {% if not history %} class="active" {% endif %}>{% trans "Actual Pendencies" %} ({{ total }})</li></a>
+		                <a href="{% url 'notifications:history' subject.slug %}"><li {% if history %} class="active" {% endif %}>{% trans "Notifications History" %}</li></a>
+		            {% endif %}
 		        </ul>
 		    </div>
@@ -43,7 +70,11 @@
 			    {% else %}
 			    	<div class="text-center no-subjects">
 		                <i class="fa fa-exclamation-triangle"></i>
-		                <h4>{% trans 'You do not posses any pendency in this subject' %}</h4>
+		                {% if has_subject_permissions %}
+							<h4>{% trans 'The student do not posses any pendency.' %}</h4>
+						{% else %}
+		                	<h4>{% trans 'You do not posses any pendency in this subject' %}</h4>
+		                {% endif %}
 		            </div>
 			    {% endif %}
 			{% else %}
@@ -58,4 +89,10 @@
 			metaFunctions();
 		});
 	</script>
+{% endblock %}
+
+{% block addtional_scripts %}
+	<script type="text/javascript">
+		sessionSecurity.confirmFormDiscard = undefined;
+	</script>
 {% endblock %}
 \ No newline at end of file
@@ -22,15 +22,24 @@ def warning_class(level):
 	return class_name
 @register.filter(name = 'warning_msg')
-def warning_msg(level):
+def warning_msg(level, isnt_student):
 	if level == 1:
-		msg = _('You still did not realize this task')
+		if isnt_student:
+			msg = _('The student still did not realize this task')
+		else:
+			msg = _('You still did not realize this task')
 	elif level == 2:
-		msg = _('You still did not realize this task')
+		if isnt_student:
+			msg = _('The student still did not realize this task')
+		else:
+			msg = _('You still did not realize this task')
 	elif level == 3:
 		msg = _('This task is late')
 	else:
-		msg = _('You miss this task')
+		if isnt_student:
+			msg = _('The student miss this task')
+		else:
+			msg = _('You miss this task')
 	return msg
@@ -85,7 +94,7 @@ def order_href(request, column):
 	if 'order_by' in getvars:
 		order = getvars['order_by']
 		del getvars['order_by']
-    
+	
 	if not order:
 		if column == "creation_date":
 			order_href = "creation_date"
@@ -93,12 +102,28 @@ def order_href(request, column):
 		if column in order:
 			if "-" in order:
 				order_href = column
-        
+		
 	if len(getvars) > 0:
 		params = '&%s' % getvars.urlencode()
 	return "?order_by=" + order_href + params
+@register.filter(name = 'add_student')
+def add_student(request, student):
+	getvars = request.GET.copy()
+	params = ""
+
+	if not student is None:
+		if not student == "":
+			if 'selected_student' in getvars:
+				del getvars['selected_student']
+				   
+			getvars['selected_student'] = student
+
+			request.GET = getvars
+
+	return request
+
 @register.filter(name = 'order_ajax')
 def order_ajax(request, column):
 	getvars = request.GET.copy()
@@ -109,7 +134,7 @@ def order_ajax(request, column):
 	if 'order_by' in getvars:
 		order = getvars['order_by']
 		del getvars['order_by']
-    
+	
 	if not order:
 		if column == "creation_date":
 			order_href = "creation_date"
@@ -117,7 +142,7 @@ def order_ajax(request, column):
 		if column in order:
 			if "-" in order:
 				order_href = column
-    
+	
 	return order_href
 @register.filter(name = 'observation')
@@ -12,10 +12,11 @@ from dateutil import parser
 from datetime import datetime
 from django.utils import formats, timezone
-from amadeus.permissions import has_subject_view_permissions, has_category_permission
+from amadeus.permissions import has_subject_view_permissions, has_category_permission, has_subject_permissions
 from subjects.models import Subject
 from categories.models import Category
+from users.models import User
 from log.models import Log
 from log.mixins import LogMixin
@@ -39,6 +40,8 @@ class SubjectNotifications(LoginRequiredMixin, LogMixin, generic.ListView):
     paginate_by = 10
     total = 0
+    students = None
+
     def dispatch(self, request, *args, **kwargs):
         slug = self.kwargs.get('slug', '')
         subject = get_object_or_404(Subject, slug = slug)
@@ -52,14 +55,38 @@ class SubjectNotifications(LoginRequiredMixin, LogMixin, generic.ListView):
         slug = self.kwargs.get('slug', '')
         subject = get_object_or_404(Subject, slug = slug)
-        notifications = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date")
-
-        notifications.update(viewed = True)
+        if has_subject_permissions(self.request.user, subject):
+            self.students = User.objects.filter(subject_student = subject).order_by('social_name', 'username')
+            notifications = Notification.objects.filter(user = self.students.first(), task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date")
+        else:
+            notifications = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date")
+            notifications.update(viewed = True)
+            
         self.total = notifications.count()
         return notifications
+    def post(self, request, *args, **kwargs):
+        slug = self.kwargs.get('slug', '')
+        subject = get_object_or_404(Subject, slug = slug)
+
+        user = request.POST.get('selected_student', None)
+
+        if has_subject_permissions(request.user, subject):
+            self.students = User.objects.filter(subject_student = subject).order_by('social_name', 'username')
+
+            if not user is None:
+                self.object_list = Notification.objects.filter(user__email = user, task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date")
+            else:
+                self.object_list = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date")
+        else:
+            self.object_list = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date")
+
+        self.total = self.object_list.count()
+
+        return self.render_to_response(self.get_context_data())
+
     def get_context_data(self, **kwargs):
         context = super(SubjectNotifications, self).get_context_data(**kwargs)
@@ -70,6 +97,12 @@ class SubjectNotifications(LoginRequiredMixin, LogMixin, generic.ListView):
         context['subject'] = subject
         context['total'] = self.total
+        if not self.students is None:
+            context['sub_students'] = self.students
+            context['student'] = self.request.POST.get('selected_student', self.students.first().email)
+        else:
+            context['student'] = None
+
         update_pendencies = Log.objects.filter(action = "cron", component = "notifications").order_by('-datetime')
         if update_pendencies.count() > 0:
@@ -104,6 +137,8 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView):
     total = 0
     num_rows = 0
+    students = None
+
     def dispatch(self, request, *args, **kwargs):
         slug = self.kwargs.get('slug', '')
         subject = get_object_or_404(Subject, slug = slug)
@@ -120,7 +155,17 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView):
         order = get_order_by(self.request.GET.get("order_by", None))
         search = self.request.GET.get("search", None)
-        notifications = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject).order_by(*order)
+        if has_subject_permissions(self.request.user, subject):
+            user = self.request.GET.get("selected_student", None)
+
+            self.students = User.objects.filter(subject_student = subject).order_by('social_name', 'username')
+
+            if not user is None:
+                notifications = Notification.objects.filter(user__email = user, task__resource__topic__subject = subject).order_by(*order)
+            else:
+                notifications = Notification.objects.filter(user = self.students.first(), task__resource__topic__subject = subject).order_by(*order)
+        else:
+            notifications = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject).order_by(*order)
         self.total = notifications.filter(creation_date = datetime.now()).count()
@@ -145,6 +190,30 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView):
         return notifications
+    def post(self, request, *args, **kwargs):
+        slug = self.kwargs.get('slug', '')
+        subject = get_object_or_404(Subject, slug = slug)
+
+        order = get_order_by(self.request.POST.get("order_by", None))
+
+        user = request.POST.get('selected_student', None)
+
+        if has_subject_permissions(request.user, subject):
+            self.students = User.objects.filter(subject_student = subject).order_by('social_name', 'username')
+
+            if not user is None:
+                self.object_list = Notification.objects.filter(user__email = user, task__resource__topic__subject = subject).order_by(*order)
+            else:
+                self.object_list = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject).order_by(*order)
+        else:
+            self.object_list = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject).order_by(*order)
+
+        self.total = self.object_list.filter(creation_date = datetime.now()).count()
+
+        self.num_rows = self.object_list.count()
+
+        return self.render_to_response(self.get_context_data())
+
     def get_context_data(self, **kwargs):
         context = super(SubjectHistory, self).get_context_data(**kwargs)
@@ -158,6 +227,12 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView):
         context['rows'] = self.num_rows
         context['searched'] = self.request.GET.get("search", "")
+        if not self.students is None:
+            context['sub_students'] = self.students
+            context['student'] = self.request.POST.get('selected_student', self.request.GET.get('selected_student', self.students.first().email))
+        else:
+            context['student'] = None
+
         self.log_context['subject_id'] = subject.id
         self.log_context['subject_name'] = subject.name
         self.log_context['subject_slug'] = subject.slug
@@ -236,6 +311,17 @@ class AjaxNotifications(LoginRequiredMixin, generic.ListView):
         return notifications
+    def get_context_data(self, **kwargs):
+        context = super(AjaxNotifications, self).get_context_data(**kwargs)
+
+        subject_id = self.kwargs.get('id', '')
+        subject = Subject.objects.get(id = subject_id)
+
+        context['subject_id'] = subject_id
+        context['subject'] = subject
+        
+        return context
+
 class AjaxHistory(LoginRequiredMixin, generic.ListView):
     login_url = reverse_lazy("users:login")
     redirect_field_name = 'next'
@@ -276,8 +362,10 @@ class AjaxHistory(LoginRequiredMixin, generic.ListView):
         context = super(AjaxHistory, self).get_context_data(**kwargs)
         subject_id = self.kwargs.get('id', '')
+        subject = Subject.objects.get(id = subject_id)
         context['subject_id'] = subject_id
+        context['subject'] = subject
         context['rows'] = self.num_rows
         context['searched'] = self.request.GET.get("search", "")
         context['order_by'] = self.request.GET.get("order_by", "")
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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-08-16 19:24-0300\n"
+"POT-Creation-Date: 2017-08-22 06:51-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 ""		@@ -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-08-16 19:24-0300\n"	11	+"POT-Creation-Date: 2017-08-22 06:51-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"
	@@ -383,7 +383,7 @@ a.add-row {		@@ -383,7 +383,7 @@ a.add-row {
383	color: #FF0000; }	383	color: #FF0000; }
384		384
385	.alert-low {	385	.alert-low {
386	- background-color: #FFD800; }	386	+ background-color: #dfbd31; }
387		387
388	.alert-medium {	388	.alert-medium {
389	background-color: #FF9000; }	389	background-color: #FF9000; }
	@@ -526,7 +526,7 @@ a.add-row		@@ -526,7 +526,7 @@ a.add-row
526	color: #FF0000	526	color: #FF0000
527		527
528	.alert-low	528	.alert-low
529	- background-color: #FFD800	529	+ background-color: #dfbd31
530		530
531	.alert-medium	531	.alert-medium
532	background-color: #FF9000	532	background-color: #FF9000
	@@ -62,7 +62,7 @@		@@ -62,7 +62,7 @@
62	<td>{{ notification.task.resource }}</td>	62	<td>{{ notification.task.resource }}</td>
63	<td>{{ notification.task.get_action_display }}</td>	63	<td>{{ notification.task.get_action_display }}</td>
64	<td>{{ notification.task.end_date\|date:"SHORT_DATE_FORMAT"\|default:_('Not Informed') }}</td>	64	<td>{{ notification.task.end_date\|date:"SHORT_DATE_FORMAT"\|default:_('Not Informed') }}</td>
65	- <td>{{ notification.level\|warning_msg }}</td>	65	+ <td>{{ notification.level\|warning_msg:False }}</td>
66	<td>{{ notification.viewed\|viewed_msg }}</td>	66	<td>{{ notification.viewed\|viewed_msg }}</td>
67	<td>{{ notification\|observation }}</td>	67	<td>{{ notification\|observation }}</td>
68	</tr>	68	</tr>
	@@ -67,7 +67,7 @@		@@ -67,7 +67,7 @@
67	{% else %}	67	{% else %}
68	<div class="text-center no-subjects">	68	<div class="text-center no-subjects">
69	<i class="fa fa-exclamation-triangle"></i>	69	<i class="fa fa-exclamation-triangle"></i>
70	- <h4>{% trans 'You do not posses any pendency.' %}</h4>	70	+ <h4>{% trans 'You do not posses any pendency.' %}</h4>
71	</div>	71	</div>
72	{% endif %}	72	{% endif %}
73		73
	@@ -10,6 +10,8 @@		@@ -10,6 +10,8 @@
10	{% endblock %}	10	{% endblock %}
11		11
12	{% block content %}	12	{% block content %}
		13	+ {% subject_permissions request.user subject as has_subject_permissions %}
		14	+
13	{% if subject.visible %}	15	{% if subject.visible %}
14	<div class="panel panel-info subject-panel">	16	<div class="panel panel-info subject-panel">
15	<div class="panel-heading">	17	<div class="panel-heading">
	@@ -26,11 +28,36 @@		@@ -26,11 +28,36 @@
26	</div>	28	</div>
27	</div>	29	</div>
28	<div id="{{subject.slug}}" class="panel-collapse in collapse pendencies-content subject-related-panel">	30	<div id="{{subject.slug}}" class="panel-collapse in collapse pendencies-content subject-related-panel">
		31	+ {% if has_subject_permissions %}
		32	+ <form id="student_goals" action="" method="POST">
		33	+ {% csrf_token %}
		34	+ <select name="selected_student" onchange="$('#student_goals').submit();">
		35	+ {% for stu in sub_students %}
		36	+ <option value="{{ stu.email }}" {% if stu.email == student %}selected{% endif %}>{{ stu }}</option>
		37	+ {% endfor %}
		38	+ </select>
		39	+ </form>
		40	+ <br clear="all" />
		41	+ {% endif %}
		42	+
29	<h5>{% trans 'This pendencies list is updated every 24 hours. Last update was in:' %} {{ last_update\|default:_('Not determined') }}</h5>	43	<h5>{% trans 'This pendencies list is updated every 24 hours. Last update was in:' %} {{ last_update\|default:_('Not determined') }}</h5>
30	<div id="core-subjects-options-div">	44	<div id="core-subjects-options-div">
31	<ul class="core-subjects-options">	45	<ul class="core-subjects-options">
32	- <a href="{% url 'notifications:view' subject.slug %}"><li {% if not history %} class="active" {% endif %}>{% trans "Actual Pendencies" %} ({{ total }})</li></a>
33	- <a href="{% url 'notifications:history' subject.slug %}"><li {% if history %} class="active" {% endif %}>{% trans "Notifications History" %}</li></a>	46	+ {% if has_subject_permissions %}
		47	+ <form id="student_pend" action="{% url 'notifications:view' subject.slug %}" method="POST">
		48	+ {% csrf_token %}
		49	+ <input type="hidden" value="{{ student }}" name="selected_student" />
		50	+ <a onclick="$('#student_pend').submit();" style="cursor:pointer"><li {% if not history %} class="active" {% endif %}>{% trans "Actual Pendencies" %} ({{ total }})</li></a>
		51	+ </form>
		52	+ <form id="student_history" action="{% url 'notifications:history' subject.slug %}" method="POST">
		53	+ {% csrf_token %}
		54	+ <input type="hidden" value="{{ student }}" name="selected_student" />
		55	+ <a onclick="$('#student_history').submit();" style="cursor:pointer"><li {% if history %} class="active" {% endif %}>{% trans "Notifications History" %}</li></a>
		56	+ </form>
		57	+ {% else %}
		58	+ <a href="{% url 'notifications:view' subject.slug %}"><li {% if not history %} class="active" {% endif %}>{% trans "Actual Pendencies" %} ({{ total }})</li></a>
		59	+ <a href="{% url 'notifications:history' subject.slug %}"><li {% if history %} class="active" {% endif %}>{% trans "Notifications History" %}</li></a>
		60	+ {% endif %}
34	</ul>	61	</ul>
35	</div>	62	</div>
36		63
	@@ -43,7 +70,11 @@		@@ -43,7 +70,11 @@
43	{% else %}	70	{% else %}
44	<div class="text-center no-subjects">	71	<div class="text-center no-subjects">
45	<i class="fa fa-exclamation-triangle"></i>	72	<i class="fa fa-exclamation-triangle"></i>
46	- <h4>{% trans 'You do not posses any pendency in this subject' %}</h4>	73	+ {% if has_subject_permissions %}
		74	+ <h4>{% trans 'The student do not posses any pendency.' %}</h4>
		75	+ {% else %}
		76	+ <h4>{% trans 'You do not posses any pendency in this subject' %}</h4>
		77	+ {% endif %}
47	</div>	78	</div>
48	{% endif %}	79	{% endif %}
49	{% else %}	80	{% else %}
	@@ -58,4 +89,10 @@		@@ -58,4 +89,10 @@
58	metaFunctions();	89	metaFunctions();
59	});	90	});
60	</script>	91	</script>
		92	+{% endblock %}
		93	+
		94	+{% block addtional_scripts %}
		95	+ <script type="text/javascript">
		96	+ sessionSecurity.confirmFormDiscard = undefined;
		97	+ </script>
61	{% endblock %}	98	{% endblock %}
62	\ No newline at end of file	99	\ No newline at end of file
	@@ -12,10 +12,11 @@ from dateutil import parser		@@ -12,10 +12,11 @@ from dateutil import parser
12	from datetime import datetime	12	from datetime import datetime
13	from django.utils import formats, timezone	13	from django.utils import formats, timezone
14		14
15	-from amadeus.permissions import has_subject_view_permissions, has_category_permission	15	+from amadeus.permissions import has_subject_view_permissions, has_category_permission, has_subject_permissions
16		16
17	from subjects.models import Subject	17	from subjects.models import Subject
18	from categories.models import Category	18	from categories.models import Category
		19	+from users.models import User
19		20
20	from log.models import Log	21	from log.models import Log
21	from log.mixins import LogMixin	22	from log.mixins import LogMixin
	@@ -39,6 +40,8 @@ class SubjectNotifications(LoginRequiredMixin, LogMixin, generic.ListView):		@@ -39,6 +40,8 @@ class SubjectNotifications(LoginRequiredMixin, LogMixin, generic.ListView):
39	paginate_by = 10	40	paginate_by = 10
40	total = 0	41	total = 0
41		42
		43	+ students = None
		44	+
42	def dispatch(self, request, args, *kwargs):	45	def dispatch(self, request, args, *kwargs):
43	slug = self.kwargs.get('slug', '')	46	slug = self.kwargs.get('slug', '')
44	subject = get_object_or_404(Subject, slug = slug)	47	subject = get_object_or_404(Subject, slug = slug)
	@@ -52,14 +55,38 @@ class SubjectNotifications(LoginRequiredMixin, LogMixin, generic.ListView):		@@ -52,14 +55,38 @@ class SubjectNotifications(LoginRequiredMixin, LogMixin, generic.ListView):
52	slug = self.kwargs.get('slug', '')	55	slug = self.kwargs.get('slug', '')
53	subject = get_object_or_404(Subject, slug = slug)	56	subject = get_object_or_404(Subject, slug = slug)
54		57
55	- notifications = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date")
56	-
57	- notifications.update(viewed = True)	58	+ if has_subject_permissions(self.request.user, subject):
		59	+ self.students = User.objects.filter(subject_student = subject).order_by('social_name', 'username')
58		60
		61	+ notifications = Notification.objects.filter(user = self.students.first(), task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date")
		62	+ else:
		63	+ notifications = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date")
		64	+ notifications.update(viewed = True)
		65	+
59	self.total = notifications.count()	66	self.total = notifications.count()
60		67
61	return notifications	68	return notifications
62		69
		70	+ def post(self, request, args, *kwargs):
		71	+ slug = self.kwargs.get('slug', '')
		72	+ subject = get_object_or_404(Subject, slug = slug)
		73	+
		74	+ user = request.POST.get('selected_student', None)
		75	+
		76	+ if has_subject_permissions(request.user, subject):
		77	+ self.students = User.objects.filter(subject_student = subject).order_by('social_name', 'username')
		78	+
		79	+ if not user is None:
		80	+ self.object_list = Notification.objects.filter(user__email = user, task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date")
		81	+ else:
		82	+ self.object_list = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date")
		83	+ else:
		84	+ self.object_list = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date")
		85	+
		86	+ self.total = self.object_list.count()
		87	+
		88	+ return self.render_to_response(self.get_context_data())
		89	+
63	def get_context_data(self, **kwargs):	90	def get_context_data(self, **kwargs):
64	context = super(SubjectNotifications, self).get_context_data(**kwargs)	91	context = super(SubjectNotifications, self).get_context_data(**kwargs)
65		92
	@@ -70,6 +97,12 @@ class SubjectNotifications(LoginRequiredMixin, LogMixin, generic.ListView):		@@ -70,6 +97,12 @@ class SubjectNotifications(LoginRequiredMixin, LogMixin, generic.ListView):
70	context['subject'] = subject	97	context['subject'] = subject
71	context['total'] = self.total	98	context['total'] = self.total
72		99
		100	+ if not self.students is None:
		101	+ context['sub_students'] = self.students
		102	+ context['student'] = self.request.POST.get('selected_student', self.students.first().email)
		103	+ else:
		104	+ context['student'] = None
		105	+
73	update_pendencies = Log.objects.filter(action = "cron", component = "notifications").order_by('-datetime')	106	update_pendencies = Log.objects.filter(action = "cron", component = "notifications").order_by('-datetime')
74		107
75	if update_pendencies.count() > 0:	108	if update_pendencies.count() > 0:
	@@ -104,6 +137,8 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView):		@@ -104,6 +137,8 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView):
104	total = 0	137	total = 0
105	num_rows = 0	138	num_rows = 0
106		139
		140	+ students = None
		141	+
107	def dispatch(self, request, args, *kwargs):	142	def dispatch(self, request, args, *kwargs):
108	slug = self.kwargs.get('slug', '')	143	slug = self.kwargs.get('slug', '')
109	subject = get_object_or_404(Subject, slug = slug)	144	subject = get_object_or_404(Subject, slug = slug)
	@@ -120,7 +155,17 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView):		@@ -120,7 +155,17 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView):
120	order = get_order_by(self.request.GET.get("order_by", None))	155	order = get_order_by(self.request.GET.get("order_by", None))
121	search = self.request.GET.get("search", None)	156	search = self.request.GET.get("search", None)
122		157
123	- notifications = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject).order_by(*order)	158	+ if has_subject_permissions(self.request.user, subject):
		159	+ user = self.request.GET.get("selected_student", None)
		160	+
		161	+ self.students = User.objects.filter(subject_student = subject).order_by('social_name', 'username')
		162	+
		163	+ if not user is None:
		164	+ notifications = Notification.objects.filter(user__email = user, task__resource__topic__subject = subject).order_by(*order)
		165	+ else:
		166	+ notifications = Notification.objects.filter(user = self.students.first(), task__resource__topic__subject = subject).order_by(*order)
		167	+ else:
		168	+ notifications = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject).order_by(*order)
124		169
125	self.total = notifications.filter(creation_date = datetime.now()).count()	170	self.total = notifications.filter(creation_date = datetime.now()).count()
126		171
	@@ -145,6 +190,30 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView):		@@ -145,6 +190,30 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView):
145		190
146	return notifications	191	return notifications
147		192
		193	+ def post(self, request, args, *kwargs):
		194	+ slug = self.kwargs.get('slug', '')
		195	+ subject = get_object_or_404(Subject, slug = slug)
		196	+
		197	+ order = get_order_by(self.request.POST.get("order_by", None))
		198	+
		199	+ user = request.POST.get('selected_student', None)
		200	+
		201	+ if has_subject_permissions(request.user, subject):
		202	+ self.students = User.objects.filter(subject_student = subject).order_by('social_name', 'username')
		203	+
		204	+ if not user is None:
		205	+ self.object_list = Notification.objects.filter(user__email = user, task__resource__topic__subject = subject).order_by(*order)
		206	+ else:
		207	+ self.object_list = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject).order_by(*order)
		208	+ else:
		209	+ self.object_list = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject).order_by(*order)
		210	+
		211	+ self.total = self.object_list.filter(creation_date = datetime.now()).count()
		212	+
		213	+ self.num_rows = self.object_list.count()
		214	+
		215	+ return self.render_to_response(self.get_context_data())
		216	+
148	def get_context_data(self, **kwargs):	217	def get_context_data(self, **kwargs):
149	context = super(SubjectHistory, self).get_context_data(**kwargs)	218	context = super(SubjectHistory, self).get_context_data(**kwargs)
150		219
	@@ -158,6 +227,12 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView):		@@ -158,6 +227,12 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView):
158	context['rows'] = self.num_rows	227	context['rows'] = self.num_rows
159	context['searched'] = self.request.GET.get("search", "")	228	context['searched'] = self.request.GET.get("search", "")
160		229
		230	+ if not self.students is None:
		231	+ context['sub_students'] = self.students
		232	+ context['student'] = self.request.POST.get('selected_student', self.request.GET.get('selected_student', self.students.first().email))
		233	+ else:
		234	+ context['student'] = None
		235	+
161	self.log_context['subject_id'] = subject.id	236	self.log_context['subject_id'] = subject.id
162	self.log_context['subject_name'] = subject.name	237	self.log_context['subject_name'] = subject.name
163	self.log_context['subject_slug'] = subject.slug	238	self.log_context['subject_slug'] = subject.slug
	@@ -236,6 +311,17 @@ class AjaxNotifications(LoginRequiredMixin, generic.ListView):		@@ -236,6 +311,17 @@ class AjaxNotifications(LoginRequiredMixin, generic.ListView):
236		311
237	return notifications	312	return notifications
238		313
		314	+ def get_context_data(self, **kwargs):
		315	+ context = super(AjaxNotifications, self).get_context_data(**kwargs)
		316	+
		317	+ subject_id = self.kwargs.get('id', '')
		318	+ subject = Subject.objects.get(id = subject_id)
		319	+
		320	+ context['subject_id'] = subject_id
		321	+ context['subject'] = subject
		322	+
		323	+ return context
		324	+
239	class AjaxHistory(LoginRequiredMixin, generic.ListView):	325	class AjaxHistory(LoginRequiredMixin, generic.ListView):
240	login_url = reverse_lazy("users:login")	326	login_url = reverse_lazy("users:login")
241	redirect_field_name = 'next'	327	redirect_field_name = 'next'
	@@ -276,8 +362,10 @@ class AjaxHistory(LoginRequiredMixin, generic.ListView):		@@ -276,8 +362,10 @@ class AjaxHistory(LoginRequiredMixin, generic.ListView):
276	context = super(AjaxHistory, self).get_context_data(**kwargs)	362	context = super(AjaxHistory, self).get_context_data(**kwargs)
277		363
278	subject_id = self.kwargs.get('id', '')	364	subject_id = self.kwargs.get('id', '')
		365	+ subject = Subject.objects.get(id = subject_id)
279		366
280	context['subject_id'] = subject_id	367	context['subject_id'] = subject_id
		368	+ context['subject'] = subject
281	context['rows'] = self.num_rows	369	context['rows'] = self.num_rows
282	context['searched'] = self.request.GET.get("search", "")	370	context['searched'] = self.request.GET.get("search", "")
283	context['order_by'] = self.request.GET.get("order_by", "")	371	context['order_by'] = self.request.GET.get("order_by", "")