diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css index 3795b56..8864400 100755 --- a/amadeus/static/css/base/amadeus.css +++ b/amadeus/static/css/base/amadeus.css @@ -1229,6 +1229,23 @@ div.dataTables_wrapper div.dataTables_paginate { margin-right: 30px; } +.form-field-report{ + color: #000000 !important; +} + +.resource-tag-formset{ + width: 100%; + display: inline-block; + padding: 15px; +} + + +.report-resource-form{ + width: 30%; + float: left; +} + + .delete-row{ float: right; background-color: gray; diff --git a/reports/forms.py b/reports/forms.py index 1068810..a44fe58 100644 --- a/reports/forms.py +++ b/reports/forms.py @@ -33,9 +33,9 @@ class ResourceAndTagForm(forms.Form): class CreateInteractionReportForm(forms.Form): - topic = forms.ChoiceField( label= _("Topics to select data from"), required=True) - init_date = forms.DateField(required=True) - end_date = forms.DateField(required=True) + topic = forms.ChoiceField( label= _("Topics"), required=True) + init_date = forms.DateField(required=True, label= _("Initial Date")) + end_date = forms.DateField(required=True, label= _("Final Date")) from_mural = forms.BooleanField(required=False, label=_("From Mural")) from_messages = forms.BooleanField(required=False, label=_("Messages")) diff --git a/reports/locale/pt_BR/LC_MESSAGES/django.po b/reports/locale/pt_BR/LC_MESSAGES/django.po index 326219d..f170500 100644 --- a/reports/locale/pt_BR/LC_MESSAGES/django.po +++ b/reports/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-16 16:47-0300\n" +"POT-Creation-Date: 2017-03-16 19:05-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,8 +27,20 @@ msgid "Tag" msgstr "Tag" #: forms.py:36 -msgid "Topics to select data from" -msgstr "Tópico do qual os dados serão retirados" +#, fuzzy +#| msgid "Topic" +msgid "Topics" +msgstr "Tópico" + +#: forms.py:37 templates/reports/view.html:58 +msgid "Initial Date" +msgstr "Data inicial" + +#: forms.py:38 +#, fuzzy +#| msgid "Initial Date" +msgid "Final Date" +msgstr "Data inicial" #: forms.py:40 msgid "From Mural" @@ -56,16 +68,20 @@ msgstr "Esta data deve ser igual ou anterior à" #: templates/reports/_form.html:4 msgid "General Parameters" -msgstr "Parâmetros Gerais" +msgstr "Escolha o Tópico e o Período" #: templates/reports/_form.html:27 -msgid "Data Source" -msgstr "Fonte de dados" +msgid "Choose the Data Source (is possible to pick more than one)" +msgstr "Escolha a fonte de dados (é possível escolher mais de uma)" #: templates/reports/_form.html:60 msgid "Interaction with resources" msgstr "Interação com recursos" +#: templates/reports/_form.html:92 +msgid "Search" +msgstr "Buscar" + #: templates/reports/create.html:27 templates/reports/view.html:33 msgid "Analytics" msgstr "" @@ -76,7 +92,7 @@ msgstr "Dados de Interação" #: templates/reports/create.html:40 templates/reports/view.html:46 msgid "Report Card" -msgstr "Boletim da Etapa" +msgstr "Boletim do Topico" #: templates/reports/create.html:43 templates/reports/view.html:49 msgid "Participation" @@ -98,10 +114,6 @@ msgstr "Assunto" msgid "Topic" msgstr "Tópico" -#: templates/reports/view.html:58 -msgid "Initial Date" -msgstr "Data inicial" - #: templates/reports/view.html:59 msgid "End Date" msgstr "Data final" @@ -196,6 +208,12 @@ msgstr "Classe" msgid "Performance" msgstr "Desempenho" +#~ msgid "Topics to select data from" +#~ msgstr "Tópico do qual os dados serão retirados" + +#~ msgid "Data Source" +#~ msgstr "Escolha a origem dos dados (É possível selecionar mais de uma)" + #~ msgid "sunday" #~ msgstr "domingo" diff --git a/reports/templates/reports/_form.html b/reports/templates/reports/_form.html index 75ec613..a93b58b 100644 --- a/reports/templates/reports/_form.html +++ b/reports/templates/reports/_form.html @@ -19,17 +19,21 @@ {% if field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date' %} - - {% render_field field class='form-control date-picker' %} + + {% render_field field class='form-control date-picker' %} + {% elif field.auto_id == 'id_from_mural' %} -
{% trans "Data Source" %}
- - {% render_field field class='form-control' %} +
{% trans "Choose the Data Source (is possible to pick more than one)" %}
+
+ + + {% render_field field class='form-control ' %} +
{% else %} - - {% render_field field class='form-control' %} + + {% render_field field class='form-control ' %} {% endif %} {% if field.errors %} @@ -77,8 +81,11 @@ {% endif %}
{% for field in resource_tag_form %} - - {% render_field field class="form-control" %} +
+ + {% render_field field class="form-control " %} + +
{% endfor %} @@ -89,7 +96,7 @@
- +
diff --git a/reports/templates/reports/create.html b/reports/templates/reports/create.html index e240b89..d1f8d0b 100644 --- a/reports/templates/reports/create.html +++ b/reports/templates/reports/create.html @@ -58,7 +58,7 @@ var form_topic = $("select#id_topic :selected").filter(":selected").val(); //get user selected topic option $.get("{% url 'subjects:reports:get_resource_and_tags' %}?subject_id={{subject.id}}"+"&topic_choice="+form_topic, function(data){ - fields = object.children("select"); + fields = object.find("select"); //get any select below, which are the two fields of the form for(var j = 0; j < data.resources.length; j++){ fields[0].options[fields[0].options.length] = new Option(data.resources[j].name,data.resources[j].id); -- libgit2 0.21.2