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

Jailson Dias
2 parents 1ac276d0 78889761
Showing 45 changed files with 714 additions and 167 deletions Show diff stats
amadeus/locale/pt_BR/LC_MESSAGES/django.po
amadeus/settings.py
amadeus/static/js/crop_news.js
amadeus/templates/base.html
categories/locale/pt_BR/LC_MESSAGES/django.po
chat/locale/pt_BR/LC_MESSAGES/django.po
chat/migrations/0004_merge_20170413_2034.py
file_link/locale/pt_BR/LC_MESSAGES/django.po
goals/forms.py
goals/locale/pt_BR/LC_MESSAGES/django.po
goals/templates/goals/_form.html
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
news/forms.py
news/locale/pt_BR/LC_MESSAGES/django.po
news/migrations/0002_auto_20170413_2034.py
news/templates/news/_form.html
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-11 19:17-0300\n"
+"POT-Creation-Date: 2017-04-15 00:12-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"
@@ -26,95 +26,95 @@ msgstr &quot;&quot;
 msgid "English"
 msgstr ""
  
-#: amadeus/templates/base.html:93
+#: amadeus/templates/base.html:96
 msgid "Search for subjects and resources"
 msgstr "Buscar por assuntos ou recursos"
  
-#: amadeus/templates/base.html:106 amadeus/templates/base.html:111
+#: amadeus/templates/base.html:109 amadeus/templates/base.html:114
 msgid "Language Selector"
 msgstr ""
  
-#: amadeus/templates/base.html:152
+#: amadeus/templates/base.html:155
 msgid "Profile"
 msgstr "Perfil"
  
-#: amadeus/templates/base.html:153
+#: amadeus/templates/base.html:156
 msgid "Edit Profile"
 msgstr "Editar Perfil"
  
-#: amadeus/templates/base.html:154
+#: amadeus/templates/base.html:157
 msgid "Change Password"
 msgstr "Alterar Senha"
  
-#: amadeus/templates/base.html:155
+#: amadeus/templates/base.html:158
 msgid "Delete Account"
 msgstr "Remover Conta"
  
-#: amadeus/templates/base.html:156
+#: amadeus/templates/base.html:159
 msgid "Logout"
 msgstr "Sair"
  
-#: amadeus/templates/base.html:161
+#: amadeus/templates/base.html:164
 msgid "settings"
 msgstr "configurações"
  
-#: amadeus/templates/base.html:164
+#: amadeus/templates/base.html:167
 msgid "Settings"
 msgstr "Configurações"
  
-#: amadeus/templates/base.html:167
+#: amadeus/templates/base.html:170
 msgid "Manage Users"
 msgstr "Gerenciar Usuários"
  
-#: amadeus/templates/base.html:168
+#: amadeus/templates/base.html:171
 msgid "Manage Categories"
 msgstr "Gerenciar Categorias"
  
-#: amadeus/templates/base.html:169
+#: amadeus/templates/base.html:172
 msgid "Manage News"
 msgstr "Gerenciar Notícias"
  
-#: amadeus/templates/base.html:176
+#: amadeus/templates/base.html:179
 msgid "System"
 msgstr "Sistema"
  
-#: amadeus/templates/base.html:183
+#: amadeus/templates/base.html:186
 msgid "Mail Sender"
 msgstr "Remetente de Email"
  
-#: amadeus/templates/base.html:184
+#: amadeus/templates/base.html:187
 msgid "Security"
 msgstr "Segurança"
  
-#: amadeus/templates/base.html:185
+#: amadeus/templates/base.html:188
 msgid "Theme"
 msgstr "Temas"
  
-#: amadeus/templates/base.html:186
+#: amadeus/templates/base.html:189
 #, fuzzy
 #| msgid "Web Conference Settings"
 msgid "Web Conference"
 msgstr "Web conferência"
  
-#: amadeus/templates/base.html:206 amadeus/templates/base.html:261
+#: amadeus/templates/base.html:209 amadeus/templates/base.html:264
 msgid "Subjects"
 msgstr "Assuntos"
  
-#: amadeus/templates/base.html:211 amadeus/templates/base.html:266
+#: amadeus/templates/base.html:214 amadeus/templates/base.html:269
 msgid "Mural"
 msgstr ""
  
-#: amadeus/templates/base.html:217 amadeus/templates/base.html:272
+#: amadeus/templates/base.html:220 amadeus/templates/base.html:275
 msgid "Messages"
 msgstr "Mensagens"
  
-#: amadeus/templates/base.html:223 amadeus/templates/base.html:278
+#: amadeus/templates/base.html:226 amadeus/templates/base.html:281
 #, fuzzy
 #| msgid "Pendencias"
 msgid "Pendencies"
 msgstr "Pendências"
  
-#: amadeus/templates/base.html:231 amadeus/templates/base.html:286
+#: amadeus/templates/base.html:234 amadeus/templates/base.html:289
 msgid "Analytics"
 msgstr "Analytics"
  
@@ -209,8 +209,8 @@ CRON_CLASSES = [
 ]
  
 CRONJOBS = [
-    ('1 */12 * * *', 'notifications.cron.notification_cron'),
-    ('1 */12 * * *', 'goals.cron.setgoals_cron')
+    ('0 0 * * *', 'notifications.cron.notification_cron'),
+    ('0 0 * * *', 'goals.cron.setgoals_cron')
 ]
  
 CHANNEL_LAYERS = {
@@ -0,0 +1,66 @@
+$(function () {
+
+  /* Script para abrir o modal com a imagem selecionada */
+  $("#id_image").change(function () {
+    if (this.files && this.files[0]) {
+      var reader = new FileReader();
+      reader.onload = function (e) {
+        $("#image").attr("src", e.target.result);
+        $("#modalCrop").modal("show");
+      }
+      reader.readAsDataURL(this.files[0]);
+    }
+  });
+
+  /* Scripts da caixa de corte da imagem */
+  var $image = $("#image");
+  var cropBoxData;
+  var canvasData;
+  $("#modalCrop").on("shown.bs.modal", function () {
+    $image.cropper({
+      viewMode: 1,
+      aspectRatio: 1/1,
+      minCropBoxWidth: 700,
+      minCropBoxHeight: 200,
+      ready: function () {
+        $image.cropper("setCanvasData", canvasData);
+        $image.cropper("setCropBoxData", cropBoxData);
+      }
+    });
+  }).on("hidden.bs.modal", function () {
+    cropBoxData = $image.cropper("getCropBoxData");
+    canvasData = $image.cropper("getCanvasData");
+    $image.cropper("destroy");
+  });
+
+  $(".js-zoom-in").click(function () {
+    $image.cropper("zoom", 0.1);
+  });
+
+  $(".js-zoom-out").click(function () {
+    $image.cropper("zoom", -0.1);
+  });
+
+  /* Script para pegar os valores das dimensões e depois fechar o modal */
+  $(".js-crop-and-upload").click(function () {
+    var cropData = $image.cropper("getData");
+    $("#id_x").val(cropData["x"]);
+    $("#id_y").val(cropData["y"]);
+    $("#id_height").val(cropData["height"]);
+    $("#id_width").val(cropData["width"]);
+    $("#modalCrop").modal('hide');
+  });
+
+  /* Script para remover o arquivo enviado caso o usuário clique em cancelar*/
+  $("#id_image").on('change', function(){
+     console.log(this.value);
+  });
+
+  $('#crop_cancel').on('click', function(e){
+      var input = $("#id_image");
+      var holder = $("#pic_holder");
+     input.replaceWith(input.val('').clone(true));
+     holder.replaceWith(holder.val('').clone(true));
+  });
+
+});
@@ -32,6 +32,7 @@
  
  		<script src="{% static 'js/cropper.min.js' %}"></script> <!-- Js for cropper-->
 		<script src="{% static 'js/crop.js' %}"></script> <!-- Js for cropper-->
+		<script src="{% static 'js/crop_news.js' %}"></script>
 		<link href="{% static 'css/cropper.min.css' %}" rel="stylesheet"> <!-- CSS for cropper-->
  
 		<script type="text/javascript" src="{% static 'js/printThis.js' %}"></script> <!-- Print this plugin js-->
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-11 19:18-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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-04-11 19:17-0300\n"
+"POT-Creation-Date: 2017-04-15 00:12-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-04-13 23:34
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('chat', '0003_auto_20170407_2251'),
+        ('chat', '0003_auto_20170407_2154'),
+    ]
+
+    operations = [
+    ]
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-11 19:18-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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"
@@ -2,8 +2,9 @@
 from django import forms
 from datetime import datetime
 from django.conf import settings
