Commit 645f6df7 authored by Jean-Baptiste Oellers's avatar Jean-Baptiste Oellers
Browse files

Ajout tri nom responsable scientifique

parent 70d0425d

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

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

            $tri_champ = $tri_champ_query_param;

        }

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

+10 −0
Changes for module/Oscar/src/Oscar/Service/PcruApiFetchAllService.php: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -516,6 +516,16 @@ class PcruApiFetchAllService implements UseEntityManager, UseLoggerService, UseO 
    $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([]);





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

  }

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

+51 −3
Changes for module/Oscar/view/oscar/pcru/contratspcru.phtml: 51 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -226,9 +226,57 @@ 
              <input type="submit" value="🠋" style="background-color: inherit; border: 0; <?= ($tri_champ == 'dureeClean' && $tri_ordre == 'DESC') ? 'text-decoration-line: overline;' : '' ?>">

            </form>

          </th>

          <th>Type de contrat</th>

          <th>Source de financement</th>

          <th>Responsable scientifique</th>

          <th>

            <span>Type de contrat</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="typeContrat">

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

            </form>

          </th>

          <th>

            <span>Source de financement</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="sourceFinancement">

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

            </form>

          </th>

          <th>

            <span>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="nomResponsableScientifique">

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

            </form>

          </th>

          <th>Employeur du responsable scientifique</th>

          <th>Équipe</th>

          <th>Partenaire principal</th>