Commit 9977e97b authored by Jean-Baptiste Oellers's avatar Jean-Baptiste Oellers
Browse files

Ajout tri équipe

parent c1ee4e46

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', 'employeurNomResponsableScientifique'))) {

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

            $tri_champ = $tri_champ_query_param;

        }

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

+7 −0
Changes for module/Oscar/src/Oscar/Service/PcruApiFetchAllService.php: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -522,6 +522,13 @@ class PcruApiFetchAllService implements UseEntityManager, UseLoggerService, UseO 
    $stmt = $this->entityManager->getConnection()->prepare($sql);

    $stmt->execute([]);



    $sql = "

    UPDATE PcruApiContrats

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

    ";

    $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

+43 −27
Changes for module/Oscar/view/oscar/pcru/contratspcru.phtml: 43 added lines, 27 removed lines.
Original line number Diff line number Diff line
@@ -55,28 +55,28 @@ 
        <input type="hidden" name="tri_ordre" value="<?= $tri_ordre ?>">

        <input type="hidden" name="tri_champ" value="<?= $tri_champ ?>">

        <input type="hidden" name="par_page" value="15">

        <input class="contrats-pcru-par-page" type="submit" value="15" <?= $par_page == 15 ? 'disabled' : '' ?> >

        <input <?= $par_page == 15 ? 'style="text-decoration-line: none;"' : '' ?> class="contrats-pcru-par-page" type="submit" value="15" <?= $par_page == 15 ? 'disabled' : '' ?> >

    </form>

    <form>

        <input type="hidden" name="recherche" value="<?= $recherche ?>">

        <input type="hidden" name="tri_ordre" value="<?= $tri_ordre ?>">

        <input type="hidden" name="tri_champ" value="<?= $tri_champ ?>">

        <input type="hidden" name="par_page" value="25">

        <input class="contrats-pcru-par-page" type="submit" value="25" <?= $par_page == 25 ? 'disabled' : '' ?> >

        <input <?= $par_page == 25 ? 'style="text-decoration-line: none;"' : '' ?> class="contrats-pcru-par-page" type="submit" value="25" <?= $par_page == 25 ? 'disabled' : '' ?> >

    </form>

    <form>

        <input type="hidden" name="recherche" value="<?= $recherche ?>">

        <input type="hidden" name="tri_ordre" value="<?= $tri_ordre ?>">

        <input type="hidden" name="tri_champ" value="<?= $tri_champ ?>">

        <input type="hidden" name="par_page" value="50">

        <input class="contrats-pcru-par-page" type="submit" value="50" <?= $par_page == 50 ? 'disabled' : '' ?>>

        <input <?= $par_page == 50 ? 'style="text-decoration-line: none;"' : '' ?> class="contrats-pcru-par-page" type="submit" value="50" <?= $par_page == 50 ? 'disabled' : '' ?>>

    </form>

    <form>

        <input type="hidden" name="recherche" value="<?= $recherche ?>">

        <input type="hidden" name="tri_ordre" value="<?= $tri_ordre ?>">

        <input type="hidden" name="tri_champ" value="<?= $tri_champ ?>">

        <input type="hidden" name="par_page" value="100">

        <input class="contrats-pcru-par-page" type="submit" value="100" <?= $par_page == 100 ? 'disabled' : '' ?>>

        <input <?= $par_page == 100 ? 'style="text-decoration-line: none;"' : '' ?> class="contrats-pcru-par-page" type="submit" value="100" <?= $par_page == 100 ? 'disabled' : '' ?>>

    </form>

  </div>
@@ -114,14 +114,14 @@ 
              <input type="hidden" name="par_page" value="<?= $par_page ?>">

              <input type="hidden" name="tri_ordre" value="ASC">

              <input type="hidden" name="tri_champ" value="referenceGestionnaire">

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

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

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

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

            </form>

          </th>

          <th>
@@ -131,14 +131,14 @@ 
              <input type="hidden" name="par_page" value="<?= $par_page ?>">

              <input type="hidden" name="tri_ordre" value="ASC">

              <input type="hidden" name="tri_champ" value="codeUnite">

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

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

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

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

            </form>

          </th>

          <th>
@@ -148,14 +148,14 @@ 
              <input type="hidden" name="par_page" value="<?= $par_page ?>">

              <input type="hidden" name="tri_ordre" value="ASC">

              <input type="hidden" name="tri_champ" value="dateDebutClean">

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

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

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

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

            </form>

          </th>

          <th>
@@ -165,14 +165,14 @@ 
              <input type="hidden" name="par_page" value="<?= $par_page ?>">

              <input type="hidden" name="tri_ordre" value="ASC">

              <input type="hidden" name="tri_champ" value="objetClean">

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

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

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

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

            </form>

          </th>

          <th>
@@ -182,14 +182,14 @@ 
              <input type="hidden" name="par_page" value="<?= $par_page ?>">

              <input type="hidden" name="tri_ordre" value="ASC">

              <input type="hidden" name="tri_champ" value="dateDerniereSignatureClean">

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

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

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

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

            </form>

          </th>

          <th>
@@ -199,14 +199,14 @@ 
              <input type="hidden" name="par_page" value="<?= $par_page ?>">

              <input type="hidden" name="tri_ordre" value="ASC">

              <input type="hidden" name="tri_champ" value="dateFinClean">

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

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

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

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

            </form>

          </th>

          <th>
@@ -216,14 +216,14 @@ 
              <input type="hidden" name="par_page" value="<?= $par_page ?>">

              <input type="hidden" name="tri_ordre" value="ASC">

              <input type="hidden" name="tri_champ" value="dureeClean">

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

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

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

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

            </form>

          </th>

          <th>
@@ -233,14 +233,14 @@ 
              <input type="hidden" name="par_page" value="<?= $par_page ?>">

              <input type="hidden" name="tri_ordre" value="ASC">

              <input type="hidden" name="tri_champ" value="typeContrat">

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

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

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

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

            </form>

          </th>

          <th>
@@ -250,14 +250,14 @@ 
              <input type="hidden" name="par_page" value="<?= $par_page ?>">

              <input type="hidden" name="tri_ordre" value="ASC">

              <input type="hidden" name="tri_champ" value="sourceFinancement">

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

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

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

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

            </form>

          </th>

          <th>
@@ -267,14 +267,14 @@ 
              <input type="hidden" name="par_page" value="<?= $par_page ?>">

              <input type="hidden" name="tri_ordre" value="ASC">

              <input type="hidden" name="tri_champ" value="nomResponsableScientifique">

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

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

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

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

            </form>

          </th>

          <th>
@@ -284,17 +284,33 @@ 
              <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;' : '' ?>">

              <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;' : '' ?>">

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

            </form>

          </th>

          <th>

            <span>Équipe</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="equipe">

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

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

            </form>

          </th>

          <th>Équipe</th>

          <th>Partenaire principal</th>

          <th>Partenaires</th>

          <th>Coordonnateur consortium</th>