+from django.utils.html import strip_tags
 from django.utils.translation import ugettext_lazy as _
-from django.forms.models import inlineformset_factory
+from django.forms.models import inlineformset_factory, BaseInlineFormSet
  
 from subjects.models import Tag
  
@@ -48,6 +49,9 @@ class GoalsForm(forms.ModelForm):
  
 		limit_submission_date = cleaned_data.get('limit_submission_date', None)
  
+		presentation = cleaned_data.get('presentation', '')
+		cleaned_presentation = strip_tags(presentation)
+		
 		if self.topic:
 			if self.instance.id:
 				exist = self.topic.resource_topic.filter(goals__isnull = False).exclude(id = self.instance.id).exists()
@@ -57,6 +61,9 @@ class GoalsForm(forms.ModelForm):
 			if exist:
 				self.add_error('name', _('There already is another resource with the goals specification for the Topic %s')%(str(self.topic)))
  
+		if cleaned_presentation == '':
+			self.add_error('presentation', _('This field is required.'))
+
 		if limit_submission_date:
 			if not limit_submission_date == ValueError:
 				if not self.instance.id and limit_submission_date.date() < datetime.today().date():
@@ -67,6 +74,8 @@ class GoalsForm(forms.ModelForm):
  
 				if limit_submission_date.date() > self.subject.end_date:
 					self.add_error('limit_submission_date', _('This input should be filled with a date equal or after the subject end date.'))
+		else:
+			self.add_error('limit_submission_date', _('This field is required'))
  
 		return cleaned_data
  
@@ -116,6 +125,18 @@ class GoalItemForm(forms.ModelForm):
  
 		return cleaned_data
  
+class GoalItemFormset(BaseInlineFormSet):
+    def __init__(self, *args, **kwargs):
+        super(GoalItemFormset, self).__init__(*args, **kwargs)
+        
+        self.forms[0].empty_permitted = False
+
+    def clean(self):
+    	description = self.forms[0].cleaned_data.get('description', None)
+
+    	if not description:
+    		raise forms.ValidationError(_('It\'s necessary to enter at least one goal specification.'))
+
 class MyGoalsForm(forms.ModelForm):
 	def __init__(self, *args, **kwargs):
 		super(MyGoalsForm, self).__init__(*args, **kwargs)
@@ -127,4 +148,4 @@ class MyGoalsForm(forms.ModelForm):
 		fields = ['value', 'item']
  
 InlinePendenciesFormset = inlineformset_factory(Goals, Pendencies, form = PendenciesLimitedForm, extra = 1, max_num = 3, validate_max = True, can_delete = True)
-InlineGoalItemFormset = inlineformset_factory(Goals, GoalItem, form = GoalItemForm, extra = 1, can_delete = True)
 \ No newline at end of file
+InlineGoalItemFormset = inlineformset_factory(Goals, GoalItem, form = GoalItemForm, min_num = 1, validate_min = True, extra = 0, can_delete = True, formset = GoalItemFormset)
 \ No newline at end of file
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-11 19:17-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,15 +18,15 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
  
-#: goals/forms.py:33
+#: goals/forms.py:34
 msgid "Tags"
 msgstr "Tags"
  
-#: goals/forms.py:39
+#: goals/forms.py:40
 msgid "Name"
 msgstr "Nome"
  
-#: goals/forms.py:58
+#: goals/forms.py:62
 #, python-format
 msgid ""
 "There already is another resource with the goals specification for the Topic "
@@ -34,12 +34,16 @@ msgid &quot;&quot;
 msgstr ""
 "Já existe um outro recurso com a especificação de metas para o tópico %s"
  
-#: goals/forms.py:63
+#: goals/forms.py:65 goals/forms.py:124
+msgid "This field is required."
+msgstr "Esse campo é obrigatório."
+
+#: goals/forms.py:70
 msgid "This input should be filled with a date equal or after today's date."
 msgstr ""
 "Esse campo deve ser preenchido com uma data igual ou posterior à data atual."
  
-#: goals/forms.py:66
+#: goals/forms.py:73
 msgid ""
 "This input should be filled with a date equal or after the subject begin "
 "date."
@@ -47,17 +51,23 @@ msgstr &quot;&quot;
 "Esse campo deve ser preenchido com uma data igual ou posterior à data de "
 "início do assunto."
  
-#: goals/forms.py:69
+#: goals/forms.py:76
 msgid ""
 "This input should be filled with a date equal or after the subject end date."
 msgstr ""
 "Esse campo deve ser preenchido com uma data igual ou posterior à data final "
 "do assunto."
  
-#: goals/forms.py:115
-msgid "This field is required."
+#: goals/forms.py:78
+#, fuzzy
+#| msgid "This field is required."
+msgid "This field is required"
 msgstr "Esse campo é obrigatório."
  
+#: goals/forms.py:138
+msgid "It's necessary to enter at least one goal specification."
+msgstr "Você deve cadastrar ao menos uma especificação de meta."
+
 #: goals/models.py:10
 msgid "Presentation"
 msgstr "Apresentação"
@@ -134,46 +144,46 @@ msgstr &quot;Data de atualização&quot;
 msgid "Goals Specification"
 msgstr "Especificação de Metas"
  
-#: goals/templates/goals/_form.html:101
+#: goals/templates/goals/_form.html:109
 #: goals/templates/goals/_form_submit.html:22
 #: goals/templates/goals/view.html:74
 msgid "Minimum percentage desired"
 msgstr "Porcentagem mínima desejada"
  
-#: goals/templates/goals/_form.html:156
+#: goals/templates/goals/_form.html:164
 msgid "Common resources settings"
 msgstr "Configurações comuns a todos os recursos"
  
-#: goals/templates/goals/_form.html:204
+#: goals/templates/goals/_form.html:212
 msgid "Pendencies Notifications"
 msgstr "Notificações de Pendências"
  
-#: goals/templates/goals/_form.html:226
+#: goals/templates/goals/_form.html:240
 msgid "Action not performed by the user"
 msgstr "Ação não realizada pelo usuário"
  
-#: goals/templates/goals/_form.html:252
+#: goals/templates/goals/_form.html:266
 msgid "Wished period"
 msgstr "Período desejado"
  
-#: goals/templates/goals/_form.html:388
+#: goals/templates/goals/_form.html:402
 #: goals/templates/goals/_form_submit.html:54
 msgid "Save"
 msgstr "Salvar"
  
-#: goals/templates/goals/_form.html:399
+#: goals/templates/goals/_form.html:413
 msgid "Add new goal"
 msgstr "Adicionar nova meta"
  
-#: goals/templates/goals/_form.html:400
+#: goals/templates/goals/_form.html:414
 msgid "Remove this goal"
 msgstr "Remover essa meta"
  
-#: goals/templates/goals/_form.html:420
+#: goals/templates/goals/_form.html:434
 msgid "Add new notification"
 msgstr "Adicionar nova notificação"
  
-#: goals/templates/goals/_form.html:421
+#: goals/templates/goals/_form.html:435
 msgid "Remove this"
 msgstr "Remover essa notificação"
  
@@ -344,35 +354,35 @@ msgstr &quot;Suas metas para %s foram salvas com sucesso!&quot;
 msgid "Your goals for %s was update successfully!"
 msgstr "Suas metas para %s foram atualizadas com sucesso!"
  
-#: goals/views.py:636 goals/views.py:650 goals/views.py:671 goals/views.py:790
-#: goals/views.py:804 goals/views.py:814
+#: goals/views.py:636 goals/views.py:650 goals/views.py:675 goals/views.py:794
+#: goals/views.py:808 goals/views.py:818
 msgid "Visualize"
 msgstr "Visualizar"
  
-#: goals/views.py:636 goals/views.py:650 goals/views.py:671 goals/views.py:790
-#: goals/views.py:804 goals/views.py:814
+#: goals/views.py:636 goals/views.py:650 goals/views.py:675 goals/views.py:794
+#: goals/views.py:808 goals/views.py:818
 msgid "Submit"
 msgstr "Submeter"
  
-#: goals/views.py:734
+#: goals/views.py:738
 msgid "Create Topic Goals"
 msgstr "Adicionar Metas do Tópico"
  
-#: goals/views.py:745
+#: goals/views.py:749
 #, 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:869
+#: goals/views.py:873
 msgid "Update Topic Goals"
 msgstr "Atualizar Metas do Tópico"
  
-#: goals/views.py:880
+#: goals/views.py:884
 #, 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:916
+#: goals/views.py:920
 #, python-format
 msgid "The Goals specification of the topic %s was removed successfully!"
 msgstr "A Especificação de Metas para o tópico %s foi removida com sucesso!"
