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

Jailson Dias
2 parents c168e75f 2eb21435
Showing 20 changed files with 363 additions and 224 deletions Show diff stats
amadeus/context_processors.py
amadeus/settings.py
amadeus/static/css/base/amadeus.css
amadeus/static/js/socket.js
amadeus/templates/base.html
categories/locale/pt_BR/LC_MESSAGES/django.po
categories/templates/categories/_form.html
chat/templates/chat/_view.html
chat/templates/chat/list.html
chat/templatetags/chat_tags.py
chat/views.py
file_link/views.py
pdf_file/views.py
reports/migrations/0002_reportxls.py
reports/models.py
reports/templates/reports/view.html
reports/urls.py
reports/views.py
users/locale/pt_BR/LC_MESSAGES/django.po
users/views.py
@@ -3,6 +3,7 @@ from datetime import datetime
 from themes.models import Themes
 from notifications.models import Notification
 from mural.models import MuralVisualizations
+from chat.models import ChatVisualizations
 def theme(request):
 	context = {}
@@ -35,4 +36,16 @@ def mural_notifies(request):
 	context['mural_notifications_count'] = notifications
+	return context
+
+def chat_notifies(request):
+	context = {}
+
+	notifications = 0
+
+	if request.user.is_authenticated:
+		notifications = ChatVisualizations.objects.filter(viewed = False, user = request.user).count()
+
+	context['chat_notifications_count'] = notifications
+
 	return context
 \ No newline at end of file
@@ -118,6 +118,7 @@ TEMPLATES = [
                 'amadeus.context_processors.theme',
                 'amadeus.context_processors.notifies',
                 'amadeus.context_processors.mural_notifies',
+                'amadeus.context_processors.chat_notifies',
             ],
         },
     },
@@ -1468,6 +1468,7 @@ div.dataTables_wrapper div.dataTables_paginate {
 #msg_editable {
     width: 100%;
     z-index: 1;
+    min-height: 20px;
 }
 .action-button {
@@ -239,6 +239,46 @@ function messageReceived(content) {
             $(this).hide();
 		});
+	} else {
+		var talk_line = $("#talk-" + content.container),
+			talk_notifies = talk_line.find('.chat_notify'),
+			actual_count = talk_notifies.text(),
+			actual_date = talk_line.find(".talk-last_msg");
+
+			actual_count = parseInt(actual_count, 10) + 1;
+
+			talk_notifies.text(actual_count);
+
+			actual_date.html(content.last_date);
+	
+		$('.chat_badge').each(function () {
+			var actual = $(this).text();
+
+			if (actual != "+99") {
+				actual = parseInt(actual, 10) + 1;
+
+				if (actual > 99) {
+					actual = "+99";
+				}
+
+				$(this).text(actual);
+			}
+
+			$(this).show();
+		});
+
+		$('.chat-tabs').find('li').each(function () {
+			var identity = $(this).data('chat');
+
+			if (identity == content.subtype) {
+				var span = $(this).find('span'),
+					actual = span.text();
+
+				actual = parseInt(actual, 10) + 1;
+
+				span.text(actual);
+			}
+		});
 	}
 	if (("Notification" in window)) {
@@ -209,6 +209,7 @@
                         <li class="item {{ chat_menu_active }} action_icon" data-toggle="tooltip" data-placement="right" title="{% trans "Messages" %}">
                             <a href="{% url 'chat:manage_general' %}">
                                 <i class="fa fa-envelope-o" aria-hidden="true"></i>
+                                <span class="badge notify_badge chat_badge" {% if chat_notifications_count == 0 %} style="display:none" {% endif %}>{% if chat_notifications_count > 99 %} +99 {% else %} {{ chat_notifications_count }} {% endif %}</span>
                             </a>
                         </li>
                         <li class="item {{ pendencies_menu_active }} action_icon" data-toggle="tooltip" data-placement="right" title="{% trans "Pendencies" %}">
@@ -263,6 +264,7 @@
                         <li class="item {{ chat_menu_active }} action_icon" data-toggle="tooltip" data-placement="top" title="{% trans "Messages" %}">
                             <a href="{% url 'chat:manage_general' %}">
                                 <i class="fa fa-envelope-o" aria-hidden="true"></i>
+                                <span class="badge notify_badge chat_badge" {% if chat_notifications_count == 0 %} style="display:none" {% endif %}>{% if chat_notifications_count > 99 %} +99 {% else %} {{ chat_notifications_count }} {% endif %}</span>
                             </a>
                         </li>
                         <li class="item {{ pendencies_menu_active }} action_icon" data-toggle="tooltip" data-placement="top" title="{% trans "Pendencies" %}">
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-09 17:01-0300\n"
+"POT-Creation-Date: 2017-03-21 23:06-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,146 +18,144 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: categories/forms.py:23
+#: .\forms.py:23
 msgid "There is another category with this name, try another one."
-msgstr ""
+msgstr "Existe outra categoria com este nome, tente outro nome."
-#: categories/models.py:9
+#: .\models.py:9
 msgid "Name"
 msgstr "Nome"
-#: categories/models.py:10
+#: .\models.py:10
 msgid "Slug"
 msgstr "Slug"
-#: categories/models.py:11
+#: .\models.py:11
 msgid "description"
 msgstr "Descrição"
-#: categories/models.py:12
+#: .\models.py:12
 msgid "visible"
 msgstr "Visível"
-#: categories/models.py:14
+#: .\models.py:14
 msgid "Creation Date"
 msgstr "Data de criação"
-#: categories/models.py:15
+#: .\models.py:15
 msgid "Modified Date"
 msgstr "Data de modificação"
-#: categories/models.py:19
+#: .\models.py:19
 msgid "Category"
 msgstr "Categoria"
-#: categories/models.py:20 categories/views.py:49
+#: .\models.py:20 .\views.py:49
 msgid "Categories"
 msgstr "Categorias"
-#: categories/templates/categories/_form.html:21
-msgid "Atribute coordinators role to users"
-msgstr "Atribuir perfil de coordenadores a usuários"
+#: .\templates\categories\_form.html:14
+msgid "Coordinators"
+msgstr "Coordenadores"
+
+#: .\templates\categories\_form.html:21
+msgid "Atribute coordinator role to users"
+msgstr "Atribua perfil de coordenador aos usuários"
-#: categories/templates/categories/_form.html:62
+#: .\templates\categories\_form.html:67
 msgid "Save"
 msgstr "Salvar"
-#: categories/templates/categories/_form.html:68
-#: categories/templates/categories/_form.html:69
-msgid "try an username"
-msgstr "Tente um nome de usuário"
+#: .\templates\categories\_form.html:73 .\templates\categories\_form.html:74
+msgid "search for an username"
+msgstr "pesquise por um nome de usuário"
-#: categories/templates/categories/category_card.html:18
-#: categories/templates/categories/list.html:69
-#: categories/templates/categories/list.html:114
+#: .\templates\categories\category_card.html:18
+#: .\templates\categories\list.html:69 .\templates\categories\list.html:114
 msgid "Replicate"
 msgstr "Replicar"
-#: categories/templates/categories/category_card.html:19
-#: categories/templates/categories/home_admin_content.html:6
-#: categories/templates/categories/list.html:73
-#: categories/templates/categories/list.html:116
+#: .\templates\categories\category_card.html:19
+#: .\templates\categories\home_admin_content.html:6
+#: .\templates\categories\list.html:73 .\templates\categories\list.html:116
 msgid "Edit"
 msgstr "Editar"
-#: categories/templates/categories/category_card.html:20
-#: categories/templates/categories/list.html:74
-#: categories/templates/categories/list.html:117
+#: .\templates\categories\category_card.html:20
+#: .\templates\categories\list.html:74 .\templates\categories\list.html:117
 msgid "Remove"
 msgstr "Remover"
-#: categories/templates/categories/category_card.html:26
+#: .\templates\categories\category_card.html:26
 msgid "Are you sure you want to subscribe to this course?"
 msgstr "Tem certeza que você deseja se inscrever neste curso?"
-#: categories/templates/categories/category_card.html:27
+#: .\templates\categories\category_card.html:27
 msgid "Subscribe"
 msgstr "Inscrever-se"
-#: categories/templates/categories/delete.html:12
+#: .\templates\categories\delete.html:12
 msgid "Are you sure you want to delete the category"
 msgstr "Voce tem certeza que seja deletar esta categoria"
-#: categories/templates/categories/delete.html:12
+#: .\templates\categories\delete.html:12
 msgid "All its data will be lost and can't be recovered"
 msgstr "Todos os seus dados seråo perdido e não podem ser recuperados"
-#: categories/templates/categories/delete.html:18
+#: .\templates\categories\delete.html:18
 msgid "Close"
 msgstr "Cancelar"
-#: categories/templates/categories/delete.html:19
+#: .\templates\categories\delete.html:19
 msgid "Delete"
 msgstr "Deletar"
-#: categories/templates/categories/home.html:26
+#: .\templates\categories\home.html:26
 msgid "categories"
 msgstr "Categorias"
-#: categories/templates/categories/list.html:31 categories/views.py:106
+#: .\templates\categories\list.html:31 .\views.py:106
 msgid "Create Category"
 msgstr "Criar Categoria"
-#: categories/templates/categories/list.html:39
+#: .\templates\categories\list.html:39
 msgid "My subjects"
 msgstr "Meus assuntos"
-#: categories/templates/categories/list.html:40
+#: .\templates\categories\list.html:40
 msgid "all subjects"
 msgstr "Todos os assuntos"
-#: categories/templates/categories/list.html:86
-#: categories/templates/categories/list.html:129
+#: .\templates\categories\list.html:86 .\templates\categories\list.html:129
 msgid "Coordinator(s) "
 msgstr "Coordenador(es)"
-#: categories/templates/categories/list.html:90
-#: categories/templates/categories/list.html:133
+#: .\templates\categories\list.html:90 .\templates\categories\list.html:133
 msgid "It doesn't possess coordinators"
 msgstr "Não possui coordenadores"
-#: categories/templates/categories/notifications_timeline.html:14
+#: .\templates\categories\notifications_timeline.html:14
 msgid "at"
 msgstr "em"
-#: categories/templates/categories/notifications_timeline.html:15
+#: .\templates\categories\notifications_timeline.html:15
 msgid "ago"
 msgstr "atras"
-#: categories/templates/categories/update.html:8
+#: .\templates\categories\update.html:8
 msgid "Update: "
 msgstr "Editar: "
-#: categories/views.py:104
+#: .\views.py:104
 msgid "Replicate Category"
 msgstr "Replicar Categoria"
-#: categories/views.py:131
+#: .\views.py:131
 #, python-format
 msgid "Category \"%s\" register successfully!"
 msgstr "Categoria \"%s\" foi registrada com sucesso!"
-#: categories/views.py:167
+#: .\views.py:167
 msgid ""
 "The category cannot be removed, it contains one or more virtual enviroments "
 "attach."
@@ -165,19 +163,16 @@ msgstr &quot;&quot;
 "A categoria não pode ser removida, ela contém um ou mais ambientes virtuais "
 "vinculados."
-#: categories/views.py:180
+#: .\views.py:180
 #, python-format
 msgid "Category \"%s\" removed successfully!"
 msgstr "Categoria \"%s\" removida com sucesso!"
-#: categories/views.py:208
+#: .\views.py:208
 #, python-format
 msgid "Category \"%s\" updated successfully!"
 msgstr "Categoria \"%s\" atualizada com sucesso!"
-#: categories/views.py:224
+#: .\views.py:224
 msgid "Update Category"
 msgstr "Atualizar Categoria"
-
-#~ msgid "coordinators"
-#~ msgstr "Coordenadores"
@@ -11,14 +11,14 @@
                 			<div class="col-md-12">
                     			<a data-parent="#coordinators_accordion" data-toggle="collapse" href="#coords">
                     				<h4 class="panel-title">
-                            			<button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ field.auto_id }}">{{ field.label }}</label>
+                            			<button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ field.auto_id }}">{% trans 'Coordinators' %}</label>
                     				</h4>
                     			</a>
                     		</div>
                     	</div>
                     </div>
                     <div id="coords" class="panel-collapse collapse">
