Loading module/Contrat/src/Service/ContratService.php +17 −7 Changes for module/Contrat/src/Service/ContratService.php: 17 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -95,7 +95,8 @@ class ContratService extends AbstractEntityService */ public function orderBy(?QueryBuilder $qb = null, $alias = null) { [$qb, $alias] = $this->initQuery($qb, $alias); [$qb, $alias] = $this->initQuery($qb, $alias); $qb->addOrderBy("$alias.intervenant, $alias.typeContrat, $alias.numeroAvenant"); Loading @@ -115,7 +116,8 @@ class ContratService extends AbstractEntityService */ public function finderByValidation($validation, ?QueryBuilder $qb = null, $alias = null) { [$qb, $alias] = $this->initQuery($qb, $alias); [$qb, $alias] = $this->initQuery($qb, $alias); if ($validation instanceof \Workflow\Entity\Db\Validation) { $qb Loading Loading @@ -216,7 +218,8 @@ class ContratService extends AbstractEntityService foreach ($signatureFlowDatas['steps'] as $key => $step) { //Si l'étape de process concerne un rôle de l'application on va chercher les utilisateurs de ce role. if (in_array($step['recipient_method'], ['by_etablissement', 'by_etablissement_and_intervenant']) && empty($step['recipients'])) { if (in_array($step['recipient_method'], ['by_etablissement', 'by_etablissement_and_intervenant']) && empty($step['recipients'])) { $role = ''; if (array_key_exists('by_etablissement', $step['options'])) { $role = $this->getServiceRole()->get($step['options']['by_etablissement']); Loading Loading @@ -264,7 +267,8 @@ class ContratService extends AbstractEntityService } //Si l'étape de process concerne l'intervenant du contrat on va chercher l'email de l'intervenant. if (in_array($step['recipient_method'], ['by_intervenant', 'by_etablissement_and_intervenant']) && empty($step['recipients'])) { if (in_array($step['recipient_method'], ['by_intervenant', 'by_etablissement_and_intervenant']) && empty($step['recipients'])) { $intervenant = $contrat->getIntervenant(); $nom = $intervenant->getNomUsuel(); $prenom = $intervenant->getPrenom(); Loading Loading @@ -387,7 +391,9 @@ class ContratService extends AbstractEntityService foreach ($files as $file) { $path = $file['tmp_name']; $nomFichier = str_replace([',', ';', ':'], '', $file['name']); $nomFichier = str_replace([',', ';', ':'], '', $file['name']); $typeFichier = $file['type']; $tailleFichier = $file['size']; Loading Loading @@ -585,7 +591,8 @@ class ContratService extends AbstractEntityService //file_put_contents($path . '/' . $fichierContratNom, $fichierContratContent); $filesystem = new Filesystem(); $filesystem->appendToFile($filename, $fichierContratContent); $filesystem->chmod($path . '/' . $fichierContratNom, 0777); // $filesystem->chmod($path . '/' . $fichierContratNom, 0777, 0000, true); } return $fichierContrat; Loading Loading @@ -624,7 +631,9 @@ class ContratService extends AbstractEntityService foreach ($files as $file) { $path = $file['tmp_name']; $nomFichier = str_replace([',', ';', ':'], '', $file['name']); $nomFichier = str_replace([',', ';', ':'], '', $file['name']); $typeFichier = $file['type']; $tailleFichier = $file['size']; Loading Loading @@ -703,6 +712,7 @@ class ContratService extends AbstractEntityService } public function getContratWithProcessWaiting() { Loading Loading
module/Contrat/src/Service/ContratService.php +17 −7 Changes for module/Contrat/src/Service/ContratService.php: 17 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -95,7 +95,8 @@ class ContratService extends AbstractEntityService */ public function orderBy(?QueryBuilder $qb = null, $alias = null) { [$qb, $alias] = $this->initQuery($qb, $alias); [$qb, $alias] = $this->initQuery($qb, $alias); $qb->addOrderBy("$alias.intervenant, $alias.typeContrat, $alias.numeroAvenant"); Loading @@ -115,7 +116,8 @@ class ContratService extends AbstractEntityService */ public function finderByValidation($validation, ?QueryBuilder $qb = null, $alias = null) { [$qb, $alias] = $this->initQuery($qb, $alias); [$qb, $alias] = $this->initQuery($qb, $alias); if ($validation instanceof \Workflow\Entity\Db\Validation) { $qb Loading Loading @@ -216,7 +218,8 @@ class ContratService extends AbstractEntityService foreach ($signatureFlowDatas['steps'] as $key => $step) { //Si l'étape de process concerne un rôle de l'application on va chercher les utilisateurs de ce role. if (in_array($step['recipient_method'], ['by_etablissement', 'by_etablissement_and_intervenant']) && empty($step['recipients'])) { if (in_array($step['recipient_method'], ['by_etablissement', 'by_etablissement_and_intervenant']) && empty($step['recipients'])) { $role = ''; if (array_key_exists('by_etablissement', $step['options'])) { $role = $this->getServiceRole()->get($step['options']['by_etablissement']); Loading Loading @@ -264,7 +267,8 @@ class ContratService extends AbstractEntityService } //Si l'étape de process concerne l'intervenant du contrat on va chercher l'email de l'intervenant. if (in_array($step['recipient_method'], ['by_intervenant', 'by_etablissement_and_intervenant']) && empty($step['recipients'])) { if (in_array($step['recipient_method'], ['by_intervenant', 'by_etablissement_and_intervenant']) && empty($step['recipients'])) { $intervenant = $contrat->getIntervenant(); $nom = $intervenant->getNomUsuel(); $prenom = $intervenant->getPrenom(); Loading Loading @@ -387,7 +391,9 @@ class ContratService extends AbstractEntityService foreach ($files as $file) { $path = $file['tmp_name']; $nomFichier = str_replace([',', ';', ':'], '', $file['name']); $nomFichier = str_replace([',', ';', ':'], '', $file['name']); $typeFichier = $file['type']; $tailleFichier = $file['size']; Loading Loading @@ -585,7 +591,8 @@ class ContratService extends AbstractEntityService //file_put_contents($path . '/' . $fichierContratNom, $fichierContratContent); $filesystem = new Filesystem(); $filesystem->appendToFile($filename, $fichierContratContent); $filesystem->chmod($path . '/' . $fichierContratNom, 0777); // $filesystem->chmod($path . '/' . $fichierContratNom, 0777, 0000, true); } return $fichierContrat; Loading Loading @@ -624,7 +631,9 @@ class ContratService extends AbstractEntityService foreach ($files as $file) { $path = $file['tmp_name']; $nomFichier = str_replace([',', ';', ':'], '', $file['name']); $nomFichier = str_replace([',', ';', ':'], '', $file['name']); $typeFichier = $file['type']; $tailleFichier = $file['size']; Loading Loading @@ -703,6 +712,7 @@ class ContratService extends AbstractEntityService } public function getContratWithProcessWaiting() { Loading