Merge pull request #980 from consul/undefined-feasibility

adds radio to mark feasibility as undefined (nil)

app/controllers/valuation/spending_proposals_controller.rb

@@ -27,6 +27,8 @@ class Valuation::SpendingProposalsController < Valuation::BaseController
   private
 
     def valuation_params
+      params[:spending_proposal][:feasible] = nil if params[:spending_proposal][:feasible] == 'nil'
+
       params.require(:spending_proposal).permit(:price, :price_first_year, :price_explanation, :feasible, :feasible_explanation, :time_scope, :valuation_finished, :internal_comments)
     end
 

app/views/valuation/spending_proposals/edit.html.erb

@@ -7,14 +7,21 @@
     <div class="small-12 medium-8 column">
       <fieldset class="fieldset">
         <legend><%= t('valuation.spending_proposals.edit.feasibility') %></legend>
-        <div class="small-6 column">
+        <div class="small-4 column">
+            <span class="checkbox">
+              <%= f.radio_button :feasible, :nil, label: false, checked: @spending_proposal.feasible.nil? %>
+              <%= f.label :feasible_nil, t('valuation.spending_proposals.edit.undefined_feasible') %>
+            </span>
+        </div>
+
+        <div class="small-4 column">
             <span class="checkbox">
               <%= f.radio_button :feasible, true, value: true, label: false %>
               <%= f.label :feasible_true, t('valuation.spending_proposals.edit.feasible') %>
             </span>
         </div>
 
-        <div class="small-6 column">
+        <div class="small-4 column">
             <span class="checkbox">
               <%= f.radio_button :feasible, false, value: false, label: false %>
               <%= f.label :feasible_false, t('valuation.spending_proposals.edit.not_feasible') %>

config/locales/valuation.en.yml

@@ -49,6 +49,7 @@ en:
         feasibility: Feasibility
         feasible: Feasible
         not_feasible: Not feasible
+        undefined_feasible: Pending
         feasible_explanation_html: Feasibility explanation
         valuation_finished: Valuation finished
         time_scope_html: Time scope

config/locales/valuation.es.yml

@@ -48,7 +48,8 @@ es:
         price_explanation_html: "Informe de coste <small>(opcional, dato público)</small>"
         feasibility: Viabilidad
         feasible: Viable
-        not_feasible: No viable
+        not_feasible: Inviable
+        undefined_feasible: Sin decidir
         feasible_explanation_html: "Informe de inviabilidad <small>(en caso de que lo sea, dato público)</small>"
         valuation_finished: Informe finalizado
         time_scope_html: "Plazo de ejecución <small>(opcional, dato no público)</small>"

spec/features/valuation/spending_proposals_spec.rb

@@ -269,6 +269,25 @@ feature 'Valuation spending proposals' do
       expect(page).to have_content('Should be double checked by the urbanism area')
     end
 
+    scenario 'Feasibility can be marked as pending' do
+      visit valuation_spending_proposal_path(@spending_proposal)
+      click_link 'Edit dossier'
+
+      expect(find "#spending_proposal_feasible_nil").to be_checked
+      choose 'spending_proposal_feasible_true'
+      click_button 'Save changes'
+
+      visit edit_valuation_spending_proposal_path(@spending_proposal)
+      expect(find "#spending_proposal_feasible_nil").to_not be_checked
+      expect(find "#spending_proposal_feasible_true").to be_checked
+
+      choose 'spending_proposal_feasible_nil'
+      click_button 'Save changes'
+
+      visit edit_valuation_spending_proposal_path(@spending_proposal)
+      expect(find "#spending_proposal_feasible_nil").to be_checked
+    end
+
     scenario 'Finish valuation' do
       visit valuation_spending_proposal_path(@spending_proposal)
       click_link 'Edit dossier'