decidim 0.0.2 → 0.0.3

data/decidim-proposals/app/models/decidim/proposals/proposal_vote.rb

@@ -6,6 +6,7 @@ module Decidim
       belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: Decidim::Proposals::Proposal, counter_cache: true
       belongs_to :author, foreign_key: "decidim_author_id", class_name: Decidim::User
 
+      validates :proposal, :author, presence: true
       validates :proposal, uniqueness: { scope: :author }
       validate :author_and_proposal_same_organization
 
@@ -13,6 +14,7 @@ module Decidim
 
       # Private: check if the proposal and the author have the same organization
       def author_and_proposal_same_organization
+        return if !proposal || !author
         errors.add(:proposal, :invalid) unless author.organization == proposal.organization
       end
     end

data/decidim-proposals/app/services/decidim/proposals/proposal_search.rb

@@ -46,6 +46,17 @@ module Decidim
         end
       end
 
+      # Handle the state filter
+      def search_state
+        if state == "accepted"
+          query.accepted
+        elsif state == "rejected"
+          query.rejected
+        else # Assume 'all'
+          query
+        end
+      end
+
       # Returns the random proposals for the current page.
       def results
         @proposals ||= Proposal.transaction do

data/decidim-proposals/app/views/decidim/proposals/admin/proposal_answers/edit.html.erb

@@ -0,0 +1,15 @@
+<h3><%= t ".title", title: proposal.title %></h3>
+
+<%= form_for(@form, url: proposal_proposal_answer_path(proposal, @form)) do |f| %>
+  <div class="field">
+    <%= f.collection_radio_buttons :state, [["accepted", t('.accepted')], ["rejected", t('.rejected')]], :first, :last, prompt: true %>
+  </div>
+
+  <div class="field">
+    <%= f.translated :text_area, :answer, autofocus: true, rows: 15 %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit t(".answer_proposal") %>
+  </div>
+<% end %>

data/decidim-proposals/app/views/decidim/proposals/admin/proposals/index.html.erb

@@ -10,6 +10,8 @@
       <th><%= t("models.proposal.fields.title", scope: "decidim.proposals") %></th>
       <th><%= t("models.proposal.fields.category", scope: "decidim.proposals") %></th>
       <th><%= t("models.proposal.fields.scope", scope: "decidim.proposals") %></th>
+      <th><%= t("models.proposal.fields.state", scope: "decidim.proposals") %></th>
+      <th class="actions"><%= t("actions.title", scope: "decidim.proposals") %></th>
     </tr>
   </thead>
   <tbody>
@@ -28,6 +30,12 @@
             <%= translated_attribute proposal.scope.name %>
           <% end %>
         </td>
+        <td>
+          <%= humanize_proposal_state proposal.state %>
+        </td>
+        <td class="actions">
+          <%= link_to t("actions.answer", scope: "decidim.proposals"), edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id) if can? :update, current_feature %>
+        </td>
       </tr>
     <% end %>
   </tbody>

data/decidim-proposals/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb

@@ -0,0 +1,20 @@
+var $proposalVotesCount = $('#proposal-<%= proposal.id %>-votes-count');
+var $proposalVoteButton = $('#proposal-<%= proposal.id %>-vote-button');
+
+$proposalVotesCount.html('<%= j(render partial: 'decidim/proposals/proposals/votes_count', locals: { proposal: proposal, from_proposals_list: @from_proposals_list }) %>');
+$proposalVoteButton.html('<%= j(render partial: 'decidim/proposals/proposals/vote_button', locals: { proposal: proposal, from_proposals_list: @from_proposals_list }) %>');
+
+<% if vote_limit_enabled? %>
+  var $remainingVotesCount = $('#remaining-votes-count');
+  var $notVotedButtons = $('.card__button.button').not('.success');
+
+  $remainingVotesCount.html('<%= j(render partial: 'decidim/proposals/proposals/remaining_votes_count') %>');
+
+  <% if remaining_votes_count_for(current_user) == 0 %>
+    $notVotedButtons.attr('disabled', true);
+    $notVotedButtons.val('<%= t('decidim.proposals.proposals.vote_button.no_votes_remaining') %>');
+  <% else %>
+    $notVotedButtons.attr('disabled', false);
+    $notVotedButtons.val('<%= t('decidim.proposals.proposals.vote_button.vote') %>');
+  <% end %>
+<% end %>

data/decidim-proposals/app/views/decidim/proposals/proposals/_filters.html.erb

@@ -14,12 +14,14 @@
 
   <%= form.collection_radio_buttons :origin, [["all", t('.all')], ["official", t('.official')], ["citizenship", t('.citizenship')]], :first, :last, legend_title: t('.origin') %>
 
