Loading composer.lock +449 −518 File changed.Preview size limit exceeded, changes collapsed. Show changes module/Application/src/Constants.php +1 −1 Changes for module/Application/src/Constants.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -5,7 +5,7 @@ namespace Application; class Constants { const DATE_FORMAT = 'd/m/Y'; const DATETIME_FORMAT = 'd/m/Y à H:i'; const DATETIME_FORMAT = 'd/m/Y H:i'; const DATE_SORT = 'ymd'; const BDD = 'doctrine.entitymanager.orm_default'; } No newline at end of file module/Application/src/Service/TagService.php +1 −0 Changes for module/Application/src/Service/TagService.php: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -43,6 +43,7 @@ class TagService extends AbstractEntityService public function getList(QueryBuilder $qb = null, $alias = null) { list($qb, $alias) = $this->initQuery($qb, $alias); $qb->andWhere("$alias.histoDestruction is Null"); $qb->addOrderBy("$alias.libelleLong"); return parent::getList($qb, $alias); } Loading module/Enseignement/src/Controller/VolumeHoraireController.php +5 −18 Changes for module/Enseignement/src/Controller/VolumeHoraireController.php: 5 added lines, 18 removed lines. Original line number Diff line number Diff line Loading @@ -87,28 +87,17 @@ class VolumeHoraireController extends AbstractController /** @var Service $service */ $service = $this->getEvent()->getParam('service'); /*foreach ($service->getVolumeHoraire() as $v) { $tag = $v->getTag(); var_dump($tag->getLibelleLong()); } die; */ if (!$service) { throw new \Exception('Service non fourni'); } $volumeHoraireListe = new VolumeHoraireListe($service); $tags = $volumeHoraireListe->getTags(); foreach ($tags as $tag) { // var_dump($tag->getLibelleLong()); } $vhlph = new ListeFilterHydrator(); $vhlph->setEntityManager($this->em()); $paramsQuery = $this->params()->fromQuery(); $paramsPost = $this->params()->fromPost(); $vhlph->hydrate($this->params()->fromQuery() + $this->params()->fromPost(), $volumeHoraireListe); $service->setTypeVolumeHoraire($volumeHoraireListe->getTypeVolumeHoraire()); Loading @@ -128,7 +117,7 @@ die; $form->setViewTag($canViewTag); $form->setEditTag($canEditTag); $form->build(); $form->bindRequestSave($volumeHoraireListe, $this->getRequest(), function (VolumeHoraireListe $vhl) use ($hDeb, $volumeHoraireListe) { $bind = $form->bindRequestSave($volumeHoraireListe, $this->getRequest(), function (VolumeHoraireListe $vhl) use ($hDeb, $volumeHoraireListe) { try { $service = $vhl->getService(); $this->getProcessusPlafond()->beginTransaction(); Loading @@ -149,8 +138,7 @@ die; } public function suppressionCalendaireAction() public function suppressionCalendaireAction() { /** @var Service $service */ $service = $this->getEvent()->getParam('service'); Loading Loading @@ -181,8 +169,7 @@ die; } private function updateTableauxBord(Intervenant $intervenant) private function updateTableauxBord(Intervenant $intervenant) { $this->getServiceWorkflow()->calculerTableauxBord([ 'formule', 'validation_enseignement', 'service', 'piece_jointe_fournie', Loading module/Enseignement/src/Entity/VolumeHoraireListe.php +8 −5 Changes for module/Enseignement/src/Entity/VolumeHoraireListe.php: 8 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -772,16 +772,23 @@ class VolumeHoraireListe } } /* Sinon on privilégie sans tag */ $taga = $a->getTag() ? 1 : 0; $tagb = $b->getTag() ? 1 : 0; if ($taga != $tagb) return $taga > $tagb; /* Sinon on trie par date */ $hda = $a->getHoraireDebut() ? $a->getHoraireDebut()->getTimestamp() : 0; $hdb = $b->getHoraireDebut() ? $b->getHoraireDebut()->getTimestamp() : 0; if ($hda != $hdb) return ($hda > $hdb) ? 1 : -1; /* Sinon on privilégie sans motif de non paiement */ $mnpa = $a->getMotifNonPaiement() ? 1 : 0; $mnpb = $b->getMotifNonPaiement() ? 1 : 0; if ($mnpa != $mnpb) return $mnpa > $mnpb; /* Si c'est pareil alors on ne supprime surtout pas pour pouvoir garder!! */ if ($heures + $aHeures * -1 == 0) { return 1; Loading Loading @@ -959,8 +966,6 @@ class VolumeHoraireListe self::FILTRE_HORAIRE_FIN, self::FILTRE_TYPE_INTERVENTION, self::FILTRE_PERIODE, self::FILTRE_MOTIF_NON_PAIEMENT, self::FILTRE_TAG, ]; foreach ($vhs as $vh) { Loading @@ -981,9 +986,7 @@ class VolumeHoraireListe if ($motifNonPaiement !== false) { $vh->setMotifNonPaiement($motifNonPaiement); } if ($tag !== false) { $vh->setTag($tag); } } else { $heuresAReporter += $vh->getHeures(); $rid = $this->makeSousListeId($vh, $reportFilters); Loading Loading
module/Application/src/Constants.php +1 −1 Changes for module/Application/src/Constants.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -5,7 +5,7 @@ namespace Application; class Constants { const DATE_FORMAT = 'd/m/Y'; const DATETIME_FORMAT = 'd/m/Y à H:i'; const DATETIME_FORMAT = 'd/m/Y H:i'; const DATE_SORT = 'ymd'; const BDD = 'doctrine.entitymanager.orm_default'; } No newline at end of file
module/Application/src/Service/TagService.php +1 −0 Changes for module/Application/src/Service/TagService.php: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -43,6 +43,7 @@ class TagService extends AbstractEntityService public function getList(QueryBuilder $qb = null, $alias = null) { list($qb, $alias) = $this->initQuery($qb, $alias); $qb->andWhere("$alias.histoDestruction is Null"); $qb->addOrderBy("$alias.libelleLong"); return parent::getList($qb, $alias); } Loading
module/Enseignement/src/Controller/VolumeHoraireController.php +5 −18 Changes for module/Enseignement/src/Controller/VolumeHoraireController.php: 5 added lines, 18 removed lines. Original line number Diff line number Diff line Loading @@ -87,28 +87,17 @@ class VolumeHoraireController extends AbstractController /** @var Service $service */ $service = $this->getEvent()->getParam('service'); /*foreach ($service->getVolumeHoraire() as $v) { $tag = $v->getTag(); var_dump($tag->getLibelleLong()); } die; */ if (!$service) { throw new \Exception('Service non fourni'); } $volumeHoraireListe = new VolumeHoraireListe($service); $tags = $volumeHoraireListe->getTags(); foreach ($tags as $tag) { // var_dump($tag->getLibelleLong()); } $vhlph = new ListeFilterHydrator(); $vhlph->setEntityManager($this->em()); $paramsQuery = $this->params()->fromQuery(); $paramsPost = $this->params()->fromPost(); $vhlph->hydrate($this->params()->fromQuery() + $this->params()->fromPost(), $volumeHoraireListe); $service->setTypeVolumeHoraire($volumeHoraireListe->getTypeVolumeHoraire()); Loading @@ -128,7 +117,7 @@ die; $form->setViewTag($canViewTag); $form->setEditTag($canEditTag); $form->build(); $form->bindRequestSave($volumeHoraireListe, $this->getRequest(), function (VolumeHoraireListe $vhl) use ($hDeb, $volumeHoraireListe) { $bind = $form->bindRequestSave($volumeHoraireListe, $this->getRequest(), function (VolumeHoraireListe $vhl) use ($hDeb, $volumeHoraireListe) { try { $service = $vhl->getService(); $this->getProcessusPlafond()->beginTransaction(); Loading @@ -149,8 +138,7 @@ die; } public function suppressionCalendaireAction() public function suppressionCalendaireAction() { /** @var Service $service */ $service = $this->getEvent()->getParam('service'); Loading Loading @@ -181,8 +169,7 @@ die; } private function updateTableauxBord(Intervenant $intervenant) private function updateTableauxBord(Intervenant $intervenant) { $this->getServiceWorkflow()->calculerTableauxBord([ 'formule', 'validation_enseignement', 'service', 'piece_jointe_fournie', Loading
module/Enseignement/src/Entity/VolumeHoraireListe.php +8 −5 Changes for module/Enseignement/src/Entity/VolumeHoraireListe.php: 8 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -772,16 +772,23 @@ class VolumeHoraireListe } } /* Sinon on privilégie sans tag */ $taga = $a->getTag() ? 1 : 0; $tagb = $b->getTag() ? 1 : 0; if ($taga != $tagb) return $taga > $tagb; /* Sinon on trie par date */ $hda = $a->getHoraireDebut() ? $a->getHoraireDebut()->getTimestamp() : 0; $hdb = $b->getHoraireDebut() ? $b->getHoraireDebut()->getTimestamp() : 0; if ($hda != $hdb) return ($hda > $hdb) ? 1 : -1; /* Sinon on privilégie sans motif de non paiement */ $mnpa = $a->getMotifNonPaiement() ? 1 : 0; $mnpb = $b->getMotifNonPaiement() ? 1 : 0; if ($mnpa != $mnpb) return $mnpa > $mnpb; /* Si c'est pareil alors on ne supprime surtout pas pour pouvoir garder!! */ if ($heures + $aHeures * -1 == 0) { return 1; Loading Loading @@ -959,8 +966,6 @@ class VolumeHoraireListe self::FILTRE_HORAIRE_FIN, self::FILTRE_TYPE_INTERVENTION, self::FILTRE_PERIODE, self::FILTRE_MOTIF_NON_PAIEMENT, self::FILTRE_TAG, ]; foreach ($vhs as $vh) { Loading @@ -981,9 +986,7 @@ class VolumeHoraireListe if ($motifNonPaiement !== false) { $vh->setMotifNonPaiement($motifNonPaiement); } if ($tag !== false) { $vh->setTag($tag); } } else { $heuresAReporter += $vh->getHeures(); $rid = $this->makeSousListeId($vh, $reportFilters); Loading