Merge branch 'dev'

Gemfile

@@ -127,6 +127,8 @@ gem "administrate"
 
 gem 'rack-mini-profiler'
 
+gem 'rake-progressbar', require: false
+
 group :test do
   gem 'launchy'
   gem 'factory_bot'

Gemfile.lock

@@ -468,6 +468,7 @@ GEM
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     rake (12.3.1)
+    rake-progressbar (0.0.5)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -718,6 +719,7 @@ DEPENDENCIES
   rails
   rails-controller-testing
   rails-i18n
+  rake-progressbar
   rbnacl-libsodium
   rest-client
   rgeo-geojson

app/controllers/application_controller.rb

@@ -30,7 +30,6 @@ class ApplicationController < ActionController::Base
     service = RenderPartialService.new(controller, method)
     @navbar_url = service.navbar
     @left_pannel_url = service.left_panel
-    @facade_data_view = nil
   end
 
   def logged_in?

app/controllers/manager/procedures_controller.rb

@@ -22,7 +22,7 @@ module Manager
       procedure = Procedure.find(params[:id])
       procedure.hide!
       flash[:notice] = "La démarche a bien été supprimée, en cas d'erreur contactez un développeur."
-      redirect_to manager_procedure_path(procedure)
+      redirect_to manager_procedures_path
     end
   end
 end

app/views/layouts/_footer.html.haml

@@ -9,7 +9,4 @@
     \-
     = link_to 'CGU / Mentions légales', CGU_URL
     \-
-    - if @facade.present? && @facade.respond_to?(:dossier)
+    = contact_link 'Contact'
-      = contact_link 'Contact', dossier_id: @facade.dossier&.id
-    - else
-      = contact_link 'Contact'

app/views/new_user/dossiers/merci.html.haml

@@ -1,5 +1,8 @@
 - content_for(:title, "Dossier bien envoyé (#{@dossier.procedure.libelle})")
 
+- content_for :footer do
+  = render partial: "new_user/dossiers/dossier_footer", locals: { dossier: @dossier }
+
 .merci
   .container
     = image_tag('user/envoi-dossier.svg')

lib/tasks/deployment/20181121153709_fix_notifications_after_carto_migration.rake

@@ -0,0 +1,28 @@
+require 'rake-progressbar'
+
+namespace :after_party do
+  desc 'Deployment task: fix_notifications_after_carto_migration'
+  task fix_notifications_after_carto_migration: :environment do
+    def fix_notifications(dossier)
+      updated_at = dossier.champs[1..-1].map(&:updated_at).max
+      champ_carte = dossier.champs.first
+      if updated_at && (!champ_carte.updated_at || champ_carte.updated_at > updated_at)
+        champ_carte.update_columns(updated_at: updated_at, created_at: updated_at)
+      end
+    end
+
+    dossiers = Dossier.includes(:champs)
+      .joins(procedure: :module_api_carto)
+      .where(procedure: { module_api_cartos: { migrated: true } })
+
+    bar = RakeProgressbar.new(dossiers.count)
+
+    dossiers.find_each do |dossier|
+      fix_notifications(dossier)
+      bar.inc
+    end
+    bar.finished
+
+    AfterParty::TaskRecord.create version: '20181121153709'
+  end
+end