Skip to content

GitLab

Commit d03e6ca7 authored by THEO GUILLON's avatar THEO GUILLON
Browse files

Merge branch '314-notification-dans-la-navbar-non-visible' into '1.2.0' 

Resolve "Notification dans la navbar non visible"

See merge request web-DPO/web-DPO!285
parents 5b482b2e 70fa67cb
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
app/View/Pannel/notification.ctp
View file @ d03e6ca7
......@@ -24,23 +24,23 @@
foreach ($vuNotifications as $key => $value) {
if ($this->Session->read('Organisation.id') == $value['Fiche']['organisation_id']) {
switch ($value['Notification']['content']) {
case 1:
case Notification::DEMANDE_AVIS:
// Demande d'avis
echo '<a href="/organisations/changenotification/' . $organisationId . '/pannel/recuConsultation/' . $value['Fiche']['id'] . '" class="list-group-item list-group-item-info">'.__d('default','default.notificationAvisDemandeTraitement').' <strong>"' . $value['Fiche']['Valeur'][0]['valeur'] . '"</strong></a>';
break;
case 2:
case Notification::VALIDATION_DEMANDEE:
// Validation demandée
echo '<a href="/organisations/changenotification/' . $organisationId . '/pannel/recuValidation/' . $value['Fiche']['id'] . '" class="list-group-item list-group-item-info">'.__d('default','default.notificationValidationDemandeTraitement').' <strong>"' . $value['Fiche']['Valeur'][0]['valeur'] . '"</strong></a>';
break;
case 3:
case Notification::TRAITEMENT_VALIDE:
// Traitement validé
echo '<a href="/organisations/changenotification/' . $organisationId . '/registres/index/' . $value['Fiche']['id'] . '" class="list-group-item list-group-item-success">'.__d('default','default.notificationLeTraitement').' <strong>"' . $value['Fiche']['Valeur'][0]['valeur'] . '"</strong>'.__d('default','default.notificationTraitementValidee').'</a>';
break;
case 4:
case Notification::TRAITEMENT_REFUSE:
// Traitement refusé
echo '<a href="/organisations/changenotification/' . $organisationId . '/pannel/refuser/' . $value['Fiche']['id'] . '" class="list-group-item list-group-item-danger">'.__d('default','default.notificationLeTraitement').' <strong>"' . $value['Fiche']['Valeur'][0]['valeur'] . '"</strong>'.__d('default','default.notificationTraitementRefusee').'</a>';
break;
case 5:
case Notification::COMMENTAIRE_AJOUTE:
// Commentaire ajouté sur le traitement
if ($this->Autorisation->authorized('3', $this->Session->read('Droit.liste'))) {
echo '<a href="/organisations/changenotification/' . $organisationId . '/pannel/consulte/' . $value['Fiche']['id'] . '" class="list-group-item list-group-item-info">'.__d('default','default.notificationCommentaireAjouterTraitement').' <strong>"' . $value['Fiche']['Valeur'][0]['valeur'] . '"</strong></a>';
......@@ -48,6 +48,10 @@
echo '<a href="/organisations/changenotification/' . $organisationId . '/pannel/encours_redaction/' . $value['Fiche']['id'] . '" class="list-group-item list-group-item-info">'.__d('default','default.notificationCommentaireAjouterTraitement').' <strong>"' . $value['Fiche']['Valeur'][0]['valeur'] . '"</strong></a>';
}
break;
case Notification::TRAITEMENT_INITIALISE:
// Traitement initialisé par le DPO
echo '<a href="/organisations/changenotification/' . $organisationId . '/pannel/encours_redaction/' . $value['Fiche']['id'] . '" class="list-group-item list-group-item-info">'.__d('default','default.notificationLeTraitement').' <strong>"' . $value['Fiche']['Valeur'][0]['valeur'] . '"</strong>'.__d('default','default.notificationTraitementInitialise').'</a>';
break;
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment