Skip to content

Correction de l'historique de l'avis d'exploitation #675

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

Correction de l'historique de l'avis d'exploitation #675

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
31 changes: 19 additions & 12 deletions application/services/Etablissement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,16 +320,28 @@ public function getHistorique($id_etablissement)
}

// On traite le cas particulier des dossiers
$key = "avis";
$dossiers = $this->getDossiers($id_etablissement);
$dossiers_merged = $dossiers['etudes'];
$dossiers_merged = array_merge($dossiers_merged, $dossiers['visites']);
$dossiers_merged = array_merge($dossiers_merged, $dossiers['autres']);


// on filtre les dossiers ne donnant pas avis
foreach($dossiers_merged as $key => $dossier) {
if(!in_array($dossier['AVIS_DOSSIER_COMMISSION'], array(1, 2))) {
unset($dossiers_merged[$key]);
}
else if(!in_array($dossier['ID_DOSSIERNATURE'], array(7, 16, 17, 19, 21, 23, 24, 47, 26, 28, 29, 48)) ) {
unset($dossiers_merged[$key]);
}
else if(!$dossier['DATECOMM_DOSSIER'] && !$dossier['DATEVISITE_DOSSIER']) {
unset($dossiers_merged[$key]);
}
}

@usort($dossiers_merged, function($a, $b) {

$date_a = @new Zend_Date($a['DATEVISITE_DOSSIER'] != null ? $a['DATEVISITE_DOSSIER'] : $a['DATECOMM_DOSSIER'], Zend_Date::DATES);
$date_b = @new Zend_Date($b['DATEVISITE_DOSSIER'] != null ? $b['DATEVISITE_DOSSIER'] : $b['DATECOMM_DOSSIER'], Zend_Date::DATES);
$date_a = @new Zend_Date($a['DATECOMM_DOSSIER'] != null ? $a['DATECOMM_DOSSIER'] : $a['DATEVISITE_DOSSIER'], Zend_Date::DATES);
$date_b = @new Zend_Date($b['DATECOMM_DOSSIER'] != null ? $b['DATECOMM_DOSSIER'] : $b['DATEVISITE_DOSSIER'], Zend_Date::DATES);

if ($date_a == $date_b || $a === null || $b === null) {
return 0;
Expand All @@ -342,18 +354,13 @@ public function getHistorique($id_etablissement)
}
});

$key = "avis";
foreach($dossiers_merged as $dossier) {
$dossier = (object) $dossier;
$tmp = ( array_key_exists($key, $historique) ) ? $historique[$key][ count($historique[$key])-1 ] : null;
$value = null;
$value = $dossier->AVIS_DOSSIER_COMMISSION == 1 ? "Favorable" : "Défavorable";
$author = null;

if($dossier->AVIS_DOSSIER_COMMISSION && ($dossier->AVIS_DOSSIER_COMMISSION == 1 || $dossier->AVIS_DOSSIER_COMMISSION == 2)) {
if( in_array($dossier->ID_DOSSIERNATURE, array(7, 16, 17, 19, 21, 23, 24, 47, 26, 28, 29, 48)) ) {
$value = $dossier->AVIS_DOSSIER_COMMISSION == 1 ? "Favorable" : "Défavorable";
}
}


if ( $value != null && (!isset( $historique[$key] ) || $tmp["valeur"] != $value )) {
$date = new Zend_Date($dossier->DATEVISITE_DOSSIER != null ? $dossier->DATEVISITE_DOSSIER : $dossier->DATECOMM_DOSSIER, Zend_Date::DATES);
if ($tmp != null) {
Expand Down