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

Ajout tri pole de compétitivité

parent c79a5ccb

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', 'partenairePrincipal', 'partenaire', 'coordonnateurConsortium', 'montantPercuCentimeClean', 'contributionFinanceurCentimeClean'))) {

        if (in_array($tri_champ_query_param, array('referenceGestionnaire', 'codeUnite', 'objetClean', 'dateDerniereSignatureClean', 'dateFinClean', 'dureeClean', 'typeContrat', 'sourceFinancement', 'nomResponsableScientifique', 'employeurNomResponsableScientifique', 'equipe', 'partenairePrincipal', 'partenaire', 'coordonnateurConsortium', 'montantPercuCentimeClean', 'contributionFinanceurCentimeClean', 'montantTotalCentimeClean', 'poleCompetitivite'))) {

            $tri_champ = $tri_champ_query_param;

        }

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

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

    $stmt->execute([]);



    $sql = "

    UPDATE PcruApiContrats

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

    ";

    $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

+34 −2
Original line number Diff line number Diff line
@@ -396,8 +396,40 @@ 
              <input type="submit" value="🠋" style="background-color: inherit; border: 0; <?= ($tri_champ == 'contributionFinanceurCentimeClean' && $tri_ordre == 'DESC') ? '' : 'text-decoration-line: overline;' ?>" <?= ($tri_champ == 'contributionFinanceurCentimeClean' && $tri_ordre == 'DESC') ? 'disabled' : '' ?>>

            </form>

          </th>

          <th>Montant total</th>

          <th>Pôle de compétitivité</th>

          <th>

            <span>Montant total</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="montantTotalCentimeClean">

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

            </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="montantTotalCentimeClean">

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

            </form>

          </th>

          <th>

            <span>Pôle de compétitivité</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="poleCompetitivite">

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

            </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="poleCompetitivite">

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

            </form>

          </th>

          <th>PIA</th>

          <th>Accord cadre</th>

          <th>Chaire industrielle</th>