@@ -61,7 +61,15 @@
             </div>
             <div id="goal_items" class="panel-collapse collapse">
             	{{ goalitems_form.management_form }}
-                {{ goalitems_form.non_form_errors }}
+
+            	{% if goalitems_form.non_form_errors %}
+            		<div class="alert alert-danger alert-dismissible" role="alert">
+						<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+							<span aria-hidden="true">&times;</span>
+						</button>
+            			{{ goalitems_form.non_form_errors }}
+                	</div>	
+                {% endif %}
  
 				{% for item in goalitems_form %}
 	        		<div class="goalitems">
@@ -209,12 +217,18 @@
             </div>
             <div id="notifications" class="panel-collapse collapse">
             	{{ pendencies_form.management_form }}
-                {{ pendencies_form.non_form_errors }}
+                {% if pendencies_form.non_form_errors %}
+            		<div class="alert alert-danger alert-dismissible" role="alert">
+						<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+							<span aria-hidden="true">&times;</span>
+						</button>
+            			{{ pendencies_form.non_form_errors }}
+                	</div>	
+                {% endif %}
  
 				{% for notify in pendencies_form %}
 	        		<div class="notifies">
 	        			<div style="text-align:left">
-	        				{{ notify.errors }}
 	            			{% render_field notify.id %}
 	            			{% render_field notify.resource %}
 	            			{% render_field notify.subject class='pend_subj' %}
@@ -667,7 +667,11 @@ class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
 		return initial
  
 	def form_invalid(self, form, pendencies_form, goalitems_form):
+		slug = self.kwargs.get('slug', '')
+		topic = get_object_or_404(Topic, slug = slug)
+
 		for p_form in pendencies_form.forms:
+			print(p_form.initial['subject'])
 			p_form.fields['action'].choices = [("", "-------"),("view", _("Visualize")), ("submit", _("Submit"))]
  
 		return self.render_to_response(self.get_context_data(form = form, pendencies_form = pendencies_form, goalitems_form = goalitems_form))
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-11 19:17-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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-04-11 19:18-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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-04-11 19:17-0300\n"
+"POT-Creation-Date: 2017-04-15 00:12-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-04-11 19:17-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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"
@@ -3,10 +3,50 @@ from django.utils.translation import ugettext_lazy as _
  
 from .models import News
 from resubmit.widgets import ResubmitFileWidget
-
+from os.path import join
+from PIL import Image
+import os
+from amadeus import settings
  
 class NewsForm(forms.ModelForm):
     MAX_UPLOAD_SIZE = 5*1024*1024
+
+	#Cropping image
+    x = forms.FloatField(widget=forms.HiddenInput(),required=False)
+    y = forms.FloatField(widget=forms.HiddenInput(),required=False)
+    width = forms.FloatField(widget=forms.HiddenInput(),required=False)
+    height = forms.FloatField(widget=forms.HiddenInput(),required=False)
+
+    def save(self, commit=True):
+        super(NewsForm, self).save(commit=False)
+        self.deletepath = ""
+
+        x = self.cleaned_data.get('x')
+        y = self.cleaned_data.get('y')
+        w = self.cleaned_data.get('width')
+        h = self.cleaned_data.get('height')
+
+        if self.instance.image :
+	        image = Image.open(self.instance.image)
+	        if not x is None:
+		        cropped_image = image.crop((x, y, w+x, h+y))
+		        resized_image = cropped_image.resize((700, 200), Image.ANTIALIAS)
+
+		        folder_path = join(settings.MEDIA_ROOT, 'news')
+		        #check if the folder already exists
+		        if not os.path.isdir(folder_path):
+		            os.makedirs(folder_path)
+
+		        if ("news" not in self.instance.image.path):
+		            self.deletepath = self.instance.image.path
+
+		        resized_image.save(self.instance.image.path)
+
+        self.instance.save()
+        if (self.deletepath):
+	        os.remove(self.deletepath)
+        return self.instance
+
     class Meta:
         model = News
         fields = ['title','image','content']
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-11 19:18-0300\n"
+"POT-Creation-Date: 2017-04-17 12:04-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,104 +18,131 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
  
-#: news/forms.py:22
+#: .\forms.py:62
 msgid "This field is required"
 msgstr "Este campo é obrigatório."
  
-#: news/forms.py:33
+#: .\forms.py:73
 msgid "The image is too large. It should have less than 5MB."
 msgstr "A imagem é muito grande. Ela deve ter menos que 5MB."
  
-#: news/forms.py:36
+#: .\forms.py:76
 msgid "This field is required."
 msgstr "Este campo é obrigatório."
  
-#: news/models.py:15
+#: .\models.py:15
 msgid "File not supported."
 msgstr "Arquivo não suportado"
  
-#: news/models.py:18
+#: .\models.py:18
 msgid "Title"
 msgstr "Título"
  
-#: news/models.py:19
+#: .\models.py:19
 msgid "Slug"
 msgstr ""
  
-#: news/models.py:20
+#: .\models.py:20
 msgid "News Image"
 msgstr "Imagem de apresentação da notícia"
  
-#: news/models.py:21
+#: .\models.py:21
 msgid "News Content"
 msgstr "Conteúdo da notícia"
  
-#: news/models.py:22
+#: .\models.py:22
 msgid "Create Date"
 msgstr "Data de criação"
  
-#: news/models.py:23
+#: .\models.py:23
 msgid "Creator"
 msgstr "Autor"
  
-#: news/models.py:25 news/models.py:26
+#: .\models.py:25 .\models.py:26
 msgid "News"
 msgstr "Notícia"
  
-#: news/templates/news/_form.html:12
+#: .\templates\news\_form.html:12
 msgid "Choose your photo..."
 msgstr "Escolha a foto"
  
-#: news/templates/news/_form.html:59
+#: .\templates\news\_form.html:60
 msgid "Save"
 msgstr "Salvar"
  
-#: news/templates/news/_form.html:62
+#: .\templates\news\_form.html:63
 msgid "Cancel"
 msgstr "Cancelar"
  
-#: news/templates/news/create.html:7
+#: .\templates\news\create.html:7
 msgid "Register News"
 msgstr "Cadastrar notícia"
  
-#: news/templates/news/list.html:7 news/views.py:47
+#: .\templates\news\delete.html:12
+msgid "Are you sure you want to delete the news"
+msgstr "Você tem certeza que deseja apagar a notícia"
+
+#: .\templates\news\delete.html:12
+msgid "All its data will be lost and can't be recovered"
+msgstr "Todos seus dados serão perdidos e não podem ser recuperados"
+
+#: .\templates\news\delete.html:18
+msgid "Close"
+msgstr "Cancelar"
+
+#: .\templates\news\delete.html:19 .\templates\news\list.html:60
+#: .\templates\news\search.html:60
+msgid "Delete"
+msgstr "Apagar"
+
+#: .\templates\news\list.html:7 .\views.py:47
 msgid "Manage News"
 msgstr "Gerenciar notícias"
  
-#: news/templates/news/list.html:34
-msgid "Search..."
-msgstr ""
+#: .\templates\news\list.html:34 .\templates\news\search.html:34
+msgid "Search by title, author or date"
+msgstr "Pesquisar por título, autor ou data"
  
-#: news/templates/news/list.html:45 news/views.py:74
+#: .\templates\news\list.html:45 .\templates\news\search.html:45 .\views.py:74
 msgid "Create News"
 msgstr "Criar notícia"
  
-#: news/templates/news/list.html:59
+#: .\templates\news\list.html:59 .\templates\news\search.html:59
 msgid "Edit"
-msgstr ""
+msgstr "Editar"
  
-#: news/templates/news/list.html:60
-msgid "Delete"
-msgstr ""
-
-#: news/templates/news/list.html:71
+#: .\templates\news\list.html:71 .\templates\news\search.html:71
 msgid "No news found"
-msgstr ""
+msgstr "Nenhuma notícia encontrada"
  
-#: news/templates/news/update.html:7 news/views.py:92
-#, fuzzy
-#| msgid "Create News"
+#: .\templates\news\search.html:7 .\views.py:142
+msgid "Search News"
+msgstr "Pesquisar Notícia"
+
+#: .\templates\news\update.html:7 .\views.py:92
 msgid "Update News"
-msgstr "Criar notícia"
+msgstr "Atualizar Notícia"
  
-#: news/views.py:22
+#: .\templates\news\view.html:32
+msgid "Print News"
+msgstr "Imprimir Notícia"
+
+#: .\views.py:22
 msgid "Visualize News"
-msgstr ""
+msgstr "Visualizar Notícia"
  
