Loading module/Application/src/Service/ContratService.php +4 −82 Original line number Diff line number Diff line Loading @@ -2,7 +2,6 @@ namespace Application\Service; use Application\Entity\Db\ModeleContrat; use Application\Service\Traits\EtatSortieServiceAwareTrait; use Application\Service\Traits\FichierServiceAwareTrait; use Application\Service\Traits\TypeContratServiceAwareTrait; Loading @@ -14,6 +13,7 @@ use Doctrine\ORM\QueryBuilder; use Application\Entity\Db\Contrat; use Application\Entity\Db\Intervenant; use Application\Entity\Db\Fichier; use RuntimeException; use Unicaen\OpenDocument\Document; Loading @@ -33,7 +33,7 @@ class ContratService extends AbstractEntityService /** * retourne la classe des entités * Retourne la classe des entités * * @return string * @throws RuntimeException Loading Loading @@ -227,89 +227,11 @@ class ContratService extends AbstractEntityService if ($download) { $document->download($fileName); } else { return $document; } } private function generateData(ModeleContrat $modele, Contrat $contrat) { $connection = $this->getEntityManager()->getConnection(); $params = ['contrat' => $contrat->getId()]; $mainData = $connection->fetchAssociative('SELECT * FROM V_CONTRAT_MAIN WHERE CONTRAT_ID = :contrat', $params); if ($modele->getRequete()) { $mainDataPerso = $connection->fetchAssociative($modele->getRequete(), $params); foreach ($mainDataPerso as $key => $value) { // if ($value) { $mainData[$key] = $value; // } } } $data = [0 => $mainData]; $blocs = $modele->getBlocs(); foreach ($blocs as $bname => $bquery) { $bdata = $connection->fetchAllAssociative($bquery, $params); $bkey = $bname . '@table:table-row'; $data[0][$bkey] = $bdata; } if (!isset($data[0]['serviceCode@table:table-row']) && !isset($data[0]['serviceComposante@table:table-row']) && !isset($data[0]['serviceLibelle@table:table-row']) && !isset($data[0]['serviceHeures@table:table-row']) ) { $data[0]['serviceCode@table:table-row'] = $connection->fetchAllAssociative('SELECT * FROM V_CONTRAT_SERVICES WHERE CONTRAT_ID = :contrat', $params); } if (isset($mainData['exemplaire1']) && $mainData['exemplaire1'] && ('0' !== $mainData['exemplaire1'])) { $data[0]['exemplaire'] = $mainData['exemplaire1']; unset($mainData['exemplaire1']); } if (isset($mainData['exemplaire2']) && $mainData['exemplaire2'] && ('0' !== $mainData['exemplaire2'])) { $data[1] = $data[0]; $data[1]['exemplaire'] = $mainData['exemplaire2']; unset($mainData['exemplaire2']); } if (isset($mainData['exemplaire3']) && $mainData['exemplaire3'] && ('0' !== $mainData['exemplaire3'])) { $data[2] = $data[0]; $data[2]['exemplaire'] = $mainData['exemplaire3']; unset($mainData['exemplaire3']); } return $data; } private function getRank(ModeleContrat $modele, Contrat $contrat) { $rank = 100; if ($modele->getStructure() && $contrat->getStructure()) { if ($modele->getStructure() == $contrat->getStructure()) { $rank += 40; } else { return 0; } } if ($modele->getStatut() && $contrat->getIntervenant()->getStatut()) { if ($modele->getStatut()->getCode() == $contrat->getIntervenant()->getStatut()->getCode()) { $rank += 55; return null; } else { return 0; } return $document; } return $rank; } } No newline at end of file Loading
module/Application/src/Service/ContratService.php +4 −82 Original line number Diff line number Diff line Loading @@ -2,7 +2,6 @@ namespace Application\Service; use Application\Entity\Db\ModeleContrat; use Application\Service\Traits\EtatSortieServiceAwareTrait; use Application\Service\Traits\FichierServiceAwareTrait; use Application\Service\Traits\TypeContratServiceAwareTrait; Loading @@ -14,6 +13,7 @@ use Doctrine\ORM\QueryBuilder; use Application\Entity\Db\Contrat; use Application\Entity\Db\Intervenant; use Application\Entity\Db\Fichier; use RuntimeException; use Unicaen\OpenDocument\Document; Loading @@ -33,7 +33,7 @@ class ContratService extends AbstractEntityService /** * retourne la classe des entités * Retourne la classe des entités * * @return string * @throws RuntimeException Loading Loading @@ -227,89 +227,11 @@ class ContratService extends AbstractEntityService if ($download) { $document->download($fileName); } else { return $document; } } private function generateData(ModeleContrat $modele, Contrat $contrat) { $connection = $this->getEntityManager()->getConnection(); $params = ['contrat' => $contrat->getId()]; $mainData = $connection->fetchAssociative('SELECT * FROM V_CONTRAT_MAIN WHERE CONTRAT_ID = :contrat', $params); if ($modele->getRequete()) { $mainDataPerso = $connection->fetchAssociative($modele->getRequete(), $params); foreach ($mainDataPerso as $key => $value) { // if ($value) { $mainData[$key] = $value; // } } } $data = [0 => $mainData]; $blocs = $modele->getBlocs(); foreach ($blocs as $bname => $bquery) { $bdata = $connection->fetchAllAssociative($bquery, $params); $bkey = $bname . '@table:table-row'; $data[0][$bkey] = $bdata; } if (!isset($data[0]['serviceCode@table:table-row']) && !isset($data[0]['serviceComposante@table:table-row']) && !isset($data[0]['serviceLibelle@table:table-row']) && !isset($data[0]['serviceHeures@table:table-row']) ) { $data[0]['serviceCode@table:table-row'] = $connection->fetchAllAssociative('SELECT * FROM V_CONTRAT_SERVICES WHERE CONTRAT_ID = :contrat', $params); } if (isset($mainData['exemplaire1']) && $mainData['exemplaire1'] && ('0' !== $mainData['exemplaire1'])) { $data[0]['exemplaire'] = $mainData['exemplaire1']; unset($mainData['exemplaire1']); } if (isset($mainData['exemplaire2']) && $mainData['exemplaire2'] && ('0' !== $mainData['exemplaire2'])) { $data[1] = $data[0]; $data[1]['exemplaire'] = $mainData['exemplaire2']; unset($mainData['exemplaire2']); } if (isset($mainData['exemplaire3']) && $mainData['exemplaire3'] && ('0' !== $mainData['exemplaire3'])) { $data[2] = $data[0]; $data[2]['exemplaire'] = $mainData['exemplaire3']; unset($mainData['exemplaire3']); } return $data; } private function getRank(ModeleContrat $modele, Contrat $contrat) { $rank = 100; if ($modele->getStructure() && $contrat->getStructure()) { if ($modele->getStructure() == $contrat->getStructure()) { $rank += 40; } else { return 0; } } if ($modele->getStatut() && $contrat->getIntervenant()->getStatut()) { if ($modele->getStatut()->getCode() == $contrat->getIntervenant()->getStatut()->getCode()) { $rank += 55; return null; } else { return 0; } return $document; } return $rank; } } No newline at end of file