Loading module/Application/src/Application/Service/Structure/StructureService.php +5 Changes for module/Application/src/Application/Service/Structure/StructureService.php: 5 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -70,6 +70,7 @@ class StructureService extends BaseService //Assert::null($structureCibleDataObject->getSourceCode(), "Le source code doit être null car il est calculé"); // le source code d'une structure cible est calculé $sourceCode = $structureCibleDataObject->getSourceCode(); if ($structureCibleDataObject->getSourceCode() === null) $sourceCode = uniqid(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP); // la source d'une structure cible est forcément SYGAL Loading @@ -90,7 +91,11 @@ class StructureService extends BaseService // instanciation du couple (Etab|ED|UR ; Structure) cible $structureConcreteCible = Structure::constructFromDataObject($structureCibleDataObject, $typeStructure, $sourceSygal); $structureConcreteCible->setSourceCode(uniqid(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP)); // $structureConcreteCible->getStructure()->setSourceCode(uniqid(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP)); $structureConcreteCible->getStructure()->setCode("tmp"); $structureRattachCible = $structureConcreteCible->getStructure(); // StructureSubstitution ne référence que des entités de type Structure // $structureRattachCible->setSourceCode(uniqid(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP)); // instanciations des substitutions $substitutions = StructureSubstit::fromStructures($structuresSources, $structureRattachCible); Loading module/Application/view/application/substitution/modifier.phtml +3 −16 Changes for module/Application/view/application/substitution/modifier.phtml: 3 added lines, 16 removed lines. Original line number Diff line number Diff line Loading @@ -2,8 +2,7 @@ namespace Application; use Application\Entity\Db\Structure; use Application\Entity\Db\Etablissement; use Application\Entity\Db\EcoleDoctorale;use Application\Entity\Db\Structure; use Application\Entity\Db\StructureConcreteInterface; use Application\Entity\Db\TypeStructure; use Application\Provider\Privilege\SubstitutionPrivileges; Loading @@ -15,6 +14,7 @@ use Application\View\Renderer\PhpRenderer; * @var Structure $cible * @var StructureConcreteInterface[] $structuresConcretesSubstituees * @var StructureConcreteInterface[] $structuresConcretes * @var TypeStructure $type */ $canEdit = false; Loading @@ -25,31 +25,18 @@ if ( $type === TypeStructure::CODE_UNITE_RECHERCHE ) $canEdit = $this->isAllo ?> <!-- --><?php //$this->headTitle($this->translate("Substitution de structures")) ?> <!-- <div class="modal-header">--> <!-- <h1 class="page-header first">--> <!-- --><?php //echo $this->translate("Substitution de structures"); ?> <!-- </h1>--> <!-- </div>--> <!----> <div class="container"> <?php $messenger = $this->messenger(); echo $messenger->addMessagesFromFlashMessenger(); ?> <!--<p>--> <!--<a href="--><?php //echo $this->url('substitution-index'); ?><!--"><button class="btn btn-info">Retour à l'index des substitutions</button></a>--> <!--</p>--> <?php if($canEdit): ?> <?php echo generateSelect($structuresConcretes, $this); ?> <button name="ajouter" class="btn btn-success"> <span class='glyphicon glyphicon-plus'></span> Ajouter </button> <?php endif; ?> <form action="<?php echo $this->url('substitution-modifier', ['cible' => $cible->getId()], [],true); ?>" method="POST"> <form action="<?php echo ($cible->getId())?$this->url('substitution-modifier', ['cible' => $cible->getId()], [],true):$this->url('substitution-creer', ['type' => $type], [],true); ?>" method="POST"> <input type="hidden" name="type" id="type" value="<?php echo $type; ?>"> <input type="hidden" name="identifiant" id="identifiant" value="<?php echo $identifiant; ?>"> <?php if($canEdit): ?> Loading Loading
module/Application/src/Application/Service/Structure/StructureService.php +5 Changes for module/Application/src/Application/Service/Structure/StructureService.php: 5 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -70,6 +70,7 @@ class StructureService extends BaseService //Assert::null($structureCibleDataObject->getSourceCode(), "Le source code doit être null car il est calculé"); // le source code d'une structure cible est calculé $sourceCode = $structureCibleDataObject->getSourceCode(); if ($structureCibleDataObject->getSourceCode() === null) $sourceCode = uniqid(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP); // la source d'une structure cible est forcément SYGAL Loading @@ -90,7 +91,11 @@ class StructureService extends BaseService // instanciation du couple (Etab|ED|UR ; Structure) cible $structureConcreteCible = Structure::constructFromDataObject($structureCibleDataObject, $typeStructure, $sourceSygal); $structureConcreteCible->setSourceCode(uniqid(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP)); // $structureConcreteCible->getStructure()->setSourceCode(uniqid(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP)); $structureConcreteCible->getStructure()->setCode("tmp"); $structureRattachCible = $structureConcreteCible->getStructure(); // StructureSubstitution ne référence que des entités de type Structure // $structureRattachCible->setSourceCode(uniqid(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP)); // instanciations des substitutions $substitutions = StructureSubstit::fromStructures($structuresSources, $structureRattachCible); Loading
module/Application/view/application/substitution/modifier.phtml +3 −16 Changes for module/Application/view/application/substitution/modifier.phtml: 3 added lines, 16 removed lines. Original line number Diff line number Diff line Loading @@ -2,8 +2,7 @@ namespace Application; use Application\Entity\Db\Structure; use Application\Entity\Db\Etablissement; use Application\Entity\Db\EcoleDoctorale;use Application\Entity\Db\Structure; use Application\Entity\Db\StructureConcreteInterface; use Application\Entity\Db\TypeStructure; use Application\Provider\Privilege\SubstitutionPrivileges; Loading @@ -15,6 +14,7 @@ use Application\View\Renderer\PhpRenderer; * @var Structure $cible * @var StructureConcreteInterface[] $structuresConcretesSubstituees * @var StructureConcreteInterface[] $structuresConcretes * @var TypeStructure $type */ $canEdit = false; Loading @@ -25,31 +25,18 @@ if ( $type === TypeStructure::CODE_UNITE_RECHERCHE ) $canEdit = $this->isAllo ?> <!-- --><?php //$this->headTitle($this->translate("Substitution de structures")) ?> <!-- <div class="modal-header">--> <!-- <h1 class="page-header first">--> <!-- --><?php //echo $this->translate("Substitution de structures"); ?> <!-- </h1>--> <!-- </div>--> <!----> <div class="container"> <?php $messenger = $this->messenger(); echo $messenger->addMessagesFromFlashMessenger(); ?> <!--<p>--> <!--<a href="--><?php //echo $this->url('substitution-index'); ?><!--"><button class="btn btn-info">Retour à l'index des substitutions</button></a>--> <!--</p>--> <?php if($canEdit): ?> <?php echo generateSelect($structuresConcretes, $this); ?> <button name="ajouter" class="btn btn-success"> <span class='glyphicon glyphicon-plus'></span> Ajouter </button> <?php endif; ?> <form action="<?php echo $this->url('substitution-modifier', ['cible' => $cible->getId()], [],true); ?>" method="POST"> <form action="<?php echo ($cible->getId())?$this->url('substitution-modifier', ['cible' => $cible->getId()], [],true):$this->url('substitution-creer', ['type' => $type], [],true); ?>" method="POST"> <input type="hidden" name="type" id="type" value="<?php echo $type; ?>"> <input type="hidden" name="identifiant" id="identifiant" value="<?php echo $identifiant; ?>"> <?php if($canEdit): ?> Loading