-#: news/views.py:68 news/views.py:86
+#: .\views.py:68 .\views.py:86
 msgid "News successfully created!"
 msgstr "Notícia criada com sucesso"
  
+#: .\views.py:159
+msgid "News \"%s\" removed successfully!"
+msgstr "Notícia \"%s\" removida com sucesso"
+
+#: .\views.py:166
+msgid "Delete News"
+msgstr "Apagar Notícia"
+
 #~ msgid "Create news"
 #~ msgstr "Criar notícia"
  
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-04-13 23:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import news.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='news',
+            name='image',
+            field=models.ImageField(blank=True, upload_to='news/', validators=[news.models.validate_img_extension], verbose_name='News Image'),
+        ),
+        migrations.AlterField(
+            model_name='news',
+            name='title',
+            field=models.CharField(max_length=200, unique=True, verbose_name='Title'),
+        ),
+    ]
@@ -9,7 +9,7 @@
 					<label for="{{ field.auto_id }}">{{ field.label }} <span>*</span></label>
 					{% render_field field class='form-control' %}
 					<div class="input-group">
-											<input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
+											<input type="text" readonly="" class="form-control" id="pic_holder" placeholder="{% trans 'Choose your photo...' %}">
 											<span class="input-group-btn input-group-sm">
 												<button type="button" class="btn btn-fab btn-fab-mini">
 													<i class="material-icons">image</i>
@@ -27,11 +27,12 @@
 							{% endif %}
             	{% render_field field class='form-control text_wysiwyg' %}
 			{% else %}
-				{% if field.field.required %}
-					<label for="{{ field.auto_id }}">{{ field.label }} <span>*</span></label>
-				{% else %}
-											<label for="{{ field.auto_id }}">{{ field.label }}</label>
  
+							{% if field.auto_id == 'id_title' %}
+										{% if field.field.required %}
+											<label for="{{ field.auto_id }}">{{ field.label }} <span>*</span></label>
+										{% else %}
+							{% endif %}
 				{% endif %}
 							{% render_field field class='form-control' %}
  
@@ -65,3 +66,4 @@
 	</div>
  
 </form>
+{% include 'users/modal_crop.html'  %}
@@ -0,0 +1,23 @@
+{% load static i18n permission_tags %}
+
+<!-- Modal (remember to change the ids!!!) -->
+<div class="modal fade" id="news" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+           <!-- Modal Body -->
+      <div class="modal-body">
+        <!-- Put ONLY your content here!!!  -->
+        <form id="delete_form" action="{% url 'news:delete' new.slug %}" method="post">
+          {% csrf_token %}
+          <p>{% trans 'Are you sure you want to delete the news' %} "{{new.title}}"? {% trans "All its data will be lost and can't be recovered" %}</p>
+        </form>
+      </div>
+      <!-- Modal Footer -->
+      <div id="delete-category-footer"class="modal-footer">
+        <!-- Don't remove that!!!  -->
+        <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
+        <button type="submit" id="button" form="delete_form" class="btn btn-success btn-raised erase-button">{% trans "Delete" %}</button>
+      </div>
+    </div>
+  </div>
+</div>
@@ -28,10 +28,10 @@
  
 <div class="row">
     <div class="col-md-9">
-        <form action="{% url 'users:search' %}" method="GET" class="form-horizontal">
+        <form action="{% url 'news:search' %}" method="GET" class="form-horizontal">
             <div class="form-group">
                 <div class="col-md-11 col-sm-11 col-xs-11">
-                    <input type="text" class="form-control" name="search" placeholder="{% trans 'Search...' %}" />
+                    <input type="text" class="form-control" name="search" placeholder="{% trans 'Search by title, author or date' %}" />
                 </div>
                 <div class="col-md-1 col-sm-1 col-xs-1">
                     <button type="submit" class="btn btn-fab btn-fab-mini">
@@ -57,7 +57,7 @@
                 <div class="col-md-6">
                     <div align="right">
                         <a href="{% url 'news:update' new.slug %}" class="btn btn-success btn-raised btn-sm"><i class="fa fa-edit"></i> {% trans 'Edit' %}</a>
-                        <a href="" class="btn btn-default btn-raised btn-sm"><i class="fa fa-trash"></i> {% trans 'Delete' %}</a>
+                        <a href="javascript:delete_news.get('{% url 'news:delete' new.slug %}','#news','#modal_remove')" class="btn btn-default btn-raised btn-sm" class="btn btn-default btn-raised btn-sm"><i class="fa fa-trash"></i> {% trans 'Delete' %}</a>
                     </div>
                 </div>
             </div>
@@ -75,5 +75,21 @@
 <div id="modal_remove">
  
 </div>
+<script type="text/javascript">
+var delete_news = {
+  get: function (url, id_modal, id_div_modal){
+    $.get(url, function(data){
+      if($(id_modal).length){
+        $(id_div_modal).empty();
+        $(id_div_modal).append(data);
+      } else {
+        $(id_div_modal).append(data);
+      }
+      $(id_modal).modal('show');
+    });
+  }
+};
+
+</script>
  
 {% endblock %}
@@ -0,0 +1,79 @@
+{% extends 'news/list.html' %}
+
+{% load static i18n django_bootstrap_breadcrumbs permission_tags pagination %}
+
+{% block breadcrumbs %}
+    {{ block.super }}
+    {% trans 'Search News' as search_news %}
+    {% breadcrumb  search_news 'news:search' %}
+{% endblock %}
+
+{% block render_breadcrumbs %}
+    {% render_breadcrumbs %}
+{% endblock %}
+
+{% block content %}
+
+{% if messages %}
+    {% for message in messages %}
+        <script type="text/javascript">
+            {% if message.tags == "danger" %}
+                alertify.error('{{message}}');
+            {% else %}
+                alertify.success('{{message}}');
+            {% endif %}
+        </script>
+    {% endfor %}
+{% endif %}
+
+<div class="row">
+    <div class="col-md-9">
+        <form action="{% url 'news:search' %}" method="GET" class="form-horizontal">
+            <div class="form-group">
+                <div class="col-md-11 col-sm-11 col-xs-11">
+                    <input type="text" class="form-control" name="search" placeholder="{% trans 'Search by title, author or date' %}" />
+                </div>
+                <div class="col-md-1 col-sm-1 col-xs-1">
+                    <button type="submit" class="btn btn-fab btn-fab-mini">
+                        <i class="fa fa-search"></i>
+                    </button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div class="col-md-3">
+        <a href="{% url 'news:create' %}" class="pull-right btn btn-success btn-raised btn-md"><i class="fa fa-plus"></i> {% trans 'Create News' %}</a>
+    </div>
+</div>
+
+{% if news %}
+    {% for new in news %}
+        <div class="row-fluid panel panel-default">
+            <div class="panel-body">
+                <div class="col-md-6">
+                    <a href="{% url 'news:view' new.slug %}"><h3> <b>{{ new }}</b> </h3></a>
+                    <p>{{ new.creator}}, em {{ new.create_date }}</p>
+                </div>
+                <div class="col-md-6">
+                    <div align="right">
+                        <a href="{% url 'news:update' new.slug %}" class="btn btn-success btn-raised btn-sm"><i class="fa fa-edit"></i> {% trans 'Edit' %}</a>
+                        <a href="" class="btn btn-default btn-raised btn-sm"><i class="fa fa-trash"></i> {% trans 'Delete' %}</a>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    {% endfor %}
+    {% pagination request paginator page_obj %}
+{% else %}
+    <div class="row">
+        <div class="col-md-12 col-sm-12 col-xs-12">
+            <p>{% trans 'No news found' %}</p>
+        </div>
+    </div>
+{% endif %}
+<div id="modal_remove">
+
+</div>
+
+{% endblock %}
@@ -6,5 +6,7 @@ urlpatterns = [
 	url(r'^view/(?P<slug>[\w_-]+)/$', views.VisualizeNews.as_view(), name = 'view'),
 	url(r'^create/$', views.CreateNewsView.as_view(), name='create'),
 	url(r'^update/(?P<slug>[\w_-]+)/$', views.UpdateNewsView.as_view(), name = 'update'),
+	url(r'^search/$', views.SearchNewsView.as_view(), name = 'search'),
+	url(r'^delete/(?P<slug>[\w_-]+)/$', views.DeleteNewsView.as_view(), name='delete'),
  
 ]
-from django.shortcuts import render
+from django.shortcuts import get_object_or_404, redirect, render
 from django.views import generic
 from django.contrib.auth.mixins import LoginRequiredMixin
 from log.models import Log
@@ -6,12 +6,17 @@ from log.mixins import LogMixin
 from django.core.urlresolvers import reverse, reverse_lazy
 from django.contrib import messages
 from django.utils.translation import ugettext_lazy as _
