Loading module/Application/src/Application/Entity/Db/EntretienProfessionnel.php +20 −21 Changes for module/Application/src/Application/Entity/Db/EntretienProfessionnel.php: 20 added lines, 21 removed lines. Original line number Diff line number Diff line Loading @@ -51,7 +51,6 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf /** @var DateTime */ private $acceptation; /** * @return int */ Loading @@ -69,10 +68,10 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param Agent $agent * @param Agent|null $agent * @return EntretienProfessionnel */ public function setAgent($agent) public function setAgent(?Agent $agent) { $this->agent = $agent; return $this; Loading @@ -87,10 +86,10 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param User $responsable * @param User|null $responsable * @return EntretienProfessionnel */ public function setResponsable($responsable) public function setResponsable(?User $responsable) { $this->responsable = $responsable; return $this; Loading @@ -114,10 +113,10 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param EntretienProfessionnelCampagne $campagne * @param EntretienProfessionnelCampagne|null $campagne * @return EntretienProfessionnel */ public function setCampagne($campagne) public function setCampagne(?EntretienProfessionnelCampagne $campagne) { $this->campagne = $campagne; return $this; Loading @@ -132,10 +131,10 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param DateTime $dateEntretien * @param DateTime|null $dateEntretien * @return EntretienProfessionnel */ public function setDateEntretien($dateEntretien) public function setDateEntretien(?DateTime $dateEntretien) { $this->dateEntretien = $dateEntretien; return $this; Loading @@ -150,10 +149,10 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param string $lieu * @param string|null $lieu * @return EntretienProfessionnel */ public function setLieu($lieu) public function setLieu(?string $lieu) { $this->lieu = $lieu; return $this; Loading @@ -168,10 +167,10 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param FormulaireInstance $formulaireInstance * @param FormulaireInstance|null $formulaireInstance * @return EntretienProfessionnel */ public function setFormulaireInstance($formulaireInstance) public function setFormulaireInstance(?FormulaireInstance $formulaireInstance) { $this->formulaireInstance = $formulaireInstance; return $this; Loading @@ -186,10 +185,10 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param FormulaireInstance $formationInstance * @param FormulaireInstance|null $formationInstance * @return EntretienProfessionnel */ public function setFormationInstance($formationInstance) public function setFormationInstance(?FormulaireInstance $formationInstance) { $this->formationInstance = $formationInstance; return $this; Loading @@ -206,29 +205,29 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param EntretienProfessionnelObservation $observation * @param EntretienProfessionnelObservation|null $observation * @return boolean */ public function hasObservation($observation) public function hasObservation(?EntretienProfessionnelObservation $observation) { return $this->observations->contains($observation); } /** * @param EntretienProfessionnelObservation $observation * @param EntretienProfessionnelObservation|null $observation * @return EntretienProfessionnel */ public function addObservation(EntretienProfessionnelObservation $observation) public function addObservation(?EntretienProfessionnelObservation $observation) { if ($this->hasObservation($observation)) $this->observations->add($observation); return $this; } /** * @param EntretienProfessionnelObservation $observation * @param EntretienProfessionnelObservation|null $observation * @return EntretienProfessionnel */ public function removeObservation(EntretienProfessionnelObservation $observation) public function removeObservation(?EntretienProfessionnelObservation $observation) { $this->observations->removeElement($observation); return $this; Loading module/Application/src/Application/Service/Agent/AgentService.php +1 −1 Changes for module/Application/src/Application/Service/Agent/AgentService.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -145,7 +145,7 @@ class AgentService { * @param integer $id * @return Agent */ public function getAgent(int $id) public function getAgent(?int $id) { if ($id === null) return null; $qb = $this->createQueryBuilder() Loading module/UnicaenDocument/config/merged/contenu.config.php +1 −1 Changes for module/UnicaenDocument/config/merged/contenu.config.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -60,7 +60,7 @@ return [ [ 'controller' => ContenuController::class, 'action' => [ 'supprimer', 'detruire', ], 'privileges' => [ DocumentcontentPrivileges::DOCUMENTCONTENU_SUPPRIMER, Loading module/UnicaenDocument/src/UnicaenDocument/Controller/ContenuController.php +1 −1 Changes for module/UnicaenDocument/src/UnicaenDocument/Controller/ContenuController.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -119,7 +119,7 @@ class ContenuController extends AbstractActionController { $vm->setVariables([ 'title' => "Suppression du contenu [" . $contenu->getCode() . "]", 'text' => "La suppression est définitive êtes-vous sûr·e de vouloir continuer ?", 'action' => $this->url()->fromRoute('contenu/detruire', ["contenu" => $contenu->getId()], [], true), 'action' => $this->url()->fromRoute('contenu/contenu/detruire', ["contenu" => $contenu->getId()], [], true), ]); } return $vm; Loading module/UnicaenDocument/view/unicaen-document/contenu/index.phtml +10 −1 Changes for module/UnicaenDocument/view/unicaen-document/contenu/index.phtml: 10 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -41,7 +41,7 @@ $this->headTitle("Index des contenus"); </thead> <tbody> <?php foreach ($contenus as $contenu) : ?> <tr> <tr class="<?php if ($contenu->estHistorise()) echo 'historise '; ?>"> <td> <?php echo $contenu->getCode(); ?> <?php if ($contenu->getDescription() !== null) : ?> Loading Loading @@ -87,3 +87,12 @@ $this->headTitle("Index des contenus"); </tbody> </table> </div> <script> $(function() { $("body").on("modification", function (event) { event.div.modal('hide'); window.location.reload(); }); }); </script> No newline at end of file Loading
module/Application/src/Application/Entity/Db/EntretienProfessionnel.php +20 −21 Changes for module/Application/src/Application/Entity/Db/EntretienProfessionnel.php: 20 added lines, 21 removed lines. Original line number Diff line number Diff line Loading @@ -51,7 +51,6 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf /** @var DateTime */ private $acceptation; /** * @return int */ Loading @@ -69,10 +68,10 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param Agent $agent * @param Agent|null $agent * @return EntretienProfessionnel */ public function setAgent($agent) public function setAgent(?Agent $agent) { $this->agent = $agent; return $this; Loading @@ -87,10 +86,10 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param User $responsable * @param User|null $responsable * @return EntretienProfessionnel */ public function setResponsable($responsable) public function setResponsable(?User $responsable) { $this->responsable = $responsable; return $this; Loading @@ -114,10 +113,10 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param EntretienProfessionnelCampagne $campagne * @param EntretienProfessionnelCampagne|null $campagne * @return EntretienProfessionnel */ public function setCampagne($campagne) public function setCampagne(?EntretienProfessionnelCampagne $campagne) { $this->campagne = $campagne; return $this; Loading @@ -132,10 +131,10 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param DateTime $dateEntretien * @param DateTime|null $dateEntretien * @return EntretienProfessionnel */ public function setDateEntretien($dateEntretien) public function setDateEntretien(?DateTime $dateEntretien) { $this->dateEntretien = $dateEntretien; return $this; Loading @@ -150,10 +149,10 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param string $lieu * @param string|null $lieu * @return EntretienProfessionnel */ public function setLieu($lieu) public function setLieu(?string $lieu) { $this->lieu = $lieu; return $this; Loading @@ -168,10 +167,10 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param FormulaireInstance $formulaireInstance * @param FormulaireInstance|null $formulaireInstance * @return EntretienProfessionnel */ public function setFormulaireInstance($formulaireInstance) public function setFormulaireInstance(?FormulaireInstance $formulaireInstance) { $this->formulaireInstance = $formulaireInstance; return $this; Loading @@ -186,10 +185,10 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param FormulaireInstance $formationInstance * @param FormulaireInstance|null $formationInstance * @return EntretienProfessionnel */ public function setFormationInstance($formationInstance) public function setFormationInstance(?FormulaireInstance $formationInstance) { $this->formationInstance = $formationInstance; return $this; Loading @@ -206,29 +205,29 @@ class EntretienProfessionnel implements HistoriqueAwareInterface, ResourceInterf } /** * @param EntretienProfessionnelObservation $observation * @param EntretienProfessionnelObservation|null $observation * @return boolean */ public function hasObservation($observation) public function hasObservation(?EntretienProfessionnelObservation $observation) { return $this->observations->contains($observation); } /** * @param EntretienProfessionnelObservation $observation * @param EntretienProfessionnelObservation|null $observation * @return EntretienProfessionnel */ public function addObservation(EntretienProfessionnelObservation $observation) public function addObservation(?EntretienProfessionnelObservation $observation) { if ($this->hasObservation($observation)) $this->observations->add($observation); return $this; } /** * @param EntretienProfessionnelObservation $observation * @param EntretienProfessionnelObservation|null $observation * @return EntretienProfessionnel */ public function removeObservation(EntretienProfessionnelObservation $observation) public function removeObservation(?EntretienProfessionnelObservation $observation) { $this->observations->removeElement($observation); return $this; Loading
module/Application/src/Application/Service/Agent/AgentService.php +1 −1 Changes for module/Application/src/Application/Service/Agent/AgentService.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -145,7 +145,7 @@ class AgentService { * @param integer $id * @return Agent */ public function getAgent(int $id) public function getAgent(?int $id) { if ($id === null) return null; $qb = $this->createQueryBuilder() Loading
module/UnicaenDocument/config/merged/contenu.config.php +1 −1 Changes for module/UnicaenDocument/config/merged/contenu.config.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -60,7 +60,7 @@ return [ [ 'controller' => ContenuController::class, 'action' => [ 'supprimer', 'detruire', ], 'privileges' => [ DocumentcontentPrivileges::DOCUMENTCONTENU_SUPPRIMER, Loading
module/UnicaenDocument/src/UnicaenDocument/Controller/ContenuController.php +1 −1 Changes for module/UnicaenDocument/src/UnicaenDocument/Controller/ContenuController.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -119,7 +119,7 @@ class ContenuController extends AbstractActionController { $vm->setVariables([ 'title' => "Suppression du contenu [" . $contenu->getCode() . "]", 'text' => "La suppression est définitive êtes-vous sûr·e de vouloir continuer ?", 'action' => $this->url()->fromRoute('contenu/detruire', ["contenu" => $contenu->getId()], [], true), 'action' => $this->url()->fromRoute('contenu/contenu/detruire', ["contenu" => $contenu->getId()], [], true), ]); } return $vm; Loading
module/UnicaenDocument/view/unicaen-document/contenu/index.phtml +10 −1 Changes for module/UnicaenDocument/view/unicaen-document/contenu/index.phtml: 10 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -41,7 +41,7 @@ $this->headTitle("Index des contenus"); </thead> <tbody> <?php foreach ($contenus as $contenu) : ?> <tr> <tr class="<?php if ($contenu->estHistorise()) echo 'historise '; ?>"> <td> <?php echo $contenu->getCode(); ?> <?php if ($contenu->getDescription() !== null) : ?> Loading Loading @@ -87,3 +87,12 @@ $this->headTitle("Index des contenus"); </tbody> </table> </div> <script> $(function() { $("body").on("modification", function (event) { event.div.modal('hide'); window.location.reload(); }); }); </script> No newline at end of file