Commit 1712676e authored by Jean-Baptiste Oellers's avatar Jean-Baptiste Oellers
Browse files

Ajout tri partenaire principal

parent 9977e97b

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

+1 −1
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', 'employeurNomResponsableScientifique', 'equipe'))) {

        if (in_array($tri_champ_query_param, array('referenceGestionnaire', 'codeUnite', 'objetClean', 'dateDerniereSignatureClean', 'dateFinClean', 'dureeClean', 'typeContrat', 'sourceFinancement', 'nomResponsableScientifique', 'employeurNomResponsableScientifique', 'equipe', 'partenairePrincipal'))) {

            $tri_champ = $tri_champ_query_param;

        }

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

+7 −0
Original line number Diff line number Diff line
@@ -529,6 +529,13 @@ class PcruApiFetchAllService implements UseEntityManager, UseLoggerService, UseO 
    $stmt = $this->entityManager->getConnection()->prepare($sql);

    $stmt->execute([]);



    $sql = "

    UPDATE PcruApiContrats

	    SET partenaireprincipal = NULL WHERE TRIM(partenaireprincipal) = '';

    ";

    $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
Original line number Diff line number Diff line
@@ -311,7 +311,23 @@ 
              <input type="submit" value="🠋" style="background-color: inherit; border: 0; <?= ($tri_champ == 'equipe' && $tri_ordre == 'DESC') ? '' : 'text-decoration-line: overline;' ?>">

            </form>

          </th>

          <th>Partenaire principal</th>

          <th>

            <span>Partenaire principal</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="partenairePrincipal">

              <input type="submit" value="🠉" style="background-color: inherit; border: 0; <?= ($tri_champ == 'partenairePrincipal' && $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="partenairePrincipal">

              <input type="submit" value="🠋" style="background-color: inherit; border: 0; <?= ($tri_champ == 'partenairePrincipal' && $tri_ordre == 'DESC') ? '' : 'text-decoration-line: overline;' ?>">

            </form>

          </th>

          <th>Partenaires</th>

          <th>Coordonnateur consortium</th>

          <th>Montant perçu par l'unité</th>