+  <%= form.collection_radio_buttons :state, [["all", t('.all')], ["accepted", t('.accepted')], ["rejected", t('.rejected')]], :first, :last, legend_title: t('.state') %>
+
   <% if current_user && current_settings.votes_enabled? %>
     <%= form.collection_check_boxes :activity, [["voted", t('.voted')]], :first, :last, legend_title: t('.activity') %>
   <% end %>
 
   <% if current_feature.categories.any? %>
-    <%= form.categories_select :category_id, current_feature.categories, legend_title: t('.category'), disable_parents: false, label: false, include_blank: true %>  
+    <%= form.categories_select :category_id, current_feature.categories, legend_title: t('.category'), disable_parents: false, label: false, include_blank: true %>
   <% end %>
 
   <%= form.hidden_field :random_seed %>

data/decidim-proposals/app/views/decidim/proposals/proposals/_filters_small_view.html.erb

@@ -0,0 +1,18 @@
+<div class="filters-controls hide-for-mediumlarge">
+  <button data-open="filter-box" class="filters-controls__trigger">
+    <%= t ".filter" %>
+    <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t('.unfold'), role: "img" %>
+  </button>
+</div>
+
+<div class="reveal" id="filter-box" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t ".filter_for" %>:</h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="filters">
+    <%= render partial: "filters" %>
+  </div>
+</div>

data/decidim-proposals/app/views/decidim/proposals/proposals/_linked_proposals.html.erb

@@ -0,0 +1,27 @@
+<div class="card card--action card--list">
+  <% resources.each do |proposal| %>
+    <div class="card--list__item">
+      <div class="card--list__text">
+        <%= link_to decidim_resource_path(proposal) do %>
+          <%= icon "proposals", class: "card--list__icon", remove_icon_class: true %>
+        <% end %>
+        <div>
+          <%= link_to decidim_resource_path(proposal), class: "card__link" do %>
+            <h5 class="card--list__heading"><%= proposal.title %></h5>
+          <% end %>
+          <div class="author">
+            <span class="author__avatar">
+              <%= image_tag proposal.author_avatar_url %>
+            </span>
+            <span class="author__name">
+              <%= proposal.author_name %>
+            </span>
+          </div>
+        </div>
+      </div>
+      <div class="card--list__data">
+        <%==t(".proposal_votes", count: proposal.votes.size) %>
+      </div>
+    </div>
+  <% end %>
+</div>

data/decidim-proposals/app/views/decidim/proposals/proposals/_proposal.html.erb

@@ -17,6 +17,7 @@
           </div>
         </div>
       </div>
+      <%= render partial: "proposal_badge", locals: { proposal: proposal } %>
       <p><%= truncate(proposal.body, length: 100) %></p>
       <% if proposal.category %>
         <ul class="tags tags--proposal">
@@ -33,9 +34,9 @@
           <div id="proposal-<%= proposal.id %>-vote-button"> 
             <%= render partial: "vote_button", locals: { proposal: proposal, from_proposals_list: true } %>
           </div>
-        <% else %>
+        <% elsif !current_settings.votes_enabled? || current_settings.votes_enabled? && current_settings.votes_blocked? %>
           <div class="card__support__data"></div>
-          <%= link_to t(".view_proposal"), proposal, class: "card__button button small secondary" %>  
+          <%= link_to t(".view_proposal"), proposal, class: "card__button button small secondary" %>
         <% end %>
       </div>
     </div>

data/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_badge.html.erb

@@ -0,0 +1,3 @@
+<% if proposal.answered? %>
+  <span class="<%= (proposal.accepted? ? 'success' : 'warning') %> label proposal-status"><%= humanize_proposal_state proposal.state %></span>
+<% end %>

data/decidim-proposals/app/views/decidim/proposals/proposals/_remaining_votes_count.html.erb

@@ -0,0 +1 @@
+<%= remaining_votes_count_for(current_user) %>

data/decidim-proposals/app/views/decidim/proposals/proposals/_share.html.erb

@@ -1,5 +1,5 @@
 <div class="text-center">
-  <button class="link text-center" data-open="processShare">
+  <button class="share-link link text-center" data-open="processShare">
     <%= t(".share") %>
     <%= icon "share", class: "icon--after"%>
   </button>

data/decidim-proposals/app/views/decidim/proposals/proposals/_vote_button.html.erb

@@ -1,10 +1,22 @@
 <% if current_user %>
   <% if proposal.voted_by? current_user %>
