Merge branch 'dev'

This commit is contained in:
gregoirenovel 2018-09-12 15:49:00 +02:00
commit f325fff236
10 changed files with 200 additions and 0 deletions

View file

@ -23,4 +23,8 @@
.message-textarea { .message-textarea {
margin-bottom: $default-spacer; margin-bottom: $default-spacer;
} }
.form input[type="file"] {
margin-bottom: 0;
}
} }

View file

@ -205,6 +205,20 @@ class Admin::ProceduresController < AdminController
render json: json_path_list render json: json_path_list
end end
def check_availability
path = params[:procedure][:path]
procedure_id = params[:procedure][:id]
if procedure_id.present?
procedure = current_administrateur.procedures.find(procedure_id)
@available = procedure.path_available?(path)
@mine = procedure.path_is_mine?(path)
else
@available = !ProcedurePath.exists?(path: path)
@mine = ProcedurePath.mine?(current_administrateur, path)
end
end
def delete_deliberation def delete_deliberation
procedure = Procedure.find(params[:id]) procedure = Procedure.find(params[:id])

View file

@ -44,6 +44,18 @@ module ApplicationHelper
# rubocop:enable Rails/OutputSafety # rubocop:enable Rails/OutputSafety
end end
def disable_element(selector)
# rubocop:disable Rails/OutputSafety
raw("document.querySelector('#{selector}').disabled = true;")
# rubocop:enable Rails/OutputSafety
end
def enable_element(selector)
# rubocop:disable Rails/OutputSafety
raw("document.querySelector('#{selector}').disabled = false;")
# rubocop:enable Rails/OutputSafety
end
def current_email def current_email
current_user&.email || current_user&.email ||
current_gestionnaire&.email || current_gestionnaire&.email ||

View file

@ -120,6 +120,14 @@ class Procedure < ApplicationRecord
publiee_ou_archivee? publiee_ou_archivee?
end end
def path_available?(path)
!ProcedurePath.where.not(procedure: self).exists?(path: path)
end
def path_is_mine?(path)
ProcedurePath.where.not(procedure: self).mine?(administrateur, path)
end
# This method is needed for transition. Eventually this will be the same as brouillon?. # This method is needed for transition. Eventually this will be the same as brouillon?.
def brouillon_avec_lien? def brouillon_avec_lien?
Flipflop.publish_draft? && brouillon? && procedure_path.present? Flipflop.publish_draft? && brouillon? && procedure_path.present?

View file

@ -11,6 +11,11 @@ class ProcedurePath < ApplicationRecord
.find_or_initialize_by(path: path).validate .find_or_initialize_by(path: path).validate
end end
def self.mine?(administrateur, path)
procedure_path = find_by(path: path)
procedure_path && administrateur.owns?(procedure_path)
end
def self.find_with_path(path) def self.find_with_path(path)
joins(:procedure) joins(:procedure)
.where.not(procedures: { aasm_state: :archivee }) .where.not(procedures: { aasm_state: :archivee })

View file

@ -0,0 +1,8 @@
- if mine
Ce lien est déjà utilisé par une de vos procédure.
%br
Si vous voulez lutiliser, lancienne procédure sera archivée (plus accessible du public).
- else
Ce lien est déjà utilisé par une procédure.
%br
Vous ne pouvez pas lutiliser car il appartient à un autre administrateur.

View file

@ -0,0 +1,11 @@
<% if @available %>
<%= remove_element('.unavailable-path-message', inner: true) %>
<%= enable_element('button[type=submit]') %>
<% else %>
<%= render_to_element('.unavailable-path-message', partial: 'unavailable', locals: { mine: @mine }) %>
<% if @mine %>
<%= enable_element('button[type=submit]') %>
<% else %>
<%= disable_element('button[type=submit]') %>
<% end %>
<% end %>

View file

@ -179,6 +179,7 @@ Rails.application.routes.draw do
get 'procedures/archived' => 'procedures#archived' get 'procedures/archived' => 'procedures#archived'
get 'procedures/draft' => 'procedures#draft' get 'procedures/draft' => 'procedures#draft'
get 'procedures/path_list' => 'procedures#path_list' get 'procedures/path_list' => 'procedures#path_list'
get 'procedures/available' => 'procedures#check_availability'
get 'profile' => 'profile#show', as: :profile get 'profile' => 'profile#show', as: :profile
post 'renew_api_token' => 'profile#renew_api_token', as: :renew_api_token post 'renew_api_token' => 'profile#renew_api_token', as: :renew_api_token

View file

