Loading data/Etats de sortie/export_services_csv.php +4 −2 Changes for data/Etats de sortie/export_services_csv.php: 4 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -13,6 +13,8 @@ // initialisation use OffreFormation\Entity\Db\TypeIntervention; $res = []; $shown = []; $typesIntervention = []; Loading Loading @@ -126,7 +128,7 @@ foreach ($data as $d) { if ($d['TYPE_INTERVENTION_ID'] != null) { $tid = $d['TYPE_INTERVENTION_ID']; if (!isset($typesIntervention[$tid])) { $typesIntervention[$tid] = $entityManager->getRepository(\Application\Entity\Db\TypeIntervention::class)->find($tid); $typesIntervention[$tid] = $entityManager->getRepository(TypeIntervention::class)->find($tid); } $typeIntervention = $typesIntervention[$tid]; $invertTi['type-intervention-' . $typeIntervention->getCode()] = $typeIntervention->getId(); Loading Loading @@ -210,7 +212,7 @@ uasort($typesIntervention, function ($ti1, $ti2) { return $ti1->getOrdre() - $ti2->getOrdre(); }); foreach ($typesIntervention as $typeIntervention) { /* @var $typeIntervention \Application\Entity\Db\TypeIntervention */ /* @var \OffreFormation\Entity\Db\TypeIntervention $typeIntervention */ $head['type-intervention-' . $typeIntervention->getCode()] = $typeIntervention->getCode(); } $head['heures-ref'] = 'Référentiel'; Loading module/Application/config/aaa_module.config.php +1 −1 Changes for module/Application/config/aaa_module.config.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -163,7 +163,7 @@ $config = [ Service\AnneeService::class => Service\AnneeService::class, Service\LocalContextService::class => Service\LocalContextService::class, Service\ParametresService::class => Service\ParametresService::class, Service\TypeInterventionService::class => Service\TypeInterventionService::class, \OffreFormation\Service\TypeInterventionService::class => \OffreFormation\Service\TypeInterventionService::class, Service\SourceService::class => Service\SourceService::class, Service\AffectationService::class => Service\AffectationService::class, Service\RoleService::class => Service\RoleService::class, Loading module/Application/config/paiement.config.php +1 −1 Changes for module/Application/config/paiement.config.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -268,7 +268,7 @@ return [ Service\ServiceAPayerService::class => Service\ServiceAPayerService::class, Service\MiseEnPaiementService::class => Service\MiseEnPaiementService::class, Service\MiseEnPaiementIntervenantStructureService::class => Service\MiseEnPaiementIntervenantStructureService::class, Service\TypeHeuresService::class => Service\TypeHeuresService::class, \OffreFormation\Service\TypeHeuresService::class => \OffreFormation\Service\TypeHeuresService::class, Service\CentreCoutService::class => Service\CentreCoutService::class, \OffreFormation\Service\CentreCoutEpService::class => \OffreFormation\Service\CentreCoutEpService::class, Service\MotifNonPaiementService::class => Service\MotifNonPaiementService::class, Loading module/Application/src/Controller/ChargensController.php +4 −4 Changes for module/Application/src/Controller/ChargensController.php: 4 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -3,7 +3,6 @@ namespace Application\Controller; use Application\Entity\Db\Annee; use Application\Entity\Db\Etape; use Application\Entity\Db\Scenario; use Application\Entity\Db\SeuilCharge; use Application\Form\Chargens\Traits\DifferentielFormAwareTrait; Loading @@ -14,16 +13,17 @@ use Application\Form\Chargens\Traits\ScenarioFormAwareTrait; use Application\Provider\Chargens\ChargensProviderAwareTrait; use Application\Provider\Privilege\Privileges; use Application\Service\Traits\ContextServiceAwareTrait; use OffreFormation\Service\Traits\EtapeServiceAwareTrait; use Application\Service\Traits\ScenarioServiceAwareTrait; use Application\Service\Traits\SeuilChargeServiceAwareTrait; use Application\Service\Traits\StructureServiceAwareTrait; use BjyAuthorize\Exception\UnAuthorizedException; use Laminas\View\Model\JsonModel; use Laminas\View\Model\ViewModel; use OffreFormation\Service\Traits\EtapeServiceAwareTrait; use OffreFormation\Entity\Db\Etape; use UnicaenApp\Util; use UnicaenApp\View\Model\CsvModel; use UnicaenApp\View\Model\MessengerViewModel; use Laminas\View\Model\JsonModel; use Laminas\View\Model\ViewModel; /** Loading module/Application/src/Entity/Chargens/Noeud.php +3 −3 Changes for module/Application/src/Entity/Chargens/Noeud.php: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -2,12 +2,12 @@ namespace Application\Entity\Chargens; use Application\Entity\Db\ElementPedagogique; use Application\Entity\Db\Etape; use Application\Entity\Db\Scenario; use Application\Entity\Db\Structure; use Application\Entity\Db\TypeIntervention; use Application\Provider\Chargens\ChargensProvider; use OffreFormation\Entity\Db\ElementPedagogique; use OffreFormation\Entity\Db\Etape; use OffreFormation\Entity\Db\TypeIntervention; class Noeud { Loading Loading
data/Etats de sortie/export_services_csv.php +4 −2 Changes for data/Etats de sortie/export_services_csv.php: 4 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -13,6 +13,8 @@ // initialisation use OffreFormation\Entity\Db\TypeIntervention; $res = []; $shown = []; $typesIntervention = []; Loading Loading @@ -126,7 +128,7 @@ foreach ($data as $d) { if ($d['TYPE_INTERVENTION_ID'] != null) { $tid = $d['TYPE_INTERVENTION_ID']; if (!isset($typesIntervention[$tid])) { $typesIntervention[$tid] = $entityManager->getRepository(\Application\Entity\Db\TypeIntervention::class)->find($tid); $typesIntervention[$tid] = $entityManager->getRepository(TypeIntervention::class)->find($tid); } $typeIntervention = $typesIntervention[$tid]; $invertTi['type-intervention-' . $typeIntervention->getCode()] = $typeIntervention->getId(); Loading Loading @@ -210,7 +212,7 @@ uasort($typesIntervention, function ($ti1, $ti2) { return $ti1->getOrdre() - $ti2->getOrdre(); }); foreach ($typesIntervention as $typeIntervention) { /* @var $typeIntervention \Application\Entity\Db\TypeIntervention */ /* @var \OffreFormation\Entity\Db\TypeIntervention $typeIntervention */ $head['type-intervention-' . $typeIntervention->getCode()] = $typeIntervention->getCode(); } $head['heures-ref'] = 'Référentiel'; Loading
module/Application/config/aaa_module.config.php +1 −1 Changes for module/Application/config/aaa_module.config.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -163,7 +163,7 @@ $config = [ Service\AnneeService::class => Service\AnneeService::class, Service\LocalContextService::class => Service\LocalContextService::class, Service\ParametresService::class => Service\ParametresService::class, Service\TypeInterventionService::class => Service\TypeInterventionService::class, \OffreFormation\Service\TypeInterventionService::class => \OffreFormation\Service\TypeInterventionService::class, Service\SourceService::class => Service\SourceService::class, Service\AffectationService::class => Service\AffectationService::class, Service\RoleService::class => Service\RoleService::class, Loading
module/Application/config/paiement.config.php +1 −1 Changes for module/Application/config/paiement.config.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -268,7 +268,7 @@ return [ Service\ServiceAPayerService::class => Service\ServiceAPayerService::class, Service\MiseEnPaiementService::class => Service\MiseEnPaiementService::class, Service\MiseEnPaiementIntervenantStructureService::class => Service\MiseEnPaiementIntervenantStructureService::class, Service\TypeHeuresService::class => Service\TypeHeuresService::class, \OffreFormation\Service\TypeHeuresService::class => \OffreFormation\Service\TypeHeuresService::class, Service\CentreCoutService::class => Service\CentreCoutService::class, \OffreFormation\Service\CentreCoutEpService::class => \OffreFormation\Service\CentreCoutEpService::class, Service\MotifNonPaiementService::class => Service\MotifNonPaiementService::class, Loading
module/Application/src/Controller/ChargensController.php +4 −4 Changes for module/Application/src/Controller/ChargensController.php: 4 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -3,7 +3,6 @@ namespace Application\Controller; use Application\Entity\Db\Annee; use Application\Entity\Db\Etape; use Application\Entity\Db\Scenario; use Application\Entity\Db\SeuilCharge; use Application\Form\Chargens\Traits\DifferentielFormAwareTrait; Loading @@ -14,16 +13,17 @@ use Application\Form\Chargens\Traits\ScenarioFormAwareTrait; use Application\Provider\Chargens\ChargensProviderAwareTrait; use Application\Provider\Privilege\Privileges; use Application\Service\Traits\ContextServiceAwareTrait; use OffreFormation\Service\Traits\EtapeServiceAwareTrait; use Application\Service\Traits\ScenarioServiceAwareTrait; use Application\Service\Traits\SeuilChargeServiceAwareTrait; use Application\Service\Traits\StructureServiceAwareTrait; use BjyAuthorize\Exception\UnAuthorizedException; use Laminas\View\Model\JsonModel; use Laminas\View\Model\ViewModel; use OffreFormation\Service\Traits\EtapeServiceAwareTrait; use OffreFormation\Entity\Db\Etape; use UnicaenApp\Util; use UnicaenApp\View\Model\CsvModel; use UnicaenApp\View\Model\MessengerViewModel; use Laminas\View\Model\JsonModel; use Laminas\View\Model\ViewModel; /** Loading
module/Application/src/Entity/Chargens/Noeud.php +3 −3 Changes for module/Application/src/Entity/Chargens/Noeud.php: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -2,12 +2,12 @@ namespace Application\Entity\Chargens; use Application\Entity\Db\ElementPedagogique; use Application\Entity\Db\Etape; use Application\Entity\Db\Scenario; use Application\Entity\Db\Structure; use Application\Entity\Db\TypeIntervention; use Application\Provider\Chargens\ChargensProvider; use OffreFormation\Entity\Db\ElementPedagogique; use OffreFormation\Entity\Db\Etape; use OffreFormation\Entity\Db\TypeIntervention; class Noeud { Loading