Skip to content

Trier les dossiers de l'ordre du jour par ordre alphabétique des #657

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
SDIS33 wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

Trier les dossiers de l'ordre du jour par ordre alphabétique des #657

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 37 additions & 9 deletions application/controllers/CalendrierDesCommissionsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,21 +124,49 @@ public function gestionodjAction()
$service_etablissement = new Service_Etablissement;
$DB_prev = new Model_DbTable_DossierPreventionniste;

foreach($listeDossiersNonAffect as $val => $ue)
foreach($listeDossiersNonAffect as $indiceDossierNonAffecte => $dossierNonAffecte)
{
//On recupere la liste des établissements qui concernent le dossier
$listeEtab = $dbDossier->getEtablissementDossierGenConvoc($ue['ID_DOSSIER']);
//on recupere la liste des infos des établissement
$listeEtab = $dbDossier->getEtablissementDossierGenConvoc($dossierNonAffecte['ID_DOSSIER']);

if (isset($dossierNonAffecte['LIBELLE_ETABLISSEMENTINFORMATIONS'])) {
// Info pour le tri auto des dossiers dans l'ODJ
$etablissement[$indiceDossierNonAffecte] = $dossierNonAffecte['LIBELLE_ETABLISSEMENTINFORMATIONS'];
} else {
$etablissement[$indiceDossierNonAffecte] = "";
}

if(count($listeEtab) > 0)
{
//on recupere la liste des infos des établissement
$etablissementInfos = $service_etablissement->get($listeEtab[0]['ID_ETABLISSEMENT']);
$listeDossiersNonAffect[$val]['infosEtab'] = $etablissementInfos;
$listeDocUrba = $dbDocUrba->getDossierDocUrba($ue['ID_DOSSIER']);
$listeDossiersNonAffect[$val]['listeDocUrba'] = $listeDocUrba;

$listeDossiersNonAffect[$val]['preventionnistes'] = $DB_prev->getPrevDossier( $ue['ID_DOSSIER'] );
}

if (!empty($etablissementInfos)) {
$listeDossiersNonAffect[$indiceDossierNonAffecte]['infosEtab'] = $etablissementInfos;

// Info pour le tri auto des dossiers dans l'ODJ
if (isset($listeDossiersNonAffect[$indiceDossierNonAffecte]['infosEtab']['adresses'][0])) {
$commune[$indiceDossierNonAffecte] = $listeDossiersNonAffect[$indiceDossierNonAffecte]['infosEtab']['adresses'][0]['LIBELLE_COMMUNE'];
} else {
$commune[$indiceDossierNonAffecte] = "";
}

}

$listeDocUrba = $dbDocUrba->getDossierDocUrba($dossierNonAffecte['ID_DOSSIER']);
$listeDossiersNonAffect[$indiceDossierNonAffecte]['listeDocUrba'] = $listeDocUrba;

$listeDossiersNonAffect[$indiceDossierNonAffecte]['preventionnistes'] = $DB_prev->getPrevDossier( $dossierNonAffecte['ID_DOSSIER'] );

} else {
$commune [$indiceDossierNonAffecte] = "";
}
}

// Trie les données par commune croissante, établissement croissant
// Ajoute $data en tant que dernier paramètre, pour trier par la clé commune
if (!empty($commune) && !empty($etablissement) && !empty($listeDossiersNonAffect)) {
array_multisort($commune, SORT_ASC, $etablissement, SORT_ASC, $listeDossiersNonAffect);
}

//Gestion de l'affichage de la date de la commission
Expand Down