DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Code review

Browse source
This commit is contained in:
Xavier J 2015-11-30 17:03:36 +01:00
parent 58f840ac92
commit 141e23a381
18 changed files with 47 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/procedures_controller.rb
View file

@ -2,12 +2,12 @@ class Admin::ProceduresController < AdminController
def index
@procedures = current_administrateur.procedures.where(archived: false)
@procedures = @procedures.paginate(:page => params[:page], :per_page => 12)
@procedures = @procedures.paginate(:page => params[:page])
end
def archived
@procedures_archived = current_administrateur.procedures.where(archived: true)
@procedures_archived = @procedures_archived.paginate(:page => params[:page], :per_page => 12)
@procedures_archived = @procedures_archived.paginate(:page => params[:page])
end
def show

8
app/controllers/backoffice/dossiers_controller.rb
View file

@ -7,20 +7,20 @@ class Backoffice::DossiersController < ApplicationController
def a_traiter
@dossiers_a_traiter = current_gestionnaire.dossiers.waiting_for_gestionnaire()
@dossiers_a_traiter = @dossiers_a_traiter.paginate(:page => params[:page], :per_page => 12).decorate
@dossiers_a_traiter = @dossiers_a_traiter.paginate(:page => params[:page]).decorate
total_dossiers_per_state
end
def en_attente
@dossiers_en_attente = current_gestionnaire.dossiers.waiting_for_user()
@dossiers_en_attente = @dossiers_en_attente.paginate(:page => params[:page], :per_page => 12).decorate
@dossiers_en_attente = @dossiers_en_attente.paginate(:page => params[:page]).decorate
total_dossiers_per_state
end
def termine
@dossiers_termine = current_gestionnaire.dossiers.termine()
@dossiers_termine = @dossiers_termine.paginate(:page => params[:page], :per_page => 12).decorate
@dossiers_termine = @dossiers_termine.paginate(:page => params[:page]).decorate
total_dossiers_per_state
end
@ -30,7 +30,7 @@ class Backoffice::DossiersController < ApplicationController
@dossiers_search, @dossier = Dossier.search(current_gestionnaire, @search_terms)
unless @dossiers_search.empty?
@dossiers_search = @dossiers_search.paginate(:page => params[:page], :per_page => 12).decorate
@dossiers_search = @dossiers_search.paginate(:page => params[:page]).decorate
end
@dossier = @dossier.decorate unless @dossier.nil?

9
app/controllers/users/carte_controller.rb
View file

@ -11,10 +11,10 @@ class Users::CarteController < UsersController
def save
dossier = current_user_dossier
dossier.quartier_prioritaires.all.map(&:destroy)
dossier.quartier_prioritaires.map(&:destroy)
unless params[:json_latlngs] == '' || params[:json_latlngs] == '[]'
qp_list = generate_qp JSON.parse(params[:json_latlngs]);
unless params[:json_latlngs].blank?
qp_list = generate_qp JSON.parse(params[:json_latlngs])
qp_list.each do |key, qp|
qp.merge!({dossier_id: dossier.id})
@ -33,8 +33,7 @@ class Users::CarteController < UsersController
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
Commentaire.create commentaire_params
redirect_to url_for(controller: :recapitulatif, action: :show, dossier_id: params[:dossier_id])
end
end

13
app/controllers/users/dossiers_controller.rb
View file

@ -16,7 +16,6 @@ class Users::DossiersController < UsersController
end
def create
procedure = Procedure.find(params['procedure_id'])
@etablissement = Etablissement.new(SIADE::EtablissementAdapter.new(siret).to_params)
@entreprise = Entreprise.new(SIADE::EntrepriseAdapter.new(siren).to_params)
@ -30,11 +29,7 @@ class Users::DossiersController < UsersController
end
end
@dossier = Dossier.create(user: current_user)
@dossier.draft!
@dossier.procedure = procedure
@dossier.save
@dossier = Dossier.create(user: current_user, state: 'draft', procedure_id: params['procedure_id'])
@entreprise.dossier = @dossier
@entreprise.save
@ -90,7 +85,7 @@ class Users::DossiersController < UsersController
params[:page] = 1 if params[:page].nil?
@dossiers = @dossiers.paginate(:page => params[:page], :per_page => 12).decorate
@dossiers = @dossiers.paginate(:page => params[:page]).decorate
total_dossiers_per_state
end
@ -100,7 +95,7 @@ class Users::DossiersController < UsersController
params[:page] = 1 if params[:page].nil?
@dossiers = @dossiers.paginate(:page => params[:page], :per_page => 12).decorate
@dossiers = @dossiers.paginate(:page => params[:page]).decorate
total_dossiers_per_state
end
@ -110,7 +105,7 @@ class Users::DossiersController < UsersController
params[:page] = 1 if params[:page].nil?
@dossiers = @dossiers.paginate(:page => params[:page], :per_page => 12).decorate
@dossiers = @dossiers.paginate(:page => params[:page]).decorate
total_dossiers_per_state
end