-                    	<p><em>{% trans 'Atribute coordinators role to users' %}:</em></p>
+                    	<p><em>{% trans 'Atribute coordinator role to users' %}:</em></p>
                     	{% render_field field class='form-control' %}
                     </div>
                 </div>
@@ -70,8 +70,8 @@
 <script type="text/javascript">
     $('#id_coordinators').multiSelect({
-	  	selectableHeader: "<input type='text' class='form-control search-input category-search-users' autocomplete='off' placeholder='{% trans "try an username" %} '>",
-	  	selectionHeader: "<input type='text' class='form-control search-input category-search-users' autocomplete='off' placeholder='{% trans "try an username" %} '>",
+	  	selectableHeader: "<input type='text' class='form-control search-input category-search-users' autocomplete='off' placeholder='{% trans "search for an username" %} '>",
+	  	selectionHeader: "<input type='text' class='form-control search-input category-search-users' autocomplete='off' placeholder='{% trans "search for an username" %} '>",
 	  	afterInit: function(ms){
 		    var that = this,
 		        $selectableSearch = that.$selectableUl.prev(),
@@ -4,12 +4,12 @@
 {% is_online talking_to as status %}
-<div class="col-md-12 participant panel">
+<div id="talk-chat-{{ talking_to.id }}" class="col-md-12 participant panel">
     <div class="col-md-1 user-img">
         <img src="{{ talking_to.image_url }}" class="img-responsive" />
     </div>
     <div class="col-md-6 user-info">
-        <h4 class='talking-header'><a class="status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ talking_to }}</h4>
+        <h4 class='talking-header'><a class="status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ talking_to }} (<span class="chat_notify">{{ chat|notifies:request.user }}</span>)</h4>
         <p class="talk-last_msg">{% trans 'Last message in' %} {{ chat|last_message }}</p>
     </div>
     <div class="col-md-4 buttons pull-right text-center">
@@ -13,10 +13,10 @@
 {% block content %}
 	<div id="core-subjects-options-div">
-        <ul class="core-subjects-options mural-tabs">
+        <ul class="core-subjects-options chat-tabs">
             <a href="{% url 'chat:manage_general' %}"><li data-chat="general" class="active">{% trans "General" %} (<span>{{ totals.general }}</span>)</li></a>
-            <a href=""><li data-chat="categories">{% trans "Per Category" %} (<span>{{ totals.category }}</span>)</li></a>
-            <a href=""><li data-chat="subjects">{% trans "Per Subject" %} (<span>{{ totals.subject }}</span>)</li></a>
+            <a href=""><li data-chat="category">{% trans "Per Category" %} (<span>{{ totals.category }}</span>)</li></a>
+            <a href=""><li data-chat="subject">{% trans "Per Subject" %} (<span>{{ totals.subject }}</span>)</li></a>
         </ul>
     </div>
@@ -7,7 +7,7 @@ from django.contrib.sessions.models import Session
 from log.models import Log
-from chat.models import TalkMessages
+from chat.models import TalkMessages, ChatVisualizations
 register = template.Library()
@@ -49,4 +49,10 @@ def chat_user(user, chat):
 def last_message(chat):
 	last_message = TalkMessages.objects.filter(talk = chat).order_by('-create_date')[0]
-	return last_message.create_date
 \ No newline at end of file
+	return last_message.create_date
+
+@register.filter(name = 'notifies')
+def notifies(chat, user):
+	total = ChatVisualizations.objects.filter(message__talk = chat, user = user).count()
+
+	return total
 \ No newline at end of file
@@ -7,6 +7,7 @@ from django.http import JsonResponse
 from django.template.loader import render_to_string
 from django.core.urlresolvers import reverse, reverse_lazy
 import textwrap
+from django.utils import formats
 from django.utils.html import strip_tags
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.mixins import LoginRequiredMixin
@@ -193,7 +194,8 @@ class SendMessage(LoginRequiredMixin, generic.edit.CreateView):
 			"notify_title": str(self.object.user),
 			"simple_notify": simple_notify,
 			"complete": render_to_string("chat/_message.html", {"talk_msg": self.object}, self.request),
-			"container": "chat-" + str(self.object.user.id)
+			"container": "chat-" + str(self.object.user.id),
+			"last_date": _("Last message in %s")%(formats.date_format(self.object.create_date, "SHORT_DATETIME_FORMAT"))
 		}
 		notification = json.dumps(notification)
@@ -21,7 +21,7 @@ from .models import FileLink
 class DownloadFile(LoginRequiredMixin, LogMixin, generic.DetailView):
 	log_component = 'resources'
 	log_action = 'view'
-	log_resource = 'file_link'
+	log_resource = 'filelink'
 	log_context = {}
 	login_url = reverse_lazy("users:login")
@@ -63,9 +63,9 @@ class DownloadFile(LoginRequiredMixin, LogMixin, generic.DetailView):
 		self.log_context['topic_id'] = file_link.topic.id
 		self.log_context['topic_name'] = file_link.topic.name
 		self.log_context['topic_slug'] = file_link.topic.slug
-		self.log_context['file_link_id'] = file_link.id
-		self.log_context['file_link_name'] = file_link.name
-		self.log_context['file_link_slug'] = file_link.slug
+		self.log_context['filelink_id'] = file_link.id
+		self.log_context['filelink_name'] = file_link.name
+		self.log_context['filelink_slug'] = file_link.slug
 		super(DownloadFile, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context) 
@@ -74,7 +74,7 @@ class DownloadFile(LoginRequiredMixin, LogMixin, generic.DetailView):
 class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
 	log_component = 'resources'
 	log_action = 'create'
-	log_resource = 'file_link'
+	log_resource = 'filelink'
 	log_context = {}
 	login_url = reverse_lazy("users:login")
@@ -163,9 +163,9 @@ class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
 		self.log_context['topic_id'] = self.object.topic.id
 		self.log_context['topic_name'] = self.object.topic.name
 		self.log_context['topic_slug'] = self.object.topic.slug
-		self.log_context['file_link_id'] = self.object.id
-		self.log_context['file_link_name'] = self.object.name
-		self.log_context['file_link_slug'] = self.object.slug
+		self.log_context['filelink_id'] = self.object.id
+		self.log_context['filelink_name'] = self.object.name
+		self.log_context['filelink_slug'] = self.object.slug
 		super(CreateView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -192,7 +192,7 @@ class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
 class UpdateView(LoginRequiredMixin, LogMixin, generic.UpdateView):
 	log_component = 'resources'
 	log_action = 'update'
-	log_resource = 'file_link'
+	log_resource = 'filelink'
 	log_context = {}
 	login_url = reverse_lazy("users:login")
@@ -277,9 +277,9 @@ class UpdateView(LoginRequiredMixin, LogMixin, generic.UpdateView):
 		self.log_context['topic_id'] = self.object.topic.id
 		self.log_context['topic_name'] = self.object.topic.name
 		self.log_context['topic_slug'] = self.object.topic.slug
-		self.log_context['file_link_id'] = self.object.id
-		self.log_context['file_link_name'] = self.object.name
-		self.log_context['file_link_slug'] = self.object.slug
+		self.log_context['filelink_id'] = self.object.id
+		self.log_context['filelink_name'] = self.object.name
+		self.log_context['filelink_slug'] = self.object.slug
 		super(UpdateView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -306,7 +306,7 @@ class UpdateView(LoginRequiredMixin, LogMixin, generic.UpdateView):
 class DeleteView(LoginRequiredMixin, LogMixin, generic.DeleteView):
 	log_component = 'resources'
 	log_action = 'delete'
-	log_resource = 'file_link'
+	log_resource = 'filelink'
 	log_context = {}
 	login_url = reverse_lazy("users:login")
@@ -337,9 +337,9 @@ class DeleteView(LoginRequiredMixin, LogMixin, generic.DeleteView):
 		self.log_context['topic_id'] = self.object.topic.id
 		self.log_context['topic_name'] = self.object.topic.name
 		self.log_context['topic_slug'] = self.object.topic.slug
-		self.log_context['file_link_id'] = self.object.id
-		self.log_context['file_link_name'] = self.object.name
-		self.log_context['file_link_slug'] = self.object.slug
+		self.log_context['filelink_id'] = self.object.id
+		self.log_context['filelink_name'] = self.object.name
+		self.log_context['filelink_slug'] = self.object.slug
 		super(DeleteView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -23,7 +23,7 @@ class ViewPDFFile(LoginRequiredMixin, LogMixin, generic.TemplateView):
     template_name='pdf_file/view.html'
     log_component = 'resources'
     log_action = 'view'
-    log_resource = 'pdf_file'
+    log_resource = 'pdffile'
     log_context = {}
     def dispatch(self, request, *args, **kwargs):
         slug = self.kwargs.get('slug', '')
@@ -52,9 +52,9 @@ class ViewPDFFile(LoginRequiredMixin, LogMixin, generic.TemplateView):
         self.log_context['topic_id'] = pdf_file.topic.id
         self.log_context['topic_name'] = pdf_file.topic.name
         self.log_context['topic_slug'] = pdf_file.topic.slug
-        self.log_context['pdf_id'] = pdf_file.id
-        self.log_context['pdf_name'] = pdf_file.name
-        self.log_context['pdf_slug'] = pdf_file.slug
+        self.log_context['pdffile_id'] = pdf_file.id
+        self.log_context['pdffile_name'] = pdf_file.name
+        self.log_context['pdffile_slug'] = pdf_file.slug
         super(ViewPDFFile, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -87,6 +87,7 @@ class PDFFileCreateView(LoginRequiredMixin, LogMixin , generic.CreateView):
     login_url = reverse_lazy("users:login")
     redirect_field_name = 'next'
+    log_resource = 'pdffile'
     def dispatch(self, request, *args, **kwargs):
         slug = self.kwargs.get('slug', '')
@@ -168,9 +169,9 @@ class PDFFileCreateView(LoginRequiredMixin, LogMixin , generic.CreateView):
         self.log_context['topic_id'] = self.object.topic.id
         self.log_context['topic_name'] = self.object.topic.name
         self.log_context['topic_slug'] = self.object.topic.slug
-        self.log_context['pdf_file_id'] = self.object.id
-        self.log_context['pdf_file_name'] = self.object.name
-        self.log_context['pdf_file_slug'] = self.object.slug
+        self.log_context['pdffile_id'] = self.object.id
+        self.log_context['pdffile_name'] = self.object.name
+        self.log_context['pdffile_slug'] = self.object.slug
         super(PDFFileCreateView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -198,7 +199,7 @@ class PDFFileCreateView(LoginRequiredMixin, LogMixin , generic.CreateView):
 class UpdateView(LoginRequiredMixin, LogMixin, generic.UpdateView):
     log_component = 'resources'
     log_action = 'update'
-    log_resource = 'pdf_file'
+    log_resource = 'pdffile'
     log_context = {}
     login_url = reverse_lazy("users:login")
@@ -283,9 +284,9 @@ class UpdateView(LoginRequiredMixin, LogMixin, generic.UpdateView):
         self.log_context['topic_id'] = self.object.topic.id
         self.log_context['topic_name'] = self.object.topic.name
         self.log_context['topic_slug'] = self.object.topic.slug
-        self.log_context['pdf_file_id'] = self.object.id
-        self.log_context['pdf_file_name'] = self.object.name
-        self.log_context['pdf_file_slug'] = self.object.slug
+        self.log_context['pdffile_id'] = self.object.id
+        self.log_context['pdffile_name'] = self.object.name
+        self.log_context['pdffile_slug'] = self.object.slug
         super(UpdateView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -343,9 +344,9 @@ class DeleteView(LoginRequiredMixin, LogMixin, generic.DeleteView):
         self.log_context['topic_id'] = self.object.topic.id
         self.log_context['topic_name'] = self.object.topic.name
         self.log_context['topic_slug'] = self.object.topic.slug
-        self.log_context['pdf_file_id'] = self.object.id
-        self.log_context['pdf_file_name'] = self.object.name
-        self.log_context['pdf_file_slug'] = self.object.slug
+        self.log_context['pdffile_id'] = self.object.id
+        self.log_context['pdffile_name'] = self.object.name
+        self.log_context['pdffile_slug'] = self.object.slug
         super(DeleteView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-03-21 00:55
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('reports', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ReportXLS',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('xls_data', models.TextField()),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'ReportCSV',
+                'verbose_name_plural': 'ReportCSVs',
+            },
+        ),
+    ]
@@ -12,4 +12,17 @@ class ReportCSV(models.Model):
     def __str__(self):
         pass
+    
+
+class ReportXLS(models.Model):
+
+    user = models.ForeignKey(User)
+    xls_data = models.TextField() 
+
+    class Meta:
+        verbose_name = "ReportCSV"
+        verbose_name_plural = "ReportCSVs"
+
+    def __str__(self):
+        pass
 \ No newline at end of file
@@ -65,7 +65,7 @@
     	<ul id="report-info">
     		<li> {{data.values|length}} {% trans "register(s)" %} </li>
     		<li>
-    			<a href="{% url 'subjects:reports:download_report' %}?{{csv_data}}"><i class="fa fa-download" aria-hidden="true"></i> {% trans "Interactions Data" %}</a>
+    			<a href="{% url 'subjects:reports:download_report_csv' %}"><i class="fa fa-download" aria-hidden="true"></i> {% trans "Interactions Data" %}</a>
     		</li>
@@ -7,5 +7,5 @@ urlpatterns = [
     url(r'^view/interactions/$', views.ViewReportView.as_view(), name='view_report'),
     url(r'^get/resources/$', views.get_resources, name='get_resource_and_tags'),
     url(r'^get/tags/$', views.get_tags, name='get_tags'),
-    url(r'^post/download_report/$', views.download_report, name="download_report"),
+    url(r'^post/download_report/$', views.download_report_csv, name="download_report_csv"),
 ]
 \ No newline at end of file
@@ -11,14 +11,14 @@ import django.views.generic as generic
 from mural.models import SubjectPost, Comment, MuralVisualizations
 from django.db.models import Q
 from django.contrib.auth.mixins import LoginRequiredMixin
-from datetime import datetime, date
+from datetime import datetime, date, timedelta
 from subjects.models import Subject, Tag
 from .forms import CreateInteractionReportForm, ResourceAndTagForm, BaseResourceAndTagFormset
 from log.models import Log
 from topics.models import Resource, Topic
 from collections import OrderedDict
 from django.forms import formset_factory
-from .models import ReportCSV
+from .models import ReportCSV, ReportXLS
 import pandas as pd
 class ReportView(LoginRequiredMixin, generic.FormView):
@@ -143,32 +143,47 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
         #this is to save the csv for further download
         df = pd.DataFrame.from_dict(context['data'], orient='index')
-
         df.columns = context['header']
         #so it does not exist more than one report CSV available for that user to download
         if ReportCSV.objects.filter(user= self.request.user).count() > 0:
             report = ReportCSV.objects.get(user=self.request.user)
             report.delete()
-           
+        
         report = ReportCSV(user= self.request.user, csv_data = df.to_csv())
         report.save()
+        #for excel files
+        """ if ReportXLS.objects.filter(user= self.request.user).count() > 0:
+            report = ReportXLS.objects.get(user=self.request.user)
+            report.delete()
+        
+        df.drop(df.columns[[0]], axis=1, inplace=True)
+        writer = pd.ExcelWriter('pandas_simple.xlsx')
+        report = ReportXLS(user= self.request.user, xls_data = df.to_excel(writer))
+        report.save()"""
+
+
         return context
     def get_mural_data(self, subject, init_date, end_date, resources_id, tags_id):
         data = {}
         students = subject.students.all()
-        formats = ["%d/%m/%Y", "%m/%d/%Y"] #so it accepts english and portuguese date formats
+        formats = ["%d/%m/%Y", "%m/%d/%Y", "%Y-%m-%d"] #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)
+                init_date = datetime.strptime(init_date, fmt).date()
+                end_date = datetime.strptime(end_date, fmt).date()
+                
             except ValueError:
                 pass
         header = ['User']
-
+       
+        #I use this so the system can gather data up to end_date 11h59 p.m.
+        end_date = end_date + timedelta(days=1)
+   
+       
         #For each student in the subject
         for student in students:
             data[student] = []
@@ -226,7 +241,7 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
             #VAR08 through VAR_019 of documenttation:
             if len(resources_id) > 0:
-                resources_data = self.get_resources_and_tags_data(resources_id, tags_id, student, subject)
+                resources_data = self.get_resources_and_tags_data(resources_id, tags_id, student, subject, init_date, end_date)
                 for key, value in resources_data.items():
                     interactions[key] = value
@@ -268,12 +283,26 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
             header.append(key)
         return data, header
-    def get_resources_and_tags_data(self, resources, tags, student, subject):
-        data = {}
+    def get_resources_and_tags_data(self, resources_types, tags, student, subject, init_date, end_date):
+        data = OrderedDict()  
-        for i in range(len(resources)):
-            data[str(resources[i]) + " with tag " + Tag.objects.get(id=int(tags[i])).name] = Log.objects.filter(action="view", resource=resources[i].lower(),
-                user_id = student.id, context__contains = {'subject_id': subject.id}).count()
+        for i in range(len(resources_types)):
+            
+            resources = Resource.objects.select_related(resources_types[i].lower()).filter(tags__in = tags, topic__in=subject.topic_subject.all())
+            distinct_resources = 0
+            total_count = 0
+            for resource in resources:
+                count = Log.objects.filter(action="view", resource=resources_types[i].lower(),
+                      user_id = student.id, context__contains = {'subject_id': subject.id, 
+                      resources_types[i].lower()+'_id': resource.id}, datetime__range=(init_date, end_date)).count()
+                if count > 0:
+                    distinct_resources += 1
+                    total_count += count
+                
+            data[str(resources_types[i]) + " with tag " + Tag.objects.get(id=int(tags[i])).name] = total_count
+            data["distintic " + str(resources_types[i]) + " with tag " + Tag.objects.get(id=int(tags[i])).name] = distinct_resources
+            """data["distinct" + str(resources[i]) + " with tag " + Tag.objects.get(id=int(tags[i])).name] = Log.objects.filter(action="view", resource=resources[i].lower(),
+                user_id = student.id, context__contains = {'subject_id': subject.id}).distinct().count()"""
         return data
@@ -317,27 +346,32 @@ def get_tags(request):
     resource_type = request.GET['resource_class_name']
     subject = Subject.objects.get(id=request.GET['subject_id'])
     topic_choice = request.GET["topic_choice"]
+    
+    #Have to fix this to accept translated options
     if topic_choice.lower() == "all" or topic_choice.lower() == "todos":
         topics = subject.topic_subject.all()
     else:
         topics = [Topic.objects.get(id=int(topic_choice))]
     data = {}
-    tags = []
+    tags = set()
     for topic in topics:
         resource_set = Resource.objects.select_related(resource_type.lower()).filter(topic = topic)
         for resource in resource_set:
             if resource._my_subclass == resource_type.lower():
                 for tag in resource.tags.all():
-                    tags.append(tag)
-    
+                    if tag.name != "":
+                        tags.add(tag)
+                
-  
+    #adding empty tag for the purpose of giving the user this option for adicional behavior
+    tags = list(tags)
+    tags.append(Tag(name=""))
     data['tags'] = [ {'id':tag.id, 'name':tag.name} for tag in  tags]
     return JsonResponse(data)
-def download_report(request):
+def download_report_csv(request):
     report = ReportCSV.objects.get(user=request.user)
     response = HttpResponse(report.csv_data,content_type='text/csv')
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-09 17:01-0300\n"
+"POT-Creation-Date: 2017-03-21 22:47-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,69 +18,69 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: users/forms.py:25 users/forms.py:30 users/forms.py:189
+#: .\forms.py:25 .\forms.py:30 .\forms.py:189
 msgid "You must insert an email address"
 msgstr "Você deve inserir um endereço de email"
-#: users/forms.py:40
+#: .\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:51
+#: .\forms.py:51
 msgid "The confirmation password is incorrect."
 msgstr "A confirmação de senha está incorreta."
-#: users/forms.py:58 users/forms.py:114 users/templates/users/login.html:52
+#: .\forms.py:58 .\forms.py:114 .\templates\users\login.html:52
 msgid "Password"
 msgstr "Senha"
-#: users/forms.py:59 users/forms.py:115 users/forms.py:146 users/forms.py:202
+#: .\forms.py:59 .\forms.py:115 .\forms.py:146 .\forms.py:202
 msgid "Confirm Password"
 msgstr "Confirmação de Senha"
-#: 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
+#: .\forms.py:76 .\forms.py:180 .\templates\users\list.html:56
+#: .\templates\users\login.html:47 .\templates\users\search.html:47
 msgid "Email"
 msgstr "Email"
-#: users/forms.py:77 users/models.py:27 users/templates/users/list.html:55
-#: users/templates/users/search.html:46
+#: .\forms.py:77 .\models.py:27 .\templates\users\list.html:55
+#: .\templates\users\search.html:46
 msgid "Name"
 msgstr "Nome"
-#: users/forms.py:78 users/models.py:28
+#: .\forms.py:78 .\models.py:28
 msgid "Last Name"
 msgstr "Sobrenome"
-#: users/forms.py:79 users/models.py:29
+#: .\forms.py:79 .\models.py:29
 msgid "Social Name"
 msgstr "Nome Social"
-#: users/forms.py:145 users/forms.py:201
+#: .\forms.py:145 .\forms.py:201
 msgid "New Password"
 msgstr "Nova Senha"
-#: users/forms.py:152
+#: .\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:173
+#: .\forms.py:173
 msgid "Actual Password"
 msgstr "Senha Atual"
-#: users/forms.py:194
+#: .\forms.py:194
 msgid "You must insert a valid email address"
 msgstr "Você deve inserir um endereço de email válido"
-#: users/models.py:16
+#: .\models.py:16
 msgid "File not supported."
 msgstr "Arquivo não suportado."
-#: users/models.py:20
+#: .\models.py:20
 msgid "Mail"
 msgstr "Email"
-#: users/models.py:23
+#: .\models.py:23
 msgid ""
 "Type a valid email. This fields should only contain letters, numbers and the "
 "characteres: @/./+/-/_ ."
@@ -88,111 +88,109 @@ msgstr &quot;&quot;
 "Digite um email válido. Esse campo deve conter apenas letras, números e os "
 "caracteres: @/./+/-/_ ."
-#: users/models.py:26
+#: .\models.py:26
 msgid "Your email address that will be used to access the platform"
 msgstr "Seu endereço de email que será usado para acessar a plataforma"
-#: users/models.py:30 users/templates/users/list.html:57
-#: users/templates/users/profile.html:60 users/templates/users/search.html:48
+#: .\models.py:30 .\templates\users\list.html:57
+#: .\templates\users\profile.html:60 .\templates\users\search.html:48
 msgid "Description"
 msgstr "Descrição"
-#: users/models.py:31
+#: .\models.py:31
 msgid "Photo"
 msgstr "Foto"
-#: users/models.py:32
+#: .\models.py:32
 msgid "Create Date"
 msgstr "Data de Criação"
-#: users/models.py:33
+#: .\models.py:33
 msgid "Last Update"
 msgstr "Última Atualização"
-#: users/models.py:34
+#: .\models.py:34
 msgid "Show email?"
 msgstr "Mostrar email?"
-#: users/models.py:34
+#: .\models.py:34
 msgid "Allow everyone to see my address"
 msgstr "Permitir que todos vejam meu endereço de email"
-#: users/models.py:34
+#: .\models.py:34
 msgid "Only classmates can see my address"
 msgstr "Apenas meus colegas de disciplina podem ver meu endereço de email"
-#: users/models.py:34
+#: .\models.py:34
 msgid "Nobody can see my address"
 msgstr "Ninguém pode ver meu endereço de email"
-#: users/models.py:35
+#: .\models.py:35
 msgid "Administrator"
 msgstr "Administrador"
-#: users/models.py:36
+#: .\models.py:36
 msgid "Active"
 msgstr "Ativo"
-#: users/models.py:44
+#: .\models.py:44
 msgid "User"
 msgstr "Usuário"
-#: users/models.py:45
+#: .\models.py:45
 msgid "Users"
 msgstr "Usuários"
-#: users/models.py:63
+#: .\models.py:63
 msgid "Yes"
 msgstr "Sim"
-#: users/models.py:65
+#: .\models.py:65
 msgid "Is not an admin"
 msgstr "Não é administrador"
-#: users/templates/users/_form.html:16 users/templates/users/register.html:52
+#: .\templates\users\_form.html:16 .\templates\users\register.html:52
 msgid "Choose your photo..."
 msgstr "Escolha sua foto..."
-#: users/templates/users/_form.html:61
+#: .\templates\users\_form.html:62
 msgid "Save"
 msgstr "Salvar"
-#: users/templates/users/_form.html:64 users/templates/users/delete.html:27
-#: users/templates/users/delete_account.html:27
+#: .\templates\users\_form.html:65 .\templates\users\delete.html:27
+#: .\templates\users\delete_account.html:27
 msgid "Cancel"
 msgstr "Cancelar"
-#: users/templates/users/delete.html:9
+#: .\templates\users\delete.html:9
 msgid "Delete User"
 msgstr "Deletar Usuário"
-#: users/templates/users/delete.html:19
+#: .\templates\users\delete.html:19
 msgid "Are you sure you want delete the user"
 msgstr "Tem certeza que deseja deletar o usuário"
-#: users/templates/users/delete.html:20
-#: users/templates/users/delete_account.html:20
+#: .\templates\users\delete.html:20 .\templates\users\delete_account.html:20
 msgid "All data will be lost and havent how recover it."
 msgstr "Toda informação será perdida e não poderá ser recuperada"
-#: users/templates/users/delete.html:24
-#: users/templates/users/delete_account.html:24
+#: .\templates\users\delete.html:24 .\templates\users\delete_account.html:24
 msgid "Remove"
 msgstr "Deletar"
-#: users/templates/users/delete_account.html:9
+#: .\templates\users\delete_account.html:9
 msgid "Remove Account"
 msgstr "Remover Conta"
-#: users/templates/users/delete_account.html:19
+#: .\templates\users\delete_account.html:19
 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:380
+#: .\templates\users\forgot_password.html:39 .\views.py:380
 msgid "Forgot Password"
 msgstr "Esqueceu Senha"
-#: users/templates/users/forgot_password.html:40
+#: .\templates\users\forgot_password.html:40
 msgid ""
 "Enter your email below (the one used to access the platform) to recover your "
 "password"
@@ -200,132 +198,131 @@ msgstr &quot;&quot;
 "Digite seu endereço de email abaixo (o utilizado para acessar a plataforma) "
 "para recuperar sua senha"
-#: users/templates/users/forgot_password.html:72
+#: .\templates\users\forgot_password.html:72
 msgid "Recover"
 msgstr "Recuperar"
-#: users/templates/users/forgot_password.html:75
-#: users/templates/users/new_password.html:80
-#: users/templates/users/register.html:91
+#: .\templates\users\forgot_password.html:75
+#: .\templates\users\new_password.html:80 .\templates\users\register.html:91
 msgid "Back"
 msgstr "Voltar"
-#: users/templates/users/list.html:30 users/templates/users/search.html:21
+#: .\templates\users\list.html:30 .\templates\users\search.html:21
 msgid "Search..."
 msgstr "Pesquisar..."
-#: users/templates/users/list.html:41 users/templates/users/search.html:32
+#: .\templates\users\list.html:41 .\templates\users\search.html:32
 msgid "Create User"
 msgstr "Criar Usuário"
-#: users/templates/users/list.html:59 users/templates/users/profile.html:63
-#: users/templates/users/search.html:50
+#: .\templates\users\list.html:59 .\templates\users\profile.html:63
+#: .\templates\users\search.html:50
 msgid "Not Informed"
 msgstr "Não Informado"
-#: users/templates/users/list.html:65 users/templates/users/search.html:56
+#: .\templates\users\list.html:65 .\templates\users\search.html:56
 msgid "Edit"
 msgstr "Editar"
-#: users/templates/users/list.html:66 users/templates/users/search.html:57
+#: .\templates\users\list.html:66 .\templates\users\search.html:57
 msgid "Delete"
 msgstr "Deletar"
-#: users/templates/users/list.html:76 users/templates/users/search.html:67
+#: .\templates\users\list.html:76 .\templates\users\search.html:67
 msgid "No users found"
 msgstr "Nenhum usuário encontrado"
-#: users/templates/users/login.html:39
+#: .\templates\users\login.html:39
 msgid "Sign in with your account to continue"
 msgstr "Entre com a sua conta para continuar"
-#: users/templates/users/login.html:63 users/templates/users/login.html:70
+#: .\templates\users\login.html:63 .\templates\users\login.html:70
 msgid "Log in"
 msgstr "Entrar"
-#: users/templates/users/login.html:66 users/views.py:354
+#: .\templates\users\login.html:66 .\views.py:354
 msgid "Sign Up"
 msgstr "Cadastrar"
-#: users/templates/users/login.html:81 users/templates/users/login.html:117
+#: .\templates\users\login.html:81 .\templates\users\login.html:117
 msgid "Forgot your password?"
 msgstr "Esqueceu sua senha?"
-#: users/templates/users/new_password.html:39
+#: .\templates\users\new_password.html:39
 msgid "Set new password"
 msgstr "Digite a nova senha"
-#: users/templates/users/new_password.html:77
+#: .\templates\users\new_password.html:77
 msgid "Reset"
 msgstr "Restaurar"
-#: users/templates/users/profile.html:40
+#: .\templates\users\profile.html:40
 msgid "System Admin"
 msgstr "Administrador do sistema"
-#: users/templates/users/profile.html:44
+#: .\templates\users\profile.html:44
 msgid "Coordinator in"
 msgstr "Coordenador em"
-#: users/templates/users/profile.html:48
+#: .\templates\users\profile.html:48
 msgid "Professor in"
 msgstr "Professor em"
-#: users/templates/users/profile.html:52
+#: .\templates\users\profile.html:52
 msgid "Student in"
 msgstr "Estudante em"
-#: users/templates/users/register.html:39
+#: .\templates\users\register.html:39
 msgid "User Register"
 msgstr "Cadastro de Usuário"
-#: users/templates/users/register.html:88
+#: .\templates\users\register.html:88
 msgid "Register"
 msgstr "Cadastrar"
-#: users/templatetags/profile_verifies.py:16
+#: .\templatetags\profile_verifies.py:16
 msgid "Is not a coordinator"
 msgstr "Não é coordenador"
-#: users/templatetags/profile_verifies.py:25
+#: .\templatetags\profile_verifies.py:25
 msgid "Is not a professor"
 msgstr "Não é professor"
-#: users/templatetags/profile_verifies.py:34
+#: .\templatetags\profile_verifies.py:34
 msgid "Is not a student"
 msgstr "Não é estudante"
-#: users/views.py:55
+#: .\views.py:55
 msgid "Manage Users"
 msgstr "Gerenciar Usuários"
-#: users/views.py:85
+#: .\views.py:85
 msgid "Search Users"
 msgstr "Pesquisar Usuário"
-#: users/views.py:108
+#: .\views.py:108
 #, python-format
-msgid "User %s created successfully"
-msgstr "Usuário %s criado com sucesso"
+msgid "User \"%s\" created successfully"
+msgstr "Usuário \"%s\" criado com sucesso"
-#: users/views.py:122
+#: .\views.py:122
 msgid "Add User"
 msgstr "Cadastrar Usuário"
-#: users/views.py:156
+#: .\views.py:156
 #, python-format
-msgid "User %s updated successfully"
-msgstr "Usuário %s atualizado com sucesso"
+msgid "User \"%s\" updated successfully"
+msgstr "Usuário \"%s\" atualizado com sucesso"
-#: users/views.py:170
+#: .\views.py:170
 msgid "Update User"
 msgstr "Atualizar Usuário"
-#: users/views.py:225
+#: .\views.py:225
 msgid "User removed successfully!"
 msgstr "Usuário removido com sucesso!"
-#: users/views.py:226
+#: .\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 +330,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:249
+#: .\views.py:249
 msgid "Delete Account"
 msgstr "Remover Conta"
-#: users/views.py:292
+#: .\views.py:292
 msgid "Password changed successfully!"
 msgstr "Senha alterada com sucesso!"
-#: users/views.py:298
+#: .\views.py:298
 msgid "Change Password"
 msgstr "Alterar Senha"
-#: users/views.py:316
+#: .\views.py:316
 msgid "Profile"
 msgstr "Perfil"
-#: users/views.py:335
+#: .\views.py:335
 msgid "Update Profile"
 msgstr "Atualizar Perfil"
-#: users/views.py:341
+#: .\views.py:341
 msgid "Profile edited successfully!"
 msgstr "Perfil editado com sucesso!"
-#: users/views.py:361
+#: .\views.py:361
 msgid "User successfully registered!"
 msgstr "Usuário cadastrado com sucesso!"
-#: users/views.py:399
+#: .\views.py:399
 msgid "Recover Password"
 msgstr "Recuperar Senha"
-#: users/views.py:435
+#: .\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 +370,38 @@ 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:438
+#: .\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:451
+#: .\views.py:451
 msgid "Reset Password"
 msgstr "Recuperar Senha"
-#: users/views.py:473
+#: .\views.py:473
 msgid "Password reset successfully."
 msgstr "Senha alterada com sucesso!"
-#: users/views.py:477
+#: .\views.py:477
 msgid "We were not able to reset your password."
 msgstr "Não foi possível restaurar sua senha"
-#: users/views.py:480
+#: .\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:486
+#: .\views.py:486
 msgid "Log In"
 msgstr "Entrar"
-#: users/views.py:507
+#: .\views.py:507
 msgid "System under maintenance. Try again later"
 msgstr "Sistema em manutenção. Tente novamente mais tarde"
-#: users/views.py:509
+#: .\views.py:509
 msgid "E-mail or password are incorrect."
 msgstr "Email ou senha incorretos."
+
+#, fuzzy
+#~ msgid "User {name} created successfully"
+#~ msgstr "Usuário {name} criado com sucesso"
@@ -105,7 +105,7 @@ class CreateView(braces_mixins.LoginRequiredMixin, braces_mixins.StaffuserRequir
 	def form_valid(self, form):
 		self.object = form.save()
-		msg = _("User %s created successfully" % self.object.get_short_name())
+		msg = _('User "%s" created successfully')%(self.object.get_short_name() )
 		self.log_context['user_id'] = self.object.id
 		self.log_context['user_name'] = self.object.get_short_name()
@@ -153,7 +153,7 @@ class UpdateView(braces_mixins.LoginRequiredMixin, braces_mixins.StaffuserRequir
 		self.object.save()
-		msg = _("User %s updated successfully" % self.object.get_short_name())
+		msg = _('User "%s" updated successfully')%(self.object.get_short_name())
 		self.log_context['user_id'] = self.object.id
 		self.log_context['user_name'] = self.object.get_short_name()
	@@ -3,6 +3,7 @@ from datetime import datetime		@@ -3,6 +3,7 @@ from datetime import datetime
3	from themes.models import Themes	3	from themes.models import Themes
4	from notifications.models import Notification	4	from notifications.models import Notification
5	from mural.models import MuralVisualizations	5	from mural.models import MuralVisualizations
		6	+from chat.models import ChatVisualizations
6		7
7	def theme(request):	8	def theme(request):
8	context = {}	9	context = {}
	@@ -35,4 +36,16 @@ def mural_notifies(request):		@@ -35,4 +36,16 @@ def mural_notifies(request):
35		36
36	context['mural_notifications_count'] = notifications	37	context['mural_notifications_count'] = notifications
37		38
		39	+ return context
		40	+
		41	+def chat_notifies(request):
		42	+ context = {}
		43	+
		44	+ notifications = 0
		45	+
		46	+ if request.user.is_authenticated:
		47	+ notifications = ChatVisualizations.objects.filter(viewed = False, user = request.user).count()
		48	+
		49	+ context['chat_notifications_count'] = notifications
		50	+
38	return context	51	return context
39	\ No newline at end of file	52	\ No newline at end of file
	@@ -1468,6 +1468,7 @@ div.dataTables_wrapper div.dataTables_paginate {		@@ -1468,6 +1468,7 @@ div.dataTables_wrapper div.dataTables_paginate {
1468	#msg_editable {	1468	#msg_editable {
1469	width: 100%;	1469	width: 100%;
1470	z-index: 1;	1470	z-index: 1;
		1471	+ min-height: 20px;
1471	}	1472	}
1472		1473
1473	.action-button {	1474	.action-button {
	@@ -239,6 +239,46 @@ function messageReceived(content) {		@@ -239,6 +239,46 @@ function messageReceived(content) {
239		239
240	$(this).hide();	240	$(this).hide();
241	});	241	});
		242	+ } else {
		243	+ var talk_line = $("#talk-" + content.container),
		244	+ talk_notifies = talk_line.find('.chat_notify'),
		245	+ actual_count = talk_notifies.text(),
		246	+ actual_date = talk_line.find(".talk-last_msg");
		247	+
		248	+ actual_count = parseInt(actual_count, 10) + 1;
		249	+
		250	+ talk_notifies.text(actual_count);
		251	+
		252	+ actual_date.html(content.last_date);
		253	+
		254	+ $('.chat_badge').each(function () {
		255	+ var actual = $(this).text();
		256	+
		257	+ if (actual != "+99") {
		258	+ actual = parseInt(actual, 10) + 1;
		259	+
		260	+ if (actual > 99) {
		261	+ actual = "+99";
		262	+ }
		263	+
		264	+ $(this).text(actual);
		265	+ }
		266	+
		267	+ $(this).show();
		268	+ });
		269	+
		270	+ $('.chat-tabs').find('li').each(function () {
		271	+ var identity = $(this).data('chat');
		272	+
		273	+ if (identity == content.subtype) {
		274	+ var span = $(this).find('span'),
		275	+ actual = span.text();
		276	+
		277	+ actual = parseInt(actual, 10) + 1;
		278	+
		279	+ span.text(actual);
		280	+ }
		281	+ });
242	}	282	}
243		283
244	if (("Notification" in window)) {	284	if (("Notification" in window)) {
	@@ -4,12 +4,12 @@		@@ -4,12 +4,12 @@
4		4
5	{% is_online talking_to as status %}	5	{% is_online talking_to as status %}
6		6
7	-<div class="col-md-12 participant panel">	7	+<div id="talk-chat-{{ talking_to.id }}" class="col-md-12 participant panel">
8	<div class="col-md-1 user-img">	8	<div class="col-md-1 user-img">
9	<img src="{{ talking_to.image_url }}" class="img-responsive" />	9	<img src="{{ talking_to.image_url }}" class="img-responsive" />
10	</div>	10	</div>
11	<div class="col-md-6 user-info">	11	<div class="col-md-6 user-info">
12	- <h4 class='talking-header'><a class="status {{ status }}" data-toggle="tooltip" title="{{ status\|status_text }}"></a> {{ talking_to }}</h4>	12	+ <h4 class='talking-header'><a class="status {{ status }}" data-toggle="tooltip" title="{{ status\|status_text }}"></a> {{ talking_to }} (<span class="chat_notify">{{ chat\|notifies:request.user }}</span>)</h4>
13	<p class="talk-last_msg">{% trans 'Last message in' %} {{ chat\|last_message }}</p>	13	<p class="talk-last_msg">{% trans 'Last message in' %} {{ chat\|last_message }}</p>
14	</div>	14	</div>
15	<div class="col-md-4 buttons pull-right text-center">	15	<div class="col-md-4 buttons pull-right text-center">
@@ -0,0 +1,30 @@		@@ -0,0 +1,30 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10.4 on 2017-03-21 00:55
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.conf import settings
	6	+from django.db import migrations, models
	7	+import django.db.models.deletion
	8	+
	9	+
	10	+class Migration(migrations.Migration):
	11	+
	12	+ dependencies = [
	13	+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
	14	+ ('reports', '0001_initial'),
	15	+ ]
	16	+
	17	+ operations = [
	18	+ migrations.CreateModel(
	19	+ name='ReportXLS',
	20	+ fields=[
	21	+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
	22	+ ('xls_data', models.TextField()),
	23	+ ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
	24	+ ],
	25	+ options={
	26	+ 'verbose_name': 'ReportCSV',
	27	+ 'verbose_name_plural': 'ReportCSVs',
	28	+ },
	29	+ ),
	30	+ ]
	@@ -12,4 +12,17 @@ class ReportCSV(models.Model):		@@ -12,4 +12,17 @@ class ReportCSV(models.Model):
12		12
13	def __str__(self):	13	def __str__(self):
14	pass	14	pass
		15	+
		16	+
		17	+class ReportXLS(models.Model):
		18	+
		19	+ user = models.ForeignKey(User)
		20	+ xls_data = models.TextField()
		21	+
		22	+ class Meta:
		23	+ verbose_name = "ReportCSV"
		24	+ verbose_name_plural = "ReportCSVs"
		25	+
		26	+ def __str__(self):
		27	+ pass
15		28
16	\ No newline at end of file	29	\ No newline at end of file
	@@ -65,7 +65,7 @@		@@ -65,7 +65,7 @@
65	<ul id="report-info">	65	<ul id="report-info">
66	<li> {{data.values\|length}} {% trans "register(s)" %} </li>	66	<li> {{data.values\|length}} {% trans "register(s)" %} </li>
67	<li>	67	<li>
68	- <a href="{% url 'subjects:reports:download_report' %}?{{csv_data}}"><i class="fa fa-download" aria-hidden="true"></i> {% trans "Interactions Data" %}</a>	68	+ <a href="{% url 'subjects:reports:download_report_csv' %}"><i class="fa fa-download" aria-hidden="true"></i> {% trans "Interactions Data" %}</a>
69		69
70		70
71	</li>	71	</li>
	@@ -7,5 +7,5 @@ urlpatterns = [		@@ -7,5 +7,5 @@ urlpatterns = [
7	url(r'^view/interactions/$', views.ViewReportView.as_view(), name='view_report'),	7	url(r'^view/interactions/$', views.ViewReportView.as_view(), name='view_report'),
8	url(r'^get/resources/$', views.get_resources, name='get_resource_and_tags'),	8	url(r'^get/resources/$', views.get_resources, name='get_resource_and_tags'),
9	url(r'^get/tags/$', views.get_tags, name='get_tags'),	9	url(r'^get/tags/$', views.get_tags, name='get_tags'),
10	- url(r'^post/download_report/$', views.download_report, name="download_report"),	10	+ url(r'^post/download_report/$', views.download_report_csv, name="download_report_csv"),
11	]	11	]
12	\ No newline at end of file	12	\ No newline at end of file
	@@ -105,7 +105,7 @@ class CreateView(braces_mixins.LoginRequiredMixin, braces_mixins.StaffuserRequir		@@ -105,7 +105,7 @@ class CreateView(braces_mixins.LoginRequiredMixin, braces_mixins.StaffuserRequir
105	def form_valid(self, form):	105	def form_valid(self, form):
106	self.object = form.save()	106	self.object = form.save()
107		107
108	- msg = _("User %s created successfully" % self.object.get_short_name())	108	+ msg = _('User "%s" created successfully')%(self.object.get_short_name() )
109		109
110	self.log_context['user_id'] = self.object.id	110	self.log_context['user_id'] = self.object.id
111	self.log_context['user_name'] = self.object.get_short_name()	111	self.log_context['user_name'] = self.object.get_short_name()
	@@ -153,7 +153,7 @@ class UpdateView(braces_mixins.LoginRequiredMixin, braces_mixins.StaffuserRequir		@@ -153,7 +153,7 @@ class UpdateView(braces_mixins.LoginRequiredMixin, braces_mixins.StaffuserRequir
153		153
154	self.object.save()	154	self.object.save()
155		155
156	- msg = _("User %s updated successfully" % self.object.get_short_name())	156	+ msg = _('User "%s" updated successfully')%(self.object.get_short_name())
157		157
158	self.log_context['user_id'] = self.object.id	158	self.log_context['user_id'] = self.object.id
159	self.log_context['user_name'] = self.object.get_short_name()	159	self.log_context['user_name'] = self.object.get_short_name()