-
+from django.db.models import Q, Count
  
 from .models import News
 from .forms import NewsForm
  
 class VisualizeNews(LoginRequiredMixin,LogMixin,generic.ListView):
+    log_action = "view_new"
+    log_resource = "news"
+    log_component = "news"
+    log_context = {}
+
     login_url = reverse_lazy("users:login")
     redirect_field_name = 'next'
     template_name = 'news/view.html'
@@ -27,9 +32,20 @@ class VisualizeNews(LoginRequiredMixin,LogMixin,generic.ListView):
         slug = self.kwargs.get('slug', '')
         new = News.objects.get(slug=slug)
  
+        self.log_context['new_title'] = new.title
+        self.log_context['new_slug'] = new.slug
+
+        super(VisualizeNews, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
+
         return new
  
 class ListNewsView(LoginRequiredMixin,LogMixin,generic.ListView):
+    log_action = "view_list_of_news"
+    log_resource = "news"
+    log_component = "news"
+    log_context = {}
+
+
     login_url = reverse_lazy("users:login")
     redirect_field_name = 'next'
  
@@ -46,10 +62,17 @@ class ListNewsView(LoginRequiredMixin,LogMixin,generic.ListView):
         context = super(ListNewsView, self).get_context_data(**kwargs)
         context['title'] = _('Manage News')
  
+        super(ListNewsView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
+
         return context
  
  
 class CreateNewsView(LoginRequiredMixin,LogMixin,generic.edit.CreateView):
+    log_action = "create"
+    log_resource = "news"
+    log_component = "news"
+    log_context = {}
+
     login_url = reverse_lazy("users:login")
     redirect_field_name = 'next'
     template_name = 'news/create.html'
@@ -62,6 +85,13 @@ class CreateNewsView(LoginRequiredMixin,LogMixin,generic.edit.CreateView):
  
         self.object.save()
  
+        self.log_context['new_creator_user'] = self.object.creator.get_short_name()
+        self.log_context['new_title'] = self.object.title
+        self.log_context['new_slug'] = self.object.slug
+
+        super(CreateNewsView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
+
+
         return super(CreateNewsView, self).form_valid(form)
  
     def get_success_url(self):
@@ -76,28 +106,118 @@ class CreateNewsView(LoginRequiredMixin,LogMixin,generic.edit.CreateView):
         return context
  
 class UpdateNewsView(LoginRequiredMixin,LogMixin,generic.UpdateView):
-        login_url = reverse_lazy("users:login")
-        redirect_field_name = 'next'
-        template_name = 'news/update.html'
-        form_class = NewsForm
-        model = News
+    log_action = "update"
+    log_resource = "news"
+    log_component = "news"
+    log_context = {}
  
-        def get_success_url(self):
-            messages.success(self.request, _('News successfully created!'))
+    login_url = reverse_lazy("users:login")
+    redirect_field_name = 'next'
+    template_name = 'news/update.html'
+    form_class = NewsForm
+    model = News
  
-            return reverse_lazy('news:view', kwargs = {'slug': self.object.slug} )
+    def get_success_url(self):
+        messages.success(self.request, _('News successfully created!'))
  
-        def get_context_data (self, **kwargs):
-            context = super(UpdateNewsView, self).get_context_data(**kwargs)
-            context['title'] = _("Update News")
+        return reverse_lazy('news:view', kwargs = {'slug': self.object.slug} )
  
-            return context
+    def get_context_data (self, **kwargs):
+        context = super(UpdateNewsView, self).get_context_data(**kwargs)
+        context['title'] = _("Update News")
  
-        def form_valid(self, form):
-            self.object = form.save(commit = False)
-            creator = self.request.user
-            self.object.creator = creator
+        return context
  
-            self.object.save()
+    def form_valid(self, form):
+        self.object = form.save(commit = False)
+        creator = self.request.user
+        self.object.creator = creator
  
-            return super(UpdateNewsView, self).form_valid(form)
+        self.object.save()
+
+        self.log_context['new_update_user'] = self.object.creator.get_short_name()
+        self.log_context['new_title'] = self.object.title
+        self.log_context['new_slug'] = self.object.slug
+
+        super(UpdateNewsView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
+
+
+        return super(UpdateNewsView, self).form_valid(form)
+
+class SearchNewsView(LoginRequiredMixin, LogMixin, generic.ListView):
+    login_url = reverse_lazy("users:login")
+    redirect_field_name = 'next'
+
+    template_name = 'news/search.html'
+    context_object_name = 'news'
+    paginate_by = 10
+
+    def dispatch(self, request, *args, **kwargs):
+    	search = self.request.GET.get('search', '')
+
+    	if search == '':
+    		return redirect(reverse_lazy('news:manage_news'))
+
+    	return super(SearchNewsView, self).dispatch(request, *args, **kwargs)
+
+    def get_queryset(self):
+        inteiro = False
+
+        search = self.request.GET.get('search', '')
+        print(type(search))
+        try:
+            search = int(search)
+            inteiro = True
+        except Exception as e:
+            inteiro = False
+
+        if inteiro:
+            news = News.objects.filter(Q(title__icontains = search) | Q(creator__username__icontains = search) | Q(create_date__icontains = search)  | Q(create_date__year = search) | Q(create_date__month = search)  | Q(create_date__day = search) ).distinct().order_by('create_date')
+        else:
+            news = News.objects.filter(Q(title__icontains = search) | Q(creator__username__icontains = search) | Q(create_date__icontains = search) ).distinct().order_by('create_date')
+
+
+        return news
+
+    def get_context_data (self, **kwargs):
+    	context = super(SearchNewsView, self).get_context_data(**kwargs)
+    	context['title'] = _('Search News')
+    	context['search'] = self.request.GET.get('search')
+
+    	return context
+
+class DeleteNewsView(LoginRequiredMixin,LogMixin,generic.DeleteView):
+    log_component = 'news'
+    log_action = 'delete'
+    log_resource = 'news'
+    log_context = {}
+
+    login_url = reverse_lazy("users:login")
+    redirect_field_name = 'next'
+
+    model = News
+    template_name = 'news/delete.html'
+
+    def delete(self, request, *args, **kwargs):
+        news = get_object_or_404(News, slug = self.kwargs.get('slug'))
+        return super(DeleteNewsView, self).delete(self, request, *args, **kwargs)
+
+    def get_success_url(self):
+        messages.success(self.request, _('News "%s" removed successfully!')%(self.object.title))
+        success_url = reverse_lazy('news:manage_news')
+
+        return success_url
+
+    def get_context_data(self, **kwargs):
+        context = super(DeleteNewsView, self).get_context_data(**kwargs)
+        context['title'] = _('Delete News')
+        news = get_object_or_404(News, slug = self.kwargs.get('slug'))
+        context['new'] = news
+
+        self.log_context['new_creator'] = news.creator.get_short_name()
+        self.log_context['new_title'] = news.title
+        self.log_context['new_slug'] = news.slug
+
+        super(DeleteNewsView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
+
+        return context
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-11 19:18-0300\n"
+"POT-Creation-Date: 2017-04-15 00:12-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"
@@ -97,17 +97,22 @@ msgstr &quot;Notificação&quot;
  
 #: notifications/templates/notifications/_ajax_history.html:48
 #: notifications/templates/notifications/_history.html:47
+msgid "Aware"
+msgstr "Ciente"
+
+#: notifications/templates/notifications/_ajax_history.html:53
+#: notifications/templates/notifications/_history.html:52
 msgid "Observation"
 msgstr "Observação"
  
-#: notifications/templates/notifications/_ajax_history.html:59
-#: notifications/templates/notifications/_history.html:58
+#: notifications/templates/notifications/_ajax_history.html:64
+#: notifications/templates/notifications/_history.html:63
 #: notifications/templates/notifications/_view.html:28
 msgid "Not Informed"
 msgstr "Não Informado"
  
-#: notifications/templates/notifications/_ajax_history.html:66
-#: notifications/templates/notifications/_history.html:65
+#: notifications/templates/notifications/_ajax_history.html:72
+#: notifications/templates/notifications/_history.html:71
 msgid "No results found"
 msgstr "Nenhum resultado encontrado"
  
@@ -162,7 +167,9 @@ msgstr &quot;Cancelar&quot;
 #: notifications/templates/notifications/index.html:19
 #: notifications/templates/notifications/subject.html:13
 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:"
+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:13
@@ -209,13 +216,21 @@ msgstr &quot;Essa tarefa está atrasada&quot;
 msgid "You miss this task"
 msgstr "Você perdeu essa tarefa"
  
-#: notifications/templatetags/notification_filters.py:120
-#: notifications/templatetags/notification_filters.py:124
+#: notifications/templatetags/notification_filters.py:40
+msgid "Yes"
+msgstr "Sim"
+
+#: notifications/templatetags/notification_filters.py:42
+msgid "No"
+msgstr "Não"
+
+#: notifications/templatetags/notification_filters.py:129
+#: notifications/templatetags/notification_filters.py:133
 #, python-format
 msgid "Goal defined to task realization: %s"
 msgstr "Meta definida para realização da tarefa: %s"
  
-#: notifications/templatetags/notification_filters.py:126
+#: notifications/templatetags/notification_filters.py:135
 #, python-format
 msgid "New goal defined to task realization: %s"
 msgstr "Nova meta definida para realização da tarefa: %s"
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-04-13 23:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('notifications', '0002_auto_20170130_1828'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='notification',
+            name='aware',
+            field=models.BooleanField(default=False, verbose_name='Aware'),
+        ),
+    ]
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-04-13 23:40
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('notifications', '0003_notification_aware'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='notification',
+            name='aware',
+        ),
+    ]
@@ -44,6 +44,11 @@
 					</a>
 				</th>
 				<th>
+					<a href="javascript: orderBy({{ subject_id }}, '{{ request|order_ajax:'aware' }}')">
+						{% trans 'Aware' %} <i class="fa fa-fw {{ request|order_icon_class:'aware' }} pull-right"></i>
+					</a>
+				</th>
+				<th>
 					<a href="javascript: orderBy({{ subject_id }}, '{{ request|order_ajax:'obs' }}'')">
 						{% trans 'Observation' %} <i class="fa fa-fw {{ request|order_icon_class:'obs' }} pull-right"></i>
 					</a>
@@ -58,12 +63,13 @@
 							<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.viewed|viewed_msg }}</td>
 							<td>{{ notification|observation }}</td>
 						</tr>
 					{% endfor %}
 				{% else %}
 					<tr>
-						<td colspan="6" class="text-center">{% trans 'No results found' %}</td>
+						<td colspan="7" class="text-center">{% trans 'No results found' %}</td>
 					</tr>
 				{% endif %}
 			</tbody>
@@ -43,6 +43,11 @@
 					</a>
 				</th>
 				<th>
+					<a href="{{ request|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' }}">
 						{% trans 'Observation' %} <i class="fa fa-fw {{ request|order_icon_class:'obs' }} pull-right"></i>
 					</a>
@@ -57,12 +62,13 @@
 							<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.viewed|viewed_msg }}</td>
 							<td>{{ notification|observation }}</td>
 						</tr>
 					{% endfor %}
 				{% else %}
 					<tr>