-    <button class="card__button button <%= vote_button_classes(from_proposals_list) %> success">
-      <%= t('.already_voted') %>
-    </button>
+    <% if vote_limit_enabled? %>
+      <%= button_to t('.already_voted'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), method: :delete, remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)} success" %>
+    <% else %>
+      <button class="card__button button <%= vote_button_classes(from_proposals_list) %> success">
+        <%= t('.already_voted') %>
+      </button>
+    <% end %>
   <% else %>
-    <%= button_to t('.vote'), proposal_proposal_votes_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
+    <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+      <%= button_to t('.no_votes_remaining'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}", disabled: true %>
+    <% elsif current_settings.votes_blocked? %>
+      <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled">
+        <%= t('.votes_blocked') %>
+      </button>
+    <% else %>
+      <%= button_to t('.vote'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
+    <% end %>
   <% end %>
 <% else %>
   <button class="card__button button <%= vote_button_classes(from_proposals_list) %>" data-toggle="loginModal">

data/decidim-proposals/app/views/decidim/proposals/proposals/_votes_limit.html.erb

@@ -0,0 +1,23 @@
+<% if vote_limit_enabled? %>
+  <div class="row column">
+    <div class="callout secondary">
+      <div class="row">
+        <div class="columns medium-8 large-9">
+          <h3 class="heading3"><%= t('.vote_limit.title', limit: feature_settings.vote_limit) %></h3>
+          <p><%= t('.vote_limit.description', limit: feature_settings.vote_limit) %></p>
+        </div>
+        <div class="columns medium-4 large-3">
+          <div class="card card--nomargin text-center">
+            <div class="card__content">
+              <span class="definition-data__title"><%= t('.vote_limit.left', limit: feature_settings.vote_limit) %></span>
+              <span id="remaining-votes-count" class="extra__suport-number">
+                <%= render partial: "remaining_votes_count" %>
+              </span>
+              <span class="extra__suport-text"><%= t('.vote_limit.votes') %></span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+<% end %>

data/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb

@@ -1,16 +1,25 @@
+<%= render partial: "votes_limit" %>
 <div class="row columns">
   <div class="title-action">
     <h2 id="proposals-count" class="title-action__title section-heading">
       <%= render partial: "count" %>
     </h2>
-    <%= link_to new_proposal_path, class: "title-action__action button small hollow" do %>
-      <%= t(".new_proposal") %>
-      <%= icon "plus" %>
+    <% if can? :create, Decidim::Proposals::Proposal %>
+      <%= link_to new_proposal_path, class: "title-action__action button small hollow" do %>
+        <%= t(".new_proposal") %>
+        <%= icon "plus" %>
+      <% end %>
+    <% else %>
+      <span class="title-action__action button small hollow disabled">
+        <%= t(".new_proposal") %>
+        <%= icon "plus" %>
+      </span>
     <% end %>
   </div>
 </div>
 <div class="row">
   <div class="columns mediumlarge-4 large-3">
+    <%= render partial: "filters_small_view" %>
     <div class="card card--secondary show-for-mediumlarge" >
       <%= render partial: "filters" %>
     </div>
@@ -20,4 +29,5 @@
   </div>
 </div>
 
+<%= javascript_include_tag("decidim/filters") %>
 <%= render partial: "decidim/shared/login_modal" %>

data/decidim-proposals/app/views/decidim/proposals/proposals/new.html.erb

@@ -30,6 +30,12 @@
             </div>
           <% end %>
 
+          <% if current_user.user_groups.verified.any? %>
+            <div class="field">
+              <%= form.select :user_group_id, current_user.user_groups.verified.map{|g| [g.name, g.id]}, prompt: current_user.name %>
+            </div>
+          <% end %>
+
           <div class="actions">
             <%= form.submit t(".send"), class: "button expanded" %>
           </div>

data/decidim-proposals/app/views/decidim/proposals/proposals/show.html.erb

@@ -3,6 +3,7 @@
 <% content_for :meta_url, proposal_url(@proposal.id) %>
 <% content_for :twitter_handler, current_organization.twitter_handler %>
 
+<%= render partial: "votes_limit" %>
 <div class="row column view-header">
   <h2 class="heading2"><%= @proposal.title %></h2>
   <div class="author-data">
@@ -27,7 +28,7 @@
             <div id="proposal-<%= @proposal.id %>-votes-count">
               <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
             </div>
-            <div id="proposal-<%= @proposal.id %>-vote-button"> 
+            <div id="proposal-<%= @proposal.id %>-vote-button">
               <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } %>
             </div>
         </div>
@@ -37,6 +38,7 @@
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
+      <%= render partial: "proposal_badge", locals: { proposal: @proposal } %>
       <p><%= @proposal.body %></p>
       <% if @proposal.category || @proposal.scope %>
         <ul class="tags tags--proposal">
