Skip to content

Ajout nom du préventionniste dans les listes de dossiers #658

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

Ajout nom du préventionniste dans les listes de dossiers #658

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions application/models/DbTable/DossierAffectation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ public function getDossierNonAffect($idDateCom)
->join(array('dossType' => "dossiertype"), 'doss.TYPE_DOSSIER = dossType.ID_DOSSIERTYPE', 'LIBELLE_DOSSIERTYPE')
->joinLeft(array("e" => "etablissementdossier"), "doss.ID_DOSSIER = e.ID_DOSSIER", null)
->joinLeft("etablissementinformations", "e.ID_ETABLISSEMENT = etablissementinformations.ID_ETABLISSEMENT AND etablissementinformations.DATE_ETABLISSEMENTINFORMATIONS = ( SELECT MAX(etablissementinformations.DATE_ETABLISSEMENTINFORMATIONS) FROM etablissementinformations WHERE etablissementinformations.ID_ETABLISSEMENT = e.ID_ETABLISSEMENT )", "LIBELLE_ETABLISSEMENTINFORMATIONS")
->joinLeft("dossierpreventionniste","dossierpreventionniste.ID_DOSSIER = doss.ID_DOSSIER",null)
->joinLeft("utilisateur","utilisateur.ID_UTILISATEUR = dossierpreventionniste.ID_PREVENTIONNISTE",null)
->joinLeft("utilisateurinformations","utilisateurinformations.ID_UTILISATEURINFORMATIONS = utilisateur.ID_UTILISATEURINFORMATIONS",array("PRENOM_UTILISATEURINFORMATIONS", "NOM_UTILISATEURINFORMATIONS"))
->where('dateComm.ID_DATECOMMISSION = ?',$idDateCom)
->where("dossAffect.HEURE_DEB_AFFECT IS NULL")
->where("dossAffect.HEURE_FIN_AFFECT IS NULL")
Expand All @@ -41,6 +44,9 @@ public function getDossierAffect($idDateCom)
->join(array('dossType' => "dossiertype"), 'doss.TYPE_DOSSIER = dossType.ID_DOSSIERTYPE', 'LIBELLE_DOSSIERTYPE')
->joinLeft(array("e" => "etablissementdossier"), "doss.ID_DOSSIER = e.ID_DOSSIER", null)
->joinLeft("etablissementinformations", "e.ID_ETABLISSEMENT = etablissementinformations.ID_ETABLISSEMENT AND etablissementinformations.DATE_ETABLISSEMENTINFORMATIONS = ( SELECT MAX(etablissementinformations.DATE_ETABLISSEMENTINFORMATIONS) FROM etablissementinformations WHERE etablissementinformations.ID_ETABLISSEMENT = e.ID_ETABLISSEMENT )", "LIBELLE_ETABLISSEMENTINFORMATIONS")
->joinLeft("dossierpreventionniste","dossierpreventionniste.ID_DOSSIER = doss.ID_DOSSIER",null)
->joinLeft("utilisateur","utilisateur.ID_UTILISATEUR = dossierpreventionniste.ID_PREVENTIONNISTE",null)
->joinLeft("utilisateurinformations","utilisateurinformations.ID_UTILISATEURINFORMATIONS = utilisateur.ID_UTILISATEURINFORMATIONS",array("PRENOM_UTILISATEURINFORMATIONS", "NOM_UTILISATEURINFORMATIONS"))
->where("dateComm.ID_DATECOMMISSION = ?",$idDateCom)
->where("dossAffect.HEURE_DEB_AFFECT IS NOT NULL")
->where("dossAffect.HEURE_FIN_AFFECT IS NOT NULL")
Expand Down
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 @@ -119,6 +119,7 @@ public function setItem( $item )
->joinLeft("avis", "d.AVIS_DOSSIER_COMMISSION = avis.ID_AVIS")
->joinLeft("dossierpreventionniste", "dossierpreventionniste.ID_DOSSIER = d.ID_DOSSIER", null)
->joinLeft("utilisateur", "utilisateur.ID_UTILISATEUR = dossierpreventionniste.ID_PREVENTIONNISTE", "ID_UTILISATEUR")
->joinLeft("utilisateurinformations","utilisateurinformations.ID_UTILISATEURINFORMATIONS = utilisateur.ID_UTILISATEURINFORMATIONS",array("PRENOM_UTILISATEURINFORMATIONS", "NOM_UTILISATEURINFORMATIONS"))
->joinLeft("etablissementinformations", "e.ID_ETABLISSEMENT = etablissementinformations.ID_ETABLISSEMENT AND etablissementinformations.DATE_ETABLISSEMENTINFORMATIONS =
IFNULL(
(CASE
Expand Down
4 changes: 2 additions & 2 deletions application/views/scripts/search/results/dossier.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<i class="icon-file"></i>
</a>
<?php endif ?>
<a href='/dossier/index/id/<?php echo $this->ID_DOSSIER ?>' title='<?php echo htmlspecialchars($this->LIBELLE_DOSSIERTYPE . " - " . $this->LIBELLE_DOSSIERNATURE . (!empty($this->OBJET_DOSSIER) ? " - " . $this->OBJET_DOSSIER : ""), ENT_QUOTES) ?>'>
<a href='/dossier/index/id/<?php echo $this->ID_DOSSIER ?>' title='<?php echo htmlspecialchars($this->LIBELLE_DOSSIERTYPE . " - " . $this->LIBELLE_DOSSIERNATURE . (!empty($this->OBJET_DOSSIER) ? " - " . $this->OBJET_DOSSIER : "") . (!empty($this->NOM_UTILISATEURINFORMATIONS) ? " (" . $this->NOM_UTILISATEURINFORMATIONS . " " . $this->PRENOM_UTILISATEURINFORMATIONS . ")" : ""), ENT_QUOTES) ?>'>
<?php if($this->LIBELLE_ETABLISSEMENTINFORMATIONS != null): ?>
<?php echo '[' . $this->LIBELLE_ETABLISSEMENTINFORMATIONS . '] ' ?>
<?php endif ?>
<?php echo $this->LIBELLE_DOSSIERTYPE . " - " . $this->LIBELLE_DOSSIERNATURE . (!empty($this->OBJET_DOSSIER) ? " - " . substr($this->OBJET_DOSSIER, 0, 70) . ( strlen($this->OBJET_DOSSIER) > 70 ? "(...)" : "" ) : "") . ( $this->NB_URBA != '' ? " - " . $this->NB_URBA : '') ?>
<?php echo $this->LIBELLE_DOSSIERTYPE . " - " . $this->LIBELLE_DOSSIERNATURE . (!empty($this->OBJET_DOSSIER) ? " - " . substr($this->OBJET_DOSSIER, 0, 70) . ( strlen($this->OBJET_DOSSIER) > 70 ? "(...)" : "" ) : "") . (!empty($this->NOM_UTILISATEURINFORMATIONS) ? " (" . $this->NOM_UTILISATEURINFORMATIONS . " " . $this->PRENOM_UTILISATEURINFORMATIONS . ")" : "") . ( $this->NB_URBA != '' ? " - " . $this->NB_URBA : '') ?>
</a>
</span>

Expand Down