Ajout tri employeur (c1ee4e46) · Commits · open-source / oscar

module/Oscar/src/Oscar/Controller/PcruController.php

+1 −1

Changes for module/Oscar/src/Oscar/Controller/PcruController.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -494,7 +494,7 @@ class PcruController extends AbstractOscarController implements UseLoggerService
		}
		$tri_champ = "dateDebutClean";
		$tri_champ_query_param = trim($this->params()->fromQuery('tri_champ'));
		if (in_array($tri_champ_query_param, array('referenceGestionnaire', 'codeUnite', 'objetClean', 'dateDerniereSignatureClean', 'dateFinClean', 'dureeClean', 'typeContrat', 'sourceFinancement', 'nomResponsableScientifique'))) {
		if (in_array($tri_champ_query_param, array('referenceGestionnaire', 'codeUnite', 'objetClean', 'dateDerniereSignatureClean', 'dateFinClean', 'dureeClean', 'typeContrat', 'sourceFinancement', 'nomResponsableScientifique', 'employeurNomResponsableScientifique'))) {
		$tri_champ = $tri_champ_query_param;
		}

module/Oscar/src/Oscar/Service/PcruApiFetchAllService.php

+6 −10

Changes for module/Oscar/src/Oscar/Service/PcruApiFetchAllService.php: 6 added lines, 10 removed lines.
Original line number	Diff line number	Diff line
		@@ -355,7 +355,6 @@ class PcruApiFetchAllService implements UseEntityManager, UseLoggerService, UseO
		where
		pcruapicontrats.id = subquery.id;
		";

		$stmt = $this->entityManager->getConnection()->prepare($sql);
		$stmt->execute([]);

		@@ -411,7 +410,6 @@ class PcruApiFetchAllService implements UseEntityManager, UseLoggerService, UseO
		where
		pcruapicontrats.id = subquery.id;
		";

		$stmt = $this->entityManager->getConnection()->prepare($sql);
		$stmt->execute([]);

		@@ -467,7 +465,6 @@ class PcruApiFetchAllService implements UseEntityManager, UseLoggerService, UseO
		where
		pcruapicontrats.id = subquery.id;
		";

		$stmt = $this->entityManager->getConnection()->prepare($sql);
		$stmt->execute([]);

		@@ -480,7 +477,6 @@ class PcruApiFetchAllService implements UseEntityManager, UseLoggerService, UseO
		else false
		end);
		";

		$stmt = $this->entityManager->getConnection()->prepare($sql);
		$stmt->execute([]);

		@@ -488,7 +484,6 @@ class PcruApiFetchAllService implements UseEntityManager, UseLoggerService, UseO
		UPDATE PcruApiContrats
		SET montantPercuCentimeClean = (montantpercu::numeric * 100)::bigint WHERE montantpercu != '';
		";

		$stmt = $this->entityManager->getConnection()->prepare($sql);
		$stmt->execute([]);

		@@ -496,7 +491,6 @@ class PcruApiFetchAllService implements UseEntityManager, UseLoggerService, UseO
		UPDATE PcruApiContrats
		SET contributionFinanceurCentimeClean = (contributionFinanceur::numeric * 100)::bigint WHERE contributionFinanceur != '';
		";

		$stmt = $this->entityManager->getConnection()->prepare($sql);
		$stmt->execute([]);

		@@ -504,7 +498,6 @@ class PcruApiFetchAllService implements UseEntityManager, UseLoggerService, UseO
		UPDATE PcruApiContrats
		SET montantTotalCentimeClean = (montanttotal::numeric * 100)::bigint WHERE montanttotal != '';
		";

		$stmt = $this->entityManager->getConnection()->prepare($sql);
		$stmt->execute([]);

		@@ -512,19 +505,22 @@ class PcruApiFetchAllService implements UseEntityManager, UseLoggerService, UseO
		UPDATE PcruApiContrats
		SET dureeClean = (duree::numeric * 100)::bigint WHERE duree != '';
		";

		$stmt = $this->entityManager->getConnection()->prepare($sql);
		$stmt->execute([]);


		$sql = "
		UPDATE PcruApiContrats
		SET nomresponsablescientifique = NULL WHERE TRIM(nomresponsablescientifique) = '';
		";

		$stmt = $this->entityManager->getConnection()->prepare($sql);
		$stmt->execute([]);

		$sql = "
		UPDATE PcruApiContrats
		SET employeurnomresponsablescientifique = NULL WHERE TRIM(employeurnomresponsablescientifique) = '';
		";
		$stmt = $this->entityManager->getConnection()->prepare($sql);
		$stmt->execute([]);

		$logs[] = "Fin du post traitement des données des contrats";
		}

module/Oscar/view/oscar/pcru/contratspcru.phtml

+17 −1

Changes for module/Oscar/view/oscar/pcru/contratspcru.phtml: 17 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -277,7 +277,23 @@
		<input type="submit" value="🠋" style="background-color: inherit; border: 0; <?= ($tri_champ == 'nomResponsableScientifique' && $tri_ordre == 'DESC') ? 'text-decoration-line: overline;' : '' ?>">
		</form>
		</th>
		<th>Employeur du responsable scientifique</th>
		<th>
		<span>Employeur du responsable scientifique</span>
		<form style="display: inline;">
		<input type="hidden" name="recherche" value="<?= $recherche ?>">
		<input type="hidden" name="par_page" value="<?= $par_page ?>">
		<input type="hidden" name="tri_ordre" value="ASC">
		<input type="hidden" name="tri_champ" value="employeurNomResponsableScientifique">
		<input type="submit" value="🠉" style="background-color: inherit; border: 0; <?= ($tri_champ == 'employeurNomResponsableScientifique' && $tri_ordre == 'ASC') ? 'text-decoration-line: overline;' : '' ?>">
		</form>
		<form style="display: inline;">
		<input type="hidden" name="recherche" value="<?= $recherche ?>">
		<input type="hidden" name="par_page" value="<?= $par_page ?>">
		<input type="hidden" name="tri_ordre" value="DESC">
		<input type="hidden" name="tri_champ" value="employeurNomResponsableScientifique">
		<input type="submit" value="🠋" style="background-color: inherit; border: 0; <?= ($tri_champ == 'employeurNomResponsableScientifique' && $tri_ordre == 'DESC') ? 'text-decoration-line: overline;' : '' ?>">
		</form>
		</th>
		<th>Équipe</th>
		<th>Partenaire principal</th>
		<th>Partenaires</th>