@@ -49,11 +51,22 @@
         </ul>
       <% end %>
     </div>
+    <% if @proposal.rejected? %>
+      <div class="section">
+        <div class="callout warning">
+          <h5><%= t(".proposal_rejected_reason") %></h5>
+          <p><%= translated_attribute @proposal.answer %></p>
+        </div>
+      </div>
+    <% end %>
+    <%= linked_resources_for @proposal, :results, "included_proposals" %>
+    <%= linked_resources_for @proposal, :projects, "included_proposals" %>
+    <%= linked_resources_for @proposal, :meetings, "proposals_from_meeting" %>
   </div>
 </div>
 
 <%= content_for :expanded do %>
-  <% if @proposal.commentable? %>
+  <% if feature_settings.comments_always_enabled || current_settings.comments_enabled %>
     <%= comments_for @proposal, arguable: true, votable: true %>
   <% end %>
 <% end %>

data/decidim-proposals/config/i18n-tasks.yml

@@ -3,3 +3,6 @@ locales: [en]
 ignore_unused:
 - "decidim.features.proposals.name"
 - "decidim.features.proposals.settings.*"
+- "decidim.resource_links.*"
+- "activemodel.attributes.proposal.*"
+- "decidim.proposals.answers.*"

data/decidim-proposals/config/locales/ca.yml

@@ -1,19 +1,40 @@
 ca:
+  activemodel:
+    attributes:
+      proposal:
+        body: Cos
+        category_id: Categoria
+        scope_id: Àmbit
+        title: Títol
+        user_group_id: Crear proposta
   decidim:
     features:
       proposals:
         name: Propostes
         settings:
           step:
+            creation_enabled: Habilitar de creació de propostes
+            votes_blocked: Vots bloquejats
             votes_enabled: Vots habilitats
     proposals:
       actions:
+        answer: Respondre
         new: Nova proposta
+        title: Accions
       admin:
         models:
           proposal:
             name: Proposta
+        proposal_answers:
+          edit:
+            accepted: Acceptada
+            answer_proposal: Resposta de la proposta
+            rejected: Rebutjada
+            title: Respondre a la proposta %{title}
         proposals:
+          answer:
+            invalid: Hi ha hagut un problema en respondre a aquesta proposta
+            success: Proposta resposta amb èxit
           create:
             invalid: Hi ha hagut un problema en crear aquesta proposta
             success: Proposta creada correctament
@@ -25,6 +46,10 @@ ca:
           new:
             create: Crear proposta
             title: Nova proposta
+      answers:
+        accepted: Acceptada
+        not_answered: No resposta
+        rejected: Rebutjada
       create:
         error: Hi ha hagut errors en desar la proposta.
         success: Proposta creada correctament.
@@ -34,6 +59,7 @@ ca:
             category: Categoria
             official_proposal: Proposta oficial
             scope: Àmbit
+            state: Estat
             title: Títol
       proposals:
         count:
@@ -41,16 +67,28 @@ ca:
             one: 1 proposta
             other: "%{count} propostes"
         filters:
+          accepted: Acceptades
           activity: Activitat
           all: Tots
           category: Categoria
           citizenship: Ciutadania
           official: Oficial
           origin: Origen
+          rejected: Rebutjades
           search: Cerca
+          state: Estat
           voted: Votat
+        filters_small_view:
+          close_modal: Tancar finestra
+          filter: Filtra
+          filter_for: Filtrar per
+          unfold: Desplegar
         index:
           new_proposal: Nova proposta
+        linked_proposals:
+          proposal_votes:
+            one: <span class="card--list__data__number">1</span>vot
+            other: <span class="card--list__data__number">%{count}</span>vots
         new:
           back: Enrere
           select_a_category: Si us plau, seleccioni una categoria
@@ -63,10 +101,25 @@ ca:
           close_window: Tanca la finestra
           share: Compartir
           share_link: Comparteix l'enllaç
+        show:
+          proposal_rejected_reason: 'Aquesta proposta ha estat rebutjada perquè:'
         vote_button:
           already_voted: Ja has votat
+          no_votes_remaining: No hi ha vots restants
           vote: Votar
+          votes_blocked: Votació desactivada
         votes_count:
           count:
             one: VOT
-            other: VOTS
+            other: VOTS
+        votes_limit:
+          vote_limit:
+            description: En lloc de votar tantes propostes com vulgui, només es pot votar fins %{limit} propostes.
+            left: Restant
+            title: Té %{limit} vots a distribuir
+            votes: Vots
+    resource_links:
+      included_proposals:
+        results: 'La proposta apareix en aquests resultats:'
+      proposals_from_meeting:
+        meetings: Trobades relacionades