-						<td colspan="6" class="text-center">{% trans 'No results found' %}</td>
+						<td colspan="7" class="text-center">{% trans 'No results found' %}</td>
 					</tr>
 				{% endif %}
 			</tbody>
@@ -34,6 +34,15 @@ def warning_msg(level):
  
 	return msg
  
+@register.filter(name = 'viewed_msg')
+def viewed_msg(aware):
+	if aware:
+		msg = _('Yes')
+	else:
+		msg = _('No')
+
+	return msg
+
 @register.filter(name = 'done_percent')
 def done_percent(notification):
 	users = get_resource_users(notification.task.resource)
@@ -117,12 +126,12 @@ def observation(notification):
  
 	if notification.level == 1:
 		if notification.meta:
-			msg = _('Goal defined to task realization: %s')%(formats.date_format(notification.meta, "SHORT_DATETIME_FORMAT"))
+			msg = _('Goal defined to task realization: %s')%(formats.date_format(notification.meta.astimezone(timezone.get_current_timezone()), "SHORT_DATETIME_FORMAT"))
 	elif notification.level == 2:
 		if notification.meta:
 			if notification.meta < timezone.now():
-				msg = _('Goal defined to task realization: %s')%(formats.date_format(notification.meta, "SHORT_DATETIME_FORMAT"))
+				msg = _('Goal defined to task realization: %s')%(formats.date_format(notification.meta.astimezone(timezone.get_current_timezone()), "SHORT_DATETIME_FORMAT"))
 			else:
-				msg = _('New goal defined to task realization: %s')%(formats.date_format(notification.meta, "SHORT_DATETIME_FORMAT"))
+				msg = _('New goal defined to task realization: %s')%(formats.date_format(notification.meta.astimezone(timezone.get_current_timezone()), "SHORT_DATETIME_FORMAT"))
  
 	return msg
 \ No newline at end of file
@@ -94,6 +94,11 @@ def get_order_by(order):
 			return ["-level"]
 		else:
 			return ["level"]
+	elif "aware" in order:
+		if "-" in order:
+			return ["-viewed"]
+		else:
+			return ["viewed"]
 	elif "obs" in order:
 		if "-" in order:
 			return ["-meta"]
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-11 19:18-0300\n"
+"POT-Creation-Date: 2017-04-15 00:12-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-04-11 19:17-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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-04-11 19:18-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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-04-11 19:17-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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-04-11 19:18-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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-04-11 19:18-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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-04-11 19:17-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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-04-11 19:18-0300\n"
+"POT-Creation-Date: 2017-04-15 00:12-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-04-11 19:17-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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,7 +18,7 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
  
-#: users/forms.py:28 users/forms.py:33 users/forms.py:276
+#: users/forms.py:28 users/forms.py:33 users/forms.py:279
 msgid "You must insert an email address"
 msgstr "Você deve inserir um endereço de email"
  
@@ -30,45 +30,45 @@ msgstr &quot;A imagem é muito grande. Ela deve conter menos de 2MB.&quot;
 msgid "The confirmation password is incorrect."
 msgstr "A confirmação de senha está incorreta."
  
-#: users/forms.py:61 users/forms.py:173 users/templates/users/login.html:52
+#: users/forms.py:61 users/forms.py:175 users/templates/users/login.html:52
 msgid "Password"
 msgstr "Senha"
  
-#: users/forms.py:62 users/forms.py:174 users/forms.py:233 users/forms.py:289
+#: users/forms.py:62 users/forms.py:176 users/forms.py:236 users/forms.py:292
 msgid "Confirm Password"
 msgstr "Confirmação de Senha"
  
-#: users/forms.py:108 users/forms.py:267 users/templates/users/list.html:56
+#: users/forms.py:109 users/forms.py:270 users/templates/users/list.html:56
 #: users/templates/users/login.html:47 users/templates/users/search.html:47
 msgid "Email"
 msgstr "Email"
  
-#: users/forms.py:109 users/models.py:27 users/templates/users/list.html:55
+#: users/forms.py:110 users/models.py:27 users/templates/users/list.html:55
 #: users/templates/users/search.html:46
 msgid "Name"
 msgstr "Nome"
  
-#: users/forms.py:110 users/models.py:28
+#: users/forms.py:111 users/models.py:28
 msgid "Last Name"
 msgstr "Sobrenome"
  
-#: users/forms.py:111 users/models.py:29
+#: users/forms.py:112 users/models.py:29
 msgid "Social Name"
 msgstr "Nome Social"
  
-#: users/forms.py:232 users/forms.py:288
+#: users/forms.py:235 users/forms.py:291
 msgid "New Password"
 msgstr "Nova Senha"
  
-#: users/forms.py:239
+#: users/forms.py:242
 msgid "The value inputed does not match with your actual password."
 msgstr "O valor inserido não corresponde à sua senha atual."
  
-#: users/forms.py:260
+#: users/forms.py:263
 msgid "Actual Password"
 msgstr "Senha Atual"
  
-#: users/forms.py:281
+#: users/forms.py:284
 msgid "You must insert a valid email address"
 msgstr "Você deve inserir um endereço de email válido"
  
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-11 19:18-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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-04-11 19:18-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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-04-11 19:17-0300\n"
+"POT-Creation-Date: 2017-04-15 00:13-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	8	msgstr ""
9	9	"Project-Id-Version: PACKAGE VERSION\n"
10	10	"Report-Msgid-Bugs-To: \n"
11		-"POT-Creation-Date: 2017-04-11 19:17-0300\n"
	11	+"POT-Creation-Date: 2017-04-15 00:12-0300\n"
12	12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13	13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14	14	"Language-Team: LANGUAGE <LL@li.org>\n"
...	...	@@ -26,95 +26,95 @@ msgstr ""
26	26	msgid "English"
27	27	msgstr ""
28	28
29		-#: amadeus/templates/base.html:93
	29	+#: amadeus/templates/base.html:96
