Adding organization to the questionary

ciudadanointeligente · Apr 13, 2016 · b77e12c · b77e12c
1 parent 3c4ec4e
commit b77e12c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/popular_proposal/forms.py b/popular_proposal/forms.py
@@ -65,6 +65,7 @@ class ProposalFormBase(forms.Form):
                                                                    ciudadana. Ej: 50% más de ciclovías para la comuna"))
     clasification = forms.ChoiceField(choices=TOPIC_CHOICES, label=_(u'¿Cómo clasificarías tu propuesta?'))
     allies = forms.CharField(label=_(u'¿Quiénes son tus posibles aliados?'))
+    organization = forms.CharField(label=_(u'¿Estás haciendo esta propuesta a nombre de una organización? Escribe su nombre acá:'))
 
 
 class ProposalForm(ProposalFormBase):

diff --git a/votai_general_theme/templates/backend_citizen/index.html b/votai_general_theme/templates/backend_citizen/index.html
@@ -24,6 +24,7 @@ <h1>{% blocktrans %}¡Bienvenid@ {{user}}!{% endblocktrans %}</h1>
             <td>Solución</td>
             <td>Cuándo?</td>
             <td>Aliados</td>
+            <td>Organización</td>
             <td>Estado</td>
         </tr>
     {% for proposal in temporary_proposals %}
@@ -41,6 +42,9 @@ <h1>{% blocktrans %}¡Bienvenid@ {{user}}!{% endblocktrans %}</h1>
             <td>{{proposal.data.allies}}
                 {% include 'popular_proposal/_show_proposal_comments_to_user.html' with comments=proposal.comments.allies %}
             </td>
+            <td>{{proposal.data.organization}}
+                {% include 'popular_proposal/_show_proposal_comments_to_user.html' with comments=proposal.comments.organization %}
+            </td>
             <td>
                 {% if proposal.status == 'in_our_side' %}
                 {% blocktrans %}<span class="label label-default"><i class="fa fa-clock-o"></i> Esperando moderación</span>{% endblocktrans %}     

diff --git a/votai_general_theme/templates/backend_staff/index.html b/votai_general_theme/templates/backend_staff/index.html
@@ -26,6 +26,7 @@ <h2>{% blocktrans %}¡Eres parte de nuestro equipo!{% endblocktrans %}</h2>
             <td>Solución</td>
             <td>Cuándo?</td>
             <td>Aliados</td>
+            <td>Organización</td>
             <td>Acciones</td>
         </tr>
     {% for proposal in proposals.all %}
@@ -37,6 +38,9 @@ <h2>{% blocktrans %}¡Eres parte de nuestro equipo!{% endblocktrans %}</h2>
             </td>
             <td>{{proposal.data.when|popular_proposal_when}}{% include 'popular_proposal/_show_proposal_comments.html' with comments=proposal.comments.when %}
             </td>
+            <td>
+                {{proposal.data.organization}}{% include 'popular_proposal/_show_proposal_comments.html' with comments=proposal.comments.organization %}
+            </td>
             <td>{{proposal.data.allies}}{% include 'popular_proposal/_show_proposal_comments.html' with comments=proposal.comments.allies %}
             </td>
             <td>