Rename demarche archivée to demarche close

This commit is contained in:
Paul Chavard 2019-11-14 09:43:45 +01:00
parent 143a8c7c55
commit 7b947feae4
40 changed files with 140 additions and 138 deletions

View file

@ -19,7 +19,7 @@ class Admin::ProceduresController < AdminController
def archived
@procedures = smart_listing_create :procedures,
current_administrateur.procedures.archivees.order(published_at: :desc),
current_administrateur.procedures.closes.order(published_at: :desc),
partial: "admin/procedures/list",
array: true
@ -52,7 +52,7 @@ class Admin::ProceduresController < AdminController
def destroy
procedure = current_administrateur.procedures.find(params[:id])
if procedure.publiee_ou_archivee?
if procedure.publiee_ou_close?
return render json: {}, status: 401
end
@ -95,9 +95,9 @@ class Admin::ProceduresController < AdminController
def archive
procedure = current_administrateur.procedures.find(params[:procedure_id])
procedure.archive!
procedure.close!
flash.notice = "Démarche archivée"
flash.notice = "Démarche close"
redirect_to admin_procedures_path
rescue ActiveRecord::RecordNotFound
@ -131,7 +131,7 @@ class Admin::ProceduresController < AdminController
def new_from_existing
significant_procedure_ids = Procedure
.publiees_ou_archivees
.publiees_ou_closes
.joins(:dossiers)
.group("procedures.id")
.having("count(dossiers.id) >= ?", SIGNIFICANT_DOSSIERS_THRESHOLD)

View file

@ -285,7 +285,7 @@ class ApplicationController < ActionController::Base
DS_ID: current_administrateur&.id,
DS_NB_DEMARCHES_BROUILLONS: nb_demarches_by_state['brouillon'],
DS_NB_DEMARCHES_ACTIVES: nb_demarches_by_state['publiee'],
DS_NB_DEMARCHES_ARCHIVES: nb_demarches_by_state['archivee']
DS_NB_DEMARCHES_ARCHIVES: nb_demarches_by_state['close']
}
}
end

View file

@ -10,7 +10,7 @@ module Instructeurs
.procedures
.with_attached_logo
.includes(:defaut_groupe_instructeur)
.order(archived_at: :desc, published_at: :desc, created_at: :desc)
.order(closed_at: :desc, archived_at: :desc, published_at: :desc, created_at: :desc)
dossiers = current_instructeur.dossiers.joins(:groupe_instructeur)
@dossiers_count_per_procedure = dossiers.all_state.group('groupe_instructeurs.procedure_id').reorder(nil).count

View file

@ -4,7 +4,7 @@ class StatsController < ApplicationController
MEAN_NUMBER_OF_CHAMPS_IN_A_FORM = 24.0
def index
procedures = Procedure.publiees_ou_archivees
procedures = Procedure.publiees_ou_closes
dossiers = Dossier.state_not_brouillon
@procedures_numbers = procedures_numbers(procedures)

View file

@ -53,7 +53,7 @@ module Users
def procedure_not_found
procedure = Procedure.find_by(path: params[:path])
if procedure&.archivee?
if procedure&.close?
flash.alert = t('errors.messages.procedure_archived')
else
flash.alert = t('errors.messages.procedure_not_found')