30	30	msgid "Search for subjects and resources"
31	31	msgstr "Buscar por assuntos ou recursos"
32	32
33		-#: amadeus/templates/base.html:106 amadeus/templates/base.html:111
	33	+#: amadeus/templates/base.html:109 amadeus/templates/base.html:114
34	34	msgid "Language Selector"
35	35	msgstr ""
36	36
37		-#: amadeus/templates/base.html:152
	37	+#: amadeus/templates/base.html:155
38	38	msgid "Profile"
39	39	msgstr "Perfil"
40	40
41		-#: amadeus/templates/base.html:153
	41	+#: amadeus/templates/base.html:156
42	42	msgid "Edit Profile"
43	43	msgstr "Editar Perfil"
44	44
45		-#: amadeus/templates/base.html:154
	45	+#: amadeus/templates/base.html:157
46	46	msgid "Change Password"
47	47	msgstr "Alterar Senha"
48	48
49		-#: amadeus/templates/base.html:155
	49	+#: amadeus/templates/base.html:158
50	50	msgid "Delete Account"
51	51	msgstr "Remover Conta"
52	52
53		-#: amadeus/templates/base.html:156
	53	+#: amadeus/templates/base.html:159
54	54	msgid "Logout"
55	55	msgstr "Sair"
56	56
57		-#: amadeus/templates/base.html:161
	57	+#: amadeus/templates/base.html:164
58	58	msgid "settings"
59	59	msgstr "configurações"
60	60
61		-#: amadeus/templates/base.html:164
	61	+#: amadeus/templates/base.html:167
62	62	msgid "Settings"
63	63	msgstr "Configurações"
64	64
65		-#: amadeus/templates/base.html:167
	65	+#: amadeus/templates/base.html:170
66	66	msgid "Manage Users"
67	67	msgstr "Gerenciar Usuários"
68	68
69		-#: amadeus/templates/base.html:168
	69	+#: amadeus/templates/base.html:171
70	70	msgid "Manage Categories"
71	71	msgstr "Gerenciar Categorias"
72	72
73		-#: amadeus/templates/base.html:169
	73	+#: amadeus/templates/base.html:172
74	74	msgid "Manage News"
75	75	msgstr "Gerenciar Notícias"
76	76
77		-#: amadeus/templates/base.html:176
	77	+#: amadeus/templates/base.html:179
78	78	msgid "System"
79	79	msgstr "Sistema"
80	80
81		-#: amadeus/templates/base.html:183
	81	+#: amadeus/templates/base.html:186
82	82	msgid "Mail Sender"
83	83	msgstr "Remetente de Email"
84	84
85		-#: amadeus/templates/base.html:184
	85	+#: amadeus/templates/base.html:187
86	86	msgid "Security"
87	87	msgstr "Segurança"
88	88
89		-#: amadeus/templates/base.html:185
	89	+#: amadeus/templates/base.html:188
90	90	msgid "Theme"
91	91	msgstr "Temas"
92	92
93		-#: amadeus/templates/base.html:186
	93	+#: amadeus/templates/base.html:189
94	94	#, fuzzy
95	95	#\| msgid "Web Conference Settings"
96	96	msgid "Web Conference"
97	97	msgstr "Web conferência"
98	98
99		-#: amadeus/templates/base.html:206 amadeus/templates/base.html:261
	99	+#: amadeus/templates/base.html:209 amadeus/templates/base.html:264
100	100	msgid "Subjects"
101	101	msgstr "Assuntos"
102	102
103		-#: amadeus/templates/base.html:211 amadeus/templates/base.html:266
	103	+#: amadeus/templates/base.html:214 amadeus/templates/base.html:269
104	104	msgid "Mural"
105	105	msgstr ""
106	106
107		-#: amadeus/templates/base.html:217 amadeus/templates/base.html:272
	107	+#: amadeus/templates/base.html:220 amadeus/templates/base.html:275
108	108	msgid "Messages"
109	109	msgstr "Mensagens"
110	110
111		-#: amadeus/templates/base.html:223 amadeus/templates/base.html:278
	111	+#: amadeus/templates/base.html:226 amadeus/templates/base.html:281
112	112	#, fuzzy
113	113	#\| msgid "Pendencias"
114	114	msgid "Pendencies"
115	115	msgstr "Pendências"
116	116
117		-#: amadeus/templates/base.html:231 amadeus/templates/base.html:286
	117	+#: amadeus/templates/base.html:234 amadeus/templates/base.html:289
118	118	msgid "Analytics"
119	119	msgstr "Analytics"
120	120
...	...
...	...	@@ -209,8 +209,8 @@ CRON_CLASSES = [
209	209	]
210	210
211	211	CRONJOBS = [
212		- ('1 /12 * *', 'notifications.cron.notification_cron'),
213		- ('1 /12 * *', 'goals.cron.setgoals_cron')
	212	+ ('0 0 * * *', 'notifications.cron.notification_cron'),
	213	+ ('0 0 * * *', 'goals.cron.setgoals_cron')
214	214	]
215	215
216	216	CHANNEL_LAYERS = {
...	...
...	...	@@ -0,0 +1,66 @@
	1	+$(function () {
	2	+
	3	+ /* Script para abrir o modal com a imagem selecionada */
	4	+ $("#id_image").change(function () {
	5	+ if (this.files && this.files[0]) {
	6	+ var reader = new FileReader();
	7	+ reader.onload = function (e) {
	8	+ $("#image").attr("src", e.target.result);
	9	+ $("#modalCrop").modal("show");
	10	+ }
	11	+ reader.readAsDataURL(this.files[0]);
	12	+ }
	13	+ });
	14	+
	15	+ /* Scripts da caixa de corte da imagem */
	16	+ var $image = $("#image");
	17	+ var cropBoxData;
	18	+ var canvasData;
	19	+ $("#modalCrop").on("shown.bs.modal", function () {
	20	+ $image.cropper({
	21	+ viewMode: 1,
	22	+ aspectRatio: 1/1,
	23	+ minCropBoxWidth: 700,
	24	+ minCropBoxHeight: 200,
	25	+ ready: function () {
	26	+ $image.cropper("setCanvasData", canvasData);
	27	+ $image.cropper("setCropBoxData", cropBoxData);
	28	+ }
	29	+ });
	30	+ }).on("hidden.bs.modal", function () {
	31	+ cropBoxData = $image.cropper("getCropBoxData");
	32	+ canvasData = $image.cropper("getCanvasData");
	33	+ $image.cropper("destroy");
	34	+ });
	35	+
	36	+ $(".js-zoom-in").click(function () {
	37	+ $image.cropper("zoom", 0.1);
	38	+ });
	39	+
	40	+ $(".js-zoom-out").click(function () {
	41	+ $image.cropper("zoom", -0.1);
	42	+ });
	43	+
	44	+ /* Script para pegar os valores das dimensões e depois fechar o modal */
	45	+ $(".js-crop-and-upload").click(function () {
	46	+ var cropData = $image.cropper("getData");
	47	+ $("#id_x").val(cropData["x"]);
	48	+ $("#id_y").val(cropData["y"]);
	49	+ $("#id_height").val(cropData["height"]);
	50	+ $("#id_width").val(cropData["width"]);
	51	+ $("#modalCrop").modal('hide');
	52	+ });
	53	+
	54	+ /* Script para remover o arquivo enviado caso o usuário clique em cancelar*/
	55	+ $("#id_image").on('change', function(){
	56	+ console.log(this.value);
	57	+ });
	58	+
	59	+ $('#crop_cancel').on('click', function(e){
	60	+ var input = $("#id_image");
	61	+ var holder = $("#pic_holder");
	62	+ input.replaceWith(input.val('').clone(true));
	63	+ holder.replaceWith(holder.val('').clone(true));
	64	+ });
	65	+
	66	+});
...	...
...	...	@@ -32,6 +32,7 @@
32	32
33	33	<script src="{% static 'js/cropper.min.js' %}"></script> <!-- Js for cropper-->
34	34	<script src="{% static 'js/crop.js' %}"></script> <!-- Js for cropper-->
	35	+ <script src="{% static 'js/crop_news.js' %}"></script>
35	36	<link href="{% static 'css/cropper.min.css' %}" rel="stylesheet"> <!-- CSS for cropper-->
36	37
37	38	<script type="text/javascript" src="{% static 'js/printThis.js' %}"></script> <!-- Print this plugin js-->
...	...
...	...	@@ -0,0 +1,16 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10.4 on 2017-04-13 23:34
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('chat', '0003_auto_20170407_2251'),
	12	+ ('chat', '0003_auto_20170407_2154'),
	13	+ ]
	14	+
	15	+ operations = [
	16	+ ]
