Commit 6de10d124dcd6291f1f75db2747cef33ce1d3436
1 parent
c7a3e05a
Exists in
master
and in
2 other branches
Goals adjusts
Showing
26 changed files
with
104 additions
and
55 deletions
Show diff stats
amadeus/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:12-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
categories/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
chat/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:12-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
file_link/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
goals/forms.py
@@ -2,8 +2,9 @@ | @@ -2,8 +2,9 @@ | ||
2 | from django import forms | 2 | from django import forms |
3 | from datetime import datetime | 3 | from datetime import datetime |
4 | from django.conf import settings | 4 | from django.conf import settings |
5 | +from django.utils.html import strip_tags | ||
5 | from django.utils.translation import ugettext_lazy as _ | 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 | from subjects.models import Tag | 9 | from subjects.models import Tag |
9 | 10 | ||
@@ -48,6 +49,9 @@ class GoalsForm(forms.ModelForm): | @@ -48,6 +49,9 @@ class GoalsForm(forms.ModelForm): | ||
48 | 49 | ||
49 | limit_submission_date = cleaned_data.get('limit_submission_date', None) | 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 | if self.topic: | 55 | if self.topic: |
52 | if self.instance.id: | 56 | if self.instance.id: |
53 | exist = self.topic.resource_topic.filter(goals__isnull = False).exclude(id = self.instance.id).exists() | 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,6 +61,9 @@ class GoalsForm(forms.ModelForm): | ||
57 | if exist: | 61 | if exist: |
58 | self.add_error('name', _('There already is another resource with the goals specification for the Topic %s')%(str(self.topic))) | 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 | if limit_submission_date: | 67 | if limit_submission_date: |
61 | if not limit_submission_date == ValueError: | 68 | if not limit_submission_date == ValueError: |
62 | if not self.instance.id and limit_submission_date.date() < datetime.today().date(): | 69 | if not self.instance.id and limit_submission_date.date() < datetime.today().date(): |
@@ -67,6 +74,8 @@ class GoalsForm(forms.ModelForm): | @@ -67,6 +74,8 @@ class GoalsForm(forms.ModelForm): | ||
67 | 74 | ||
68 | if limit_submission_date.date() > self.subject.end_date: | 75 | if limit_submission_date.date() > self.subject.end_date: |
69 | self.add_error('limit_submission_date', _('This input should be filled with a date equal or after the subject end date.')) | 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 | return cleaned_data | 80 | return cleaned_data |
72 | 81 | ||
@@ -116,6 +125,18 @@ class GoalItemForm(forms.ModelForm): | @@ -116,6 +125,18 @@ class GoalItemForm(forms.ModelForm): | ||
116 | 125 | ||
117 | return cleaned_data | 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 | class MyGoalsForm(forms.ModelForm): | 140 | class MyGoalsForm(forms.ModelForm): |
120 | def __init__(self, *args, **kwargs): | 141 | def __init__(self, *args, **kwargs): |
121 | super(MyGoalsForm, self).__init__(*args, **kwargs) | 142 | super(MyGoalsForm, self).__init__(*args, **kwargs) |
@@ -127,4 +148,4 @@ class MyGoalsForm(forms.ModelForm): | @@ -127,4 +148,4 @@ class MyGoalsForm(forms.ModelForm): | ||
127 | fields = ['value', 'item'] | 148 | fields = ['value', 'item'] |
128 | 149 | ||
129 | InlinePendenciesFormset = inlineformset_factory(Goals, Pendencies, form = PendenciesLimitedForm, extra = 1, max_num = 3, validate_max = True, can_delete = True) | 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 | \ No newline at end of file | 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 | \ No newline at end of file | 153 | \ No newline at end of file |
goals/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
@@ -18,15 +18,15 @@ msgstr "" | @@ -18,15 +18,15 @@ msgstr "" | ||
18 | "Content-Transfer-Encoding: 8bit\n" | 18 | "Content-Transfer-Encoding: 8bit\n" |
19 | "Plural-Forms: nplurals=2; plural=(n > 1);\n" | 19 | "Plural-Forms: nplurals=2; plural=(n > 1);\n" |
20 | 20 | ||
21 | -#: goals/forms.py:33 | 21 | +#: goals/forms.py:34 |
22 | msgid "Tags" | 22 | msgid "Tags" |
23 | msgstr "Tags" | 23 | msgstr "Tags" |
24 | 24 | ||
25 | -#: goals/forms.py:39 | 25 | +#: goals/forms.py:40 |
26 | msgid "Name" | 26 | msgid "Name" |
27 | msgstr "Nome" | 27 | msgstr "Nome" |
28 | 28 | ||
29 | -#: goals/forms.py:58 | 29 | +#: goals/forms.py:62 |
30 | #, python-format | 30 | #, python-format |
31 | msgid "" | 31 | msgid "" |
32 | "There already is another resource with the goals specification for the Topic " | 32 | "There already is another resource with the goals specification for the Topic " |
@@ -34,12 +34,16 @@ msgid "" | @@ -34,12 +34,16 @@ msgid "" | ||
34 | msgstr "" | 34 | msgstr "" |
35 | "Já existe um outro recurso com a especificação de metas para o tópico %s" | 35 | "Já existe um outro recurso com a especificação de metas para o tópico %s" |
36 | 36 | ||
37 | -#: goals/forms.py:63 | 37 | +#: goals/forms.py:65 goals/forms.py:124 |
38 | +msgid "This field is required." | ||
39 | +msgstr "Esse campo é obrigatório." | ||
40 | + | ||
41 | +#: goals/forms.py:70 | ||
38 | msgid "This input should be filled with a date equal or after today's date." | 42 | msgid "This input should be filled with a date equal or after today's date." |
39 | msgstr "" | 43 | msgstr "" |
40 | "Esse campo deve ser preenchido com uma data igual ou posterior à data atual." | 44 | "Esse campo deve ser preenchido com uma data igual ou posterior à data atual." |
41 | 45 | ||
42 | -#: goals/forms.py:66 | 46 | +#: goals/forms.py:73 |
43 | msgid "" | 47 | msgid "" |
44 | "This input should be filled with a date equal or after the subject begin " | 48 | "This input should be filled with a date equal or after the subject begin " |
45 | "date." | 49 | "date." |
@@ -47,17 +51,23 @@ msgstr "" | @@ -47,17 +51,23 @@ msgstr "" | ||
47 | "Esse campo deve ser preenchido com uma data igual ou posterior à data de " | 51 | "Esse campo deve ser preenchido com uma data igual ou posterior à data de " |
48 | "início do assunto." | 52 | "início do assunto." |
49 | 53 | ||
50 | -#: goals/forms.py:69 | 54 | +#: goals/forms.py:76 |
51 | msgid "" | 55 | msgid "" |
52 | "This input should be filled with a date equal or after the subject end date." | 56 | "This input should be filled with a date equal or after the subject end date." |
53 | msgstr "" | 57 | msgstr "" |
54 | "Esse campo deve ser preenchido com uma data igual ou posterior à data final " | 58 | "Esse campo deve ser preenchido com uma data igual ou posterior à data final " |
55 | "do assunto." | 59 | "do assunto." |
56 | 60 | ||
57 | -#: goals/forms.py:115 | ||
58 | -msgid "This field is required." | 61 | +#: goals/forms.py:78 |
62 | +#, fuzzy | ||
63 | +#| msgid "This field is required." | ||
64 | +msgid "This field is required" | ||
59 | msgstr "Esse campo é obrigatório." | 65 | msgstr "Esse campo é obrigatório." |
60 | 66 | ||
67 | +#: goals/forms.py:138 | ||
68 | +msgid "It's necessary to enter at least one goal specification." | ||
69 | +msgstr "Você deve cadastrar ao menos uma especificação de meta." | ||
70 | + | ||
61 | #: goals/models.py:10 | 71 | #: goals/models.py:10 |
62 | msgid "Presentation" | 72 | msgid "Presentation" |
63 | msgstr "Apresentação" | 73 | msgstr "Apresentação" |
@@ -134,46 +144,46 @@ msgstr "Data de atualização" | @@ -134,46 +144,46 @@ msgstr "Data de atualização" | ||
134 | msgid "Goals Specification" | 144 | msgid "Goals Specification" |
135 | msgstr "Especificação de Metas" | 145 | msgstr "Especificação de Metas" |
136 | 146 | ||
137 | -#: goals/templates/goals/_form.html:101 | 147 | +#: goals/templates/goals/_form.html:109 |
138 | #: goals/templates/goals/_form_submit.html:22 | 148 | #: goals/templates/goals/_form_submit.html:22 |
139 | #: goals/templates/goals/view.html:74 | 149 | #: goals/templates/goals/view.html:74 |
140 | msgid "Minimum percentage desired" | 150 | msgid "Minimum percentage desired" |
141 | msgstr "Porcentagem mínima desejada" | 151 | msgstr "Porcentagem mínima desejada" |
142 | 152 | ||
143 | -#: goals/templates/goals/_form.html:156 | 153 | +#: goals/templates/goals/_form.html:164 |
144 | msgid "Common resources settings" | 154 | msgid "Common resources settings" |
145 | msgstr "Configurações comuns a todos os recursos" | 155 | msgstr "Configurações comuns a todos os recursos" |
146 | 156 | ||
147 | -#: goals/templates/goals/_form.html:204 | 157 | +#: goals/templates/goals/_form.html:212 |
148 | msgid "Pendencies Notifications" | 158 | msgid "Pendencies Notifications" |
149 | msgstr "Notificações de Pendências" | 159 | msgstr "Notificações de Pendências" |
150 | 160 | ||
151 | -#: goals/templates/goals/_form.html:226 | 161 | +#: goals/templates/goals/_form.html:240 |
152 | msgid "Action not performed by the user" | 162 | msgid "Action not performed by the user" |
153 | msgstr "Ação não realizada pelo usuário" | 163 | msgstr "Ação não realizada pelo usuário" |
154 | 164 | ||
155 | -#: goals/templates/goals/_form.html:252 | 165 | +#: goals/templates/goals/_form.html:266 |
156 | msgid "Wished period" | 166 | msgid "Wished period" |
157 | msgstr "Período desejado" | 167 | msgstr "Período desejado" |
158 | 168 | ||
159 | -#: goals/templates/goals/_form.html:388 | 169 | +#: goals/templates/goals/_form.html:402 |
160 | #: goals/templates/goals/_form_submit.html:54 | 170 | #: goals/templates/goals/_form_submit.html:54 |
161 | msgid "Save" | 171 | msgid "Save" |
162 | msgstr "Salvar" | 172 | msgstr "Salvar" |
163 | 173 | ||
164 | -#: goals/templates/goals/_form.html:399 | 174 | +#: goals/templates/goals/_form.html:413 |
165 | msgid "Add new goal" | 175 | msgid "Add new goal" |
166 | msgstr "Adicionar nova meta" | 176 | msgstr "Adicionar nova meta" |
167 | 177 | ||
168 | -#: goals/templates/goals/_form.html:400 | 178 | +#: goals/templates/goals/_form.html:414 |
169 | msgid "Remove this goal" | 179 | msgid "Remove this goal" |
170 | msgstr "Remover essa meta" | 180 | msgstr "Remover essa meta" |
171 | 181 | ||
172 | -#: goals/templates/goals/_form.html:420 | 182 | +#: goals/templates/goals/_form.html:434 |
173 | msgid "Add new notification" | 183 | msgid "Add new notification" |
174 | msgstr "Adicionar nova notificação" | 184 | msgstr "Adicionar nova notificação" |
175 | 185 | ||
176 | -#: goals/templates/goals/_form.html:421 | 186 | +#: goals/templates/goals/_form.html:435 |
177 | msgid "Remove this" | 187 | msgid "Remove this" |
178 | msgstr "Remover essa notificação" | 188 | msgstr "Remover essa notificação" |
179 | 189 | ||
@@ -344,35 +354,35 @@ msgstr "Suas metas para %s foram salvas com sucesso!" | @@ -344,35 +354,35 @@ msgstr "Suas metas para %s foram salvas com sucesso!" | ||
344 | msgid "Your goals for %s was update successfully!" | 354 | msgid "Your goals for %s was update successfully!" |
345 | msgstr "Suas metas para %s foram atualizadas com sucesso!" | 355 | msgstr "Suas metas para %s foram atualizadas com sucesso!" |
346 | 356 | ||
347 | -#: goals/views.py:636 goals/views.py:650 goals/views.py:671 goals/views.py:790 | ||
348 | -#: goals/views.py:804 goals/views.py:814 | 357 | +#: goals/views.py:636 goals/views.py:650 goals/views.py:675 goals/views.py:794 |
358 | +#: goals/views.py:808 goals/views.py:818 | ||
349 | msgid "Visualize" | 359 | msgid "Visualize" |
350 | msgstr "Visualizar" | 360 | msgstr "Visualizar" |
351 | 361 | ||
352 | -#: goals/views.py:636 goals/views.py:650 goals/views.py:671 goals/views.py:790 | ||
353 | -#: goals/views.py:804 goals/views.py:814 | 362 | +#: goals/views.py:636 goals/views.py:650 goals/views.py:675 goals/views.py:794 |
363 | +#: goals/views.py:808 goals/views.py:818 | ||
354 | msgid "Submit" | 364 | msgid "Submit" |
355 | msgstr "Submeter" | 365 | msgstr "Submeter" |
356 | 366 | ||
357 | -#: goals/views.py:734 | 367 | +#: goals/views.py:738 |
358 | msgid "Create Topic Goals" | 368 | msgid "Create Topic Goals" |
359 | msgstr "Adicionar Metas do Tópico" | 369 | msgstr "Adicionar Metas do Tópico" |
360 | 370 | ||
361 | -#: goals/views.py:745 | 371 | +#: goals/views.py:749 |
362 | #, python-format | 372 | #, python-format |
363 | msgid "The Goals specification for the topic %s was realized successfully!" | 373 | msgid "The Goals specification for the topic %s was realized successfully!" |
364 | msgstr "A Especificação de Metas para o tópico %s foi realizada com sucesso!" | 374 | msgstr "A Especificação de Metas para o tópico %s foi realizada com sucesso!" |
365 | 375 | ||
366 | -#: goals/views.py:869 | 376 | +#: goals/views.py:873 |
367 | msgid "Update Topic Goals" | 377 | msgid "Update Topic Goals" |
368 | msgstr "Atualizar Metas do Tópico" | 378 | msgstr "Atualizar Metas do Tópico" |
369 | 379 | ||
370 | -#: goals/views.py:880 | 380 | +#: goals/views.py:884 |
371 | #, python-format | 381 | #, python-format |
372 | msgid "The Goals specification for the topic %s was updated successfully!" | 382 | msgid "The Goals specification for the topic %s was updated successfully!" |
373 | msgstr "A Especificação de Metas para o tópico %s foi atualizada com sucesso!" | 383 | msgstr "A Especificação de Metas para o tópico %s foi atualizada com sucesso!" |
374 | 384 | ||
375 | -#: goals/views.py:916 | 385 | +#: goals/views.py:920 |
376 | #, python-format | 386 | #, python-format |
377 | msgid "The Goals specification of the topic %s was removed successfully!" | 387 | msgid "The Goals specification of the topic %s was removed successfully!" |
378 | msgstr "A Especificação de Metas para o tópico %s foi removida com sucesso!" | 388 | msgstr "A Especificação de Metas para o tópico %s foi removida com sucesso!" |
goals/templates/goals/_form.html
@@ -61,7 +61,15 @@ | @@ -61,7 +61,15 @@ | ||
61 | </div> | 61 | </div> |
62 | <div id="goal_items" class="panel-collapse collapse"> | 62 | <div id="goal_items" class="panel-collapse collapse"> |
63 | {{ goalitems_form.management_form }} | 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 | {% for item in goalitems_form %} | 74 | {% for item in goalitems_form %} |
67 | <div class="goalitems"> | 75 | <div class="goalitems"> |
@@ -209,12 +217,18 @@ | @@ -209,12 +217,18 @@ | ||
209 | </div> | 217 | </div> |
210 | <div id="notifications" class="panel-collapse collapse"> | 218 | <div id="notifications" class="panel-collapse collapse"> |
211 | {{ pendencies_form.management_form }} | 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 | {% for notify in pendencies_form %} | 229 | {% for notify in pendencies_form %} |
215 | <div class="notifies"> | 230 | <div class="notifies"> |
216 | <div style="text-align:left"> | 231 | <div style="text-align:left"> |
217 | - {{ notify.errors }} | ||
218 | {% render_field notify.id %} | 232 | {% render_field notify.id %} |
219 | {% render_field notify.resource %} | 233 | {% render_field notify.resource %} |
220 | {% render_field notify.subject class='pend_subj' %} | 234 | {% render_field notify.subject class='pend_subj' %} |
goals/views.py
@@ -667,7 +667,11 @@ class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView): | @@ -667,7 +667,11 @@ class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView): | ||
667 | return initial | 667 | return initial |
668 | 668 | ||
669 | def form_invalid(self, form, pendencies_form, goalitems_form): | 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 | for p_form in pendencies_form.forms: | 673 | for p_form in pendencies_form.forms: |
674 | + print(p_form.initial['subject']) | ||
671 | p_form.fields['action'].choices = [("", "-------"),("view", _("Visualize")), ("submit", _("Submit"))] | 675 | p_form.fields['action'].choices = [("", "-------"),("view", _("Visualize")), ("submit", _("Submit"))] |
672 | 676 | ||
673 | return self.render_to_response(self.get_context_data(form = form, pendencies_form = pendencies_form, goalitems_form = goalitems_form)) | 677 | return self.render_to_response(self.get_context_data(form = form, pendencies_form = pendencies_form, goalitems_form = goalitems_form)) |
links/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
log/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
mailsender/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:12-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
mural/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
news/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
notifications/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:12-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
pdf_file/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:12-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
pendencies/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
reports/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
security/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
students_group/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
subjects/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
themes/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
topics/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:12-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
users/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
webconference/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
webpage/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
youtube_video/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-04-14 07:26-0300\n" | 11 | +"POT-Creation-Date: 2017-04-15 00:13-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |