activation page carte for procedure with db attribut use_api_carto is true
This commit is contained in:
parent
97cf5fc605
commit
91e937c247
16 changed files with 232 additions and 208 deletions
|
@ -155,13 +155,13 @@ function onDocumentReady() { if (typeof L != 'undefined' && typeof L.drawLocal !
|
|||
}
|
||||
});**/
|
||||
});
|
||||
map.spin(true);
|
||||
$.ajax({
|
||||
url: 'http://apicarto.coremaps.com/zoneville/api/beta/qp/mapservice',
|
||||
datatype: 'json',
|
||||
jsonCallback: 'getJson',
|
||||
success: loadGeoJson
|
||||
});
|
||||
//map.spin(true);
|
||||
//$.ajax({
|
||||
// url: 'http://apicarto.coremaps.com/zoneville/api/beta/qp/mapservice',
|
||||
// datatype: 'json',
|
||||
// jsonCallback: 'getJson',
|
||||
// success: loadGeoJson
|
||||
//});
|
||||
window.geom_inter = {index: []};
|
||||
|
||||
function style(feature) {
|
||||
|
|
|
@ -4,7 +4,7 @@ function get_position(){
|
|||
var position;
|
||||
|
||||
$.ajax({
|
||||
url: '/dossiers/'+dossier_id+'/carte/position',
|
||||
url: '/users/dossiers/'+dossier_id+'/carte/position',
|
||||
dataType: 'json',
|
||||
async: false
|
||||
}).done(function (data) {
|
||||
|
|
|
@ -1,15 +1,16 @@
|
|||
class CarteController < ApplicationController
|
||||
class Users::CarteController < ApplicationController
|
||||
include DossierConcern
|
||||
|
||||
def show
|
||||
@dossier = current_dossier
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
redirect_to url_for(controller: :siret, action: :error_dossier)
|
||||
redirect_to url_for(controller: :dossiers, action: :index)
|
||||
end
|
||||
|
||||
def save_ref_api_carto
|
||||
dossier = current_dossier
|
||||
if dossier.ref_dossier_carto.blank?
|
||||
|
||||
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
|
|
@ -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
|
||||
|
|
|
@ -7,14 +7,13 @@
|
|||
.content
|
||||
#map_qp{style: 'height:600px; width: 100%;'}
|
||||
|
||||
= form_tag(url_for({controller: :carte, action: :save_ref_api_carto}), class: 'form-inline', method: 'POST') do
|
||||
= form_tag(url_for({controller: :carte, action: :save_ref_api_carto, dossier_id: @dossier.id}), class: 'form-inline', method: 'POST') do
|
||||
%br
|
||||
%input{type: 'hidden', value: '', name: 'ref_dossier', id: 'ref_dossier'}
|
||||
%input{type: 'hidden', value: request.parameters[:back_url], name: 'back_url', id: 'back_url'}
|
||||
|
||||
-if request.parameters[:back_url] == 'recapitulatif'
|
||||
=render partial: '/layouts/modifications_terminees'
|
||||
-else
|
||||
-if @dossier.draft?
|
||||
=render partial: '/layouts/etape_suivante'
|
||||
-else
|
||||
=render partial: '/layouts/modifications_terminees'
|
||||
|
||||
=render partial: 'carte_sources_JS'
|
Loading…
Add table
Add a link
Reference in a new issue