...	...
...	...	@@ -2,8 +2,9 @@
2	2	from django import forms
3	3	from datetime import datetime
4	4	from django.conf import settings
	5	+from django.utils.html import strip_tags
5	6	from django.utils.translation import ugettext_lazy as _
6		-from django.forms.models import inlineformset_factory
	7	+from django.forms.models import inlineformset_factory, BaseInlineFormSet
7	8
8	9	from subjects.models import Tag
9	10
...	...	@@ -48,6 +49,9 @@ class GoalsForm(forms.ModelForm):
48	49
49	50	limit_submission_date = cleaned_data.get('limit_submission_date', None)
50	51
	52	+ presentation = cleaned_data.get('presentation', '')
	53	+ cleaned_presentation = strip_tags(presentation)
	54	+
51	55	if self.topic:
52	56	if self.instance.id:
53	57	exist = self.topic.resource_topic.filter(goals__isnull = False).exclude(id = self.instance.id).exists()
...	...	@@ -57,6 +61,9 @@ class GoalsForm(forms.ModelForm):
57	61	if exist:
58	62	self.add_error('name', _('There already is another resource with the goals specification for the Topic %s')%(str(self.topic)))
59	63
	64	+ if cleaned_presentation == '':
	65	+ self.add_error('presentation', _('This field is required.'))
	66	+
60	67	if limit_submission_date:
61	68	if not limit_submission_date == ValueError:
62	69	if not self.instance.id and limit_submission_date.date() < datetime.today().date():
...	...	@@ -67,6 +74,8 @@ class GoalsForm(forms.ModelForm):
67	74
68	75	if limit_submission_date.date() > self.subject.end_date:
69	76	self.add_error('limit_submission_date', _('This input should be filled with a date equal or after the subject end date.'))
	77	+ else:
	78	+ self.add_error('limit_submission_date', _('This field is required'))
70	79
71	80	return cleaned_data
72	81
...	...	@@ -116,6 +125,18 @@ class GoalItemForm(forms.ModelForm):
116	125
117	126	return cleaned_data
118	127
	128	+class GoalItemFormset(BaseInlineFormSet):
	129	+ def __init__(self, args, *kwargs):
	130	+ super(GoalItemFormset, self).__init__(args, *kwargs)
	131	+
	132	+ self.forms[0].empty_permitted = False
	133	+
	134	+ def clean(self):
	135	+ description = self.forms[0].cleaned_data.get('description', None)
	136	+
	137	+ if not description:
	138	+ raise forms.ValidationError(_('It\'s necessary to enter at least one goal specification.'))
	139	+
119	140	class MyGoalsForm(forms.ModelForm):
120	141	def __init__(self, args, *kwargs):
121	142	super(MyGoalsForm, self).__init__(args, *kwargs)
...	...	@@ -127,4 +148,4 @@ class MyGoalsForm(forms.ModelForm):
127	148	fields = ['value', 'item']
128	149
129	150	InlinePendenciesFormset = inlineformset_factory(Goals, Pendencies, form = PendenciesLimitedForm, extra = 1, max_num = 3, validate_max = True, can_delete = True)
130		-InlineGoalItemFormset = inlineformset_factory(Goals, GoalItem, form = GoalItemForm, extra = 1, can_delete = True)
131	151	\ No newline at end of file
	152	+InlineGoalItemFormset = inlineformset_factory(Goals, GoalItem, form = GoalItemForm, min_num = 1, validate_min = True, extra = 0, can_delete = True, formset = GoalItemFormset)
132	153	\ No newline at end of file
...	...
...	...	@@ -61,7 +61,15 @@
61	61	</div>
62	62	<div id="goal_items" class="panel-collapse collapse">
63	63	{{ goalitems_form.management_form }}
64		- {{ goalitems_form.non_form_errors }}
	64	+
	65	+ {% if goalitems_form.non_form_errors %}
	66	+ <div class="alert alert-danger alert-dismissible" role="alert">
	67	+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">
	68	+ <span aria-hidden="true">×</span>
	69	+ </button>
	70	+ {{ goalitems_form.non_form_errors }}
	71	+ </div>
	72	+ {% endif %}
65	73
66	74	{% for item in goalitems_form %}
67	75	<div class="goalitems">
...	...	@@ -209,12 +217,18 @@
209	217	</div>
210	218	<div id="notifications" class="panel-collapse collapse">
211	219	{{ pendencies_form.management_form }}
212		- {{ pendencies_form.non_form_errors }}
	220	+ {% if pendencies_form.non_form_errors %}
	221	+ <div class="alert alert-danger alert-dismissible" role="alert">
	222	+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">
	223	+ <span aria-hidden="true">×</span>
	224	+ </button>
	225	+ {{ pendencies_form.non_form_errors }}
	226	+ </div>
	227	+ {% endif %}
213	228
214	229	{% for notify in pendencies_form %}
215	230	<div class="notifies">
216	231	<div style="text-align:left">
217		- {{ notify.errors }}
218	232	{% render_field notify.id %}
219	233	{% render_field notify.resource %}
220	234	{% render_field notify.subject class='pend_subj' %}
...	...
...	...	@@ -667,7 +667,11 @@ class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
667	667	return initial
668	668
669	669	def form_invalid(self, form, pendencies_form, goalitems_form):
	670	+ slug = self.kwargs.get('slug', '')
	671	+ topic = get_object_or_404(Topic, slug = slug)
	672	+
670	673	for p_form in pendencies_form.forms:
	674	+ print(p_form.initial['subject'])
671	675	p_form.fields['action'].choices = [("", "-------"),("view", _("Visualize")), ("submit", _("Submit"))]
672	676
673	677	return self.render_to_response(self.get_context_data(form = form, pendencies_form = pendencies_form, goalitems_form = goalitems_form))
...	...
...	...	@@ -3,10 +3,50 @@ from django.utils.translation import ugettext_lazy as _
3	3
4	4	from .models import News
5	5	from resubmit.widgets import ResubmitFileWidget
6		-
	6	+from os.path import join
	7	+from PIL import Image
	8	+import os
	9	+from amadeus import settings
7	10
8	11	class NewsForm(forms.ModelForm):
9	12	MAX_UPLOAD_SIZE = 510241024
	13	+
	14	+ #Cropping image
	15	+ x = forms.FloatField(widget=forms.HiddenInput(),required=False)
	16	+ y = forms.FloatField(widget=forms.HiddenInput(),required=False)
	17	+ width = forms.FloatField(widget=forms.HiddenInput(),required=False)
	18	+ height = forms.FloatField(widget=forms.HiddenInput(),required=False)
	19	+
	20	+ def save(self, commit=True):
	21	+ super(NewsForm, self).save(commit=False)
	22	+ self.deletepath = ""
	23	+
	24	+ x = self.cleaned_data.get('x')
	25	+ y = self.cleaned_data.get('y')
	26	+ w = self.cleaned_data.get('width')
	27	+ h = self.cleaned_data.get('height')
	28	+
	29	+ if self.instance.image :
	30	+ image = Image.open(self.instance.image)
	31	+ if not x is None:
	32	+ cropped_image = image.crop((x, y, w+x, h+y))
	33	+ resized_image = cropped_image.resize((700, 200), Image.ANTIALIAS)
	34	+
	35	+ folder_path = join(settings.MEDIA_ROOT, 'news')
	36	+ #check if the folder already exists
	37	+ if not os.path.isdir(folder_path):
	38	+ os.makedirs(folder_path)
	39	+
	40	+ if ("news" not in self.instance.image.path):
	41	+ self.deletepath = self.instance.image.path
	42	+
	43	+ resized_image.save(self.instance.image.path)
	44	+
	45	+ self.instance.save()
	46	+ if (self.deletepath):
	47	+ os.remove(self.deletepath)
	48	+ return self.instance
	49	+
10	50	class Meta:
11	51	model = News
12	52	fields = ['title','image','content']
...	...
...	...	@@ -0,0 +1,26 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10.4 on 2017-04-13 23:34
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations, models
	6	+import news.models
	7	+
	8	+
	9	+class Migration(migrations.Migration):
	10	+
	11	+ dependencies = [
	12	+ ('news', '0001_initial'),
	13	+ ]
	14	+
	15	+ operations = [
	16	+ migrations.AlterField(
	17	+ model_name='news',
	18	+ name='image',
	19	+ field=models.ImageField(blank=True, upload_to='news/', validators=[news.models.validate_img_extension], verbose_name='News Image'),
	20	+ ),
	21	+ migrations.AlterField(
	22	+ model_name='news',
	23	+ name='title',
	24	+ field=models.CharField(max_length=200, unique=True, verbose_name='Title'),
	25	+ ),
	26	+ ]
...	...