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

Merge pull request #5718 from betagouv/dev

Browse source 
2020-11-04-01
This commit is contained in:
Keirua 2020-11-04 17:49:50 +01:00 committed by GitHub
commit 331159b767
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/procedure.rb
View file

@ -633,7 +633,7 @@ class Procedure < ApplicationRecord
def dossiers_count_for_instructeur(instructeur) def dossiers_count_for_instructeur(instructeur)
query = <<-EOF query = <<-EOF
SELECT SELECT
COUNT(*) FILTER ( WHERE "dossiers"."state" in ('en_construction', 'en_instruction') and (("follows"."id" IS NULL) or ("follows"."instructeur_id" = :instructeur_id and "follows"."unfollowed_at" < :now)) and not "dossiers"."archived") AS a_suivre, COUNT(*) FILTER ( WHERE "dossiers"."state" in ('en_construction', 'en_instruction') and "follows"."id" IS NULL and not "dossiers"."archived") AS a_suivre,
COUNT(*) FILTER ( WHERE "dossiers"."state" in ('en_construction', 'en_instruction') and "follows"."instructeur_id" = :instructeur_id and not "dossiers"."archived" and "follows"."unfollowed_at" IS NULL) AS suivis, COUNT(*) FILTER ( WHERE "dossiers"."state" in ('en_construction', 'en_instruction') and "follows"."instructeur_id" = :instructeur_id and not "dossiers"."archived" and "follows"."unfollowed_at" IS NULL) AS suivis,
COUNT(*) FILTER ( WHERE "dossiers"."state" in ('accepte', 'refuse', 'sans_suite') and not "dossiers"."archived" ) AS termines, COUNT(*) FILTER ( WHERE "dossiers"."state" in ('accepte', 'refuse', 'sans_suite') and not "dossiers"."archived" ) AS termines,
COUNT(*) FILTER ( WHERE "dossiers"."state" != 'brouillon' and not "dossiers"."archived" ) AS total, COUNT(*) FILTER ( WHERE "dossiers"."state" != 'brouillon' and not "dossiers"."archived" ) AS total,
@ -652,6 +652,7 @@ class Procedure < ApplicationRecord
LEFT OUTER JOIN LEFT OUTER JOIN
"follows" "follows"
ON "follows"."dossier_id" = "dossiers"."id" ON "follows"."dossier_id" = "dossiers"."id"
AND "follows"."unfollowed_at" IS NULL
WHERE WHERE
"dossiers"."hidden_at" IS NULL "dossiers"."hidden_at" IS NULL
AND "assign_tos"."instructeur_id" = :instructeur_id AND "assign_tos"."instructeur_id" = :instructeur_id