Skip to content

Correction des préventionnistes non proposés à l'ajout pour certains genres #678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
A511701 wants to merge 2 commits into
base: 2.x
Choose a base branch
from
Open

Correction des préventionnistes non proposés à l'ajout pour certains genres #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a76bd2a
* Correction des préventionnistes non proposés à l'ajout pour les gen…
Jun 7, 2017
0977442
* Correction de la proposition des préventionniste si l'ordre alphabé…
Jun 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions application/models/DbTable/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ public function setItem( $item )
->joinLeft("etablissementinformations", "etablissementinformations.ID_ETABLISSEMENTINFORMATIONS = etablissementinformationspreventionniste.ID_ETABLISSEMENTINFORMATIONS")
->where("etablissementinformations.DATE_ETABLISSEMENTINFORMATIONS = ( SELECT MAX(infos.DATE_ETABLISSEMENTINFORMATIONS) FROM etablissementinformations as infos WHERE etablissementinformations.ID_ETABLISSEMENT = infos.ID_ETABLISSEMENT ) OR etablissementinformations.DATE_ETABLISSEMENTINFORMATIONS IS NULL")
->where("u.ACTIF_UTILISATEUR = 1")
->order(array("utilisateurinformations.NOM_UTILISATEURINFORMATIONS", "utilisateurinformations.PRENOM_UTILISATEURINFORMATIONS"))
->group("u.ID_UTILISATEUR");

break;
Expand Down
12 changes: 2 additions & 10 deletions application/services/Etablissement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,14 +991,6 @@ public function getDefaultValues($genre, $numinsee = null, $type = null, $catego
}
break;

// Habitation
case 4:
// Préventionnistes du site ou des groupements de communes
if($numinsee !== null || ($id_etablissement_pere !== null && $id_etablissement_pere != '')) {
$results['preventionnistes'] = $model_prev->getPrev($numinsee === null ? '' : $numinsee, $id_etablissement_pere === null ? '' : $id_etablissement_pere);
}
break;

// IGH
case 5:
// Périodicité en fonction de la classe
Expand Down Expand Up @@ -1027,8 +1019,8 @@ public function getDefaultValues($genre, $numinsee = null, $type = null, $catego
}
break;

// EIC
case 6:
// Autres genres
default:
// Préventionnistes du site ou des groupements de communes
if($numinsee !== null || $id_etablissement_pere !== null) {
$results['preventionnistes'] = $model_prev->getPrev($numinsee === null ? '' : $numinsee, $id_etablissement_pere === null ? '' : $id_etablissement_pere);
Expand Down