@ -0,0 +1,89 @@
namespace :'2018_09_12_ftap' do
task :run do
procedure = Procedure.find(5812)
dossiers = procedure.dossiers.all
labels_for_text_tdc = [
'Bref descriptif du projet',
'Montant et nature des économies générées',
'Contacts en cours avec les porteurs de projets'
]
labels_for_text_tdc.each_with_index { |l, i| add_first_text(procedure, dossiers, l, i) }
ditp_private_tdc_order_place = procedure.types_de_champ_private.find_by(libelle: 'Avis DITP').order_place
labels_for_mark_before_DITP = [
'Ambition usagers/agents',
'Caractère stratégique et novateur',
'Gouvernance'
]
labels_for_mark_before_DITP.each_with_index { |l, i| add_mark(procedure, dossiers, l, ditp_private_tdc_order_place + i) }
change_to_select_with_number(procedure, 'Avis DINSIC')
change_to_select_with_number(procedure, 'Avis DB')
change_option_for_avis_tdc(procedure)
end
def change_option_for_avis_tdc(procedure)
drop_down_list = procedure.types_de_champ_private.find_by(libelle: 'Avis', type_champ: 'drop_down_list').drop_down_list
drop_down_list.update(value: "Favorable\r\nDéfavorable\r\nFavorable avec réserves\r\nFavorable avec réserves - stratégique")
end
def add_first_text(procedure, dossiers, libelle, order_place)
if procedure.types_de_champ_private.find_by(libelle: libelle).nil?
move_down_tdc_below(procedure, order_place)
tdc = TypesDeChamp::TextareaTypeDeChamp.create!(
libelle: libelle,
type_champ: 'textarea',
procedure: procedure,
order_place: order_place,
private: true
)
procedure.types_de_champ_private << tdc
dossiers.each do |dossier|
dossier.champs << Champs::TextareaChamp.create!(type_de_champ: tdc, private: true)
end
end
end
def add_mark(procedure, dossiers, libelle, order_place)
if procedure.types_de_champ_private.find_by(libelle: libelle).nil?
move_down_tdc_below(procedure, order_place)
tdc = TypesDeChamp::DropDownListTypeDeChamp.create!(
libelle: libelle,
type_champ: 'drop_down_list',
procedure: procedure,
order_place: order_place,
private: true
)
DropDownList.create!(value: "0\r\n1\r\n2\r\n3\r\n4", type_de_champ: tdc)
procedure.types_de_champ_private << tdc
dossiers.each do |dossier|
dossier.champs << Champs::DropDownListChamp.create!(type_de_champ: tdc, private: true)
end
end
end
def move_down_tdc_below(procedure, order_place)
tdcs_to_move_down = procedure.types_de_champ_private.where('order_place >= ?', order_place)
tdcs_to_move_down.each do |tdc|
tdc.update(order_place: (tdc.order_place + 1))
end
end
def change_to_select_with_number(procedure, libelle)
drop_down_list = procedure.types_de_champ_private.find_by(libelle: libelle, type_champ: 'drop_down_list').drop_down_list
drop_down_list.update(value: "0\r\n1\r\n2\r\n3\r\n4")
end
end

View file

@ -721,4 +721,52 @@ describe Admin::ProceduresController, type: :controller do
it { expect(procedure.deliberation.attached?).to eq(false) } it { expect(procedure.deliberation.attached?).to eq(false) }
it { expect(response).to redirect_to(edit_admin_procedure_path(procedure)) } it { expect(response).to redirect_to(edit_admin_procedure_path(procedure)) }
end end
describe "GET #check_availability" do
render_views
let(:procedure) { create(:procedure, :with_path, administrateur: admin) }
let(:params) {
{
procedure: {
path: path,
id: procedure.id
}
}
}
let(:path) { generate(:published_path) }
before do
get :check_availability, params: params, format: 'js'
end
context 'self path' do
let(:path) { procedure.path }
it { expect(response.body).to include("innerHTML = ''") }
end
context 'available path' do
it { expect(response.body).to include("innerHTML = ''") }
end
context 'my path' do
let(:procedure_owned) { create(:procedure, :with_path, administrateur: admin) }
let(:path) { procedure_owned.path }
it {
expect(response.body).to include('Ce lien est déjà utilisé par une de vos procédure.')
expect(response.body).to include('Si vous voulez lutiliser, lancienne procédure sera archivée')
}
end
context 'unavailable path' do
let(:procedure_not_owned) { create(:procedure, :with_path, administrateur: create(:administrateur)) }
let(:path) { procedure_not_owned.path }
it {
expect(response.body).to include('Ce lien est déjà utilisé par une procédure.')
expect(response.body).to include('Vous ne pouvez pas lutiliser car il appartient à un autre administrateur.')
}
end
end
end end