activation page carte for procedure with db attribut use_api_carto is true

This commit is contained in:
Xavier J 2015-09-28 18:55:16 +02:00
parent 97cf5fc605
commit 91e937c247
16 changed files with 232 additions and 208 deletions

View file

@ -0,0 +1,44 @@
class Users::CarteController < ApplicationController
include DossierConcern
def show
@dossier = current_dossier
rescue ActiveRecord::RecordNotFound
redirect_to url_for(controller: :dossiers, action: :index)
end
def save_ref_api_carto
dossier = current_dossier
if dossier.draft?
dossier.update_attributes(ref_dossier_carto: params[:ref_dossier])
redirect_to url_for(controller: :description, action: :show, dossier_id: params[:dossier_id])
else
commentaire_params = {
email: 'Modification localisation',
body: 'La localisation de la demande a été modifiée. Merci de le prendre en compte.',
dossier_id: dossier.id
}
commentaire = Commentaire.new commentaire_params
commentaire.save
redirect_to url_for(controller: :recapitulatif, action: :show, dossier_id: params[:dossier_id])
end
end
def get_position
dossier = current_dossier
if dossier.position_lat.nil?
tmp_position = Carto::Geocodeur.convert_adresse_to_point(dossier.etablissement.adresse.gsub("\r\n", ' '))
if tmp_position.point.nil?
dossier.update_attributes(position_lat: '0', position_lon: '0')
else
dossier.update_attributes(position_lat: tmp_position.point.y, position_lon: tmp_position.point.x)
end
end
render json: { lon: dossier.position_lon, lat: dossier.position_lat, dossier_id: params[:dossier_id] }
end
end

View file

@ -46,7 +46,12 @@ class Users::DossiersController < UsersController
@dossier = Dossier.find(params[:id])
if checked_autorisation_donnees?
@dossier.update_attributes(update_params)
redirect_to url_for(controller: :description, action: :show, dossier_id: @dossier.id)
if @dossier.procedure.use_api_carto
redirect_to url_for(controller: :carte, action: :show, dossier_id: @dossier.id)
else
redirect_to url_for(controller: :description, action: :show, dossier_id: @dossier.id)
end
else
@etablissement = @dossier.etablissement
@entreprise = @dossier.entreprise.decorate