Commit 110c7d42 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Changement affichage des structures fermées dans le filtre des thèses

parent 14d4298b

CHANGELOG.md

+2 −1
Original line number Diff line number Diff line 
Journal des modifications

=========================



1.4.9 (07/09/2020)

1.4.9 (08/09/2020)

------------------



- Changement de catégorie pour les privilèges associés aux pages d'information

- Ajout d'une configuration pour le fil d'actualité.

- Ajout du champ IdREF pour toutes les structures et modification de l'affichage/saisie des informations.

- Changement de l'affichage des structures fermées dans le filtre des thèses



1.4.8 (01/09/2020)

------------------

doc/release-notes/v1.4.9.md

+8 −2
Original line number Diff line number Diff line 
# Version 1.4.8

# Version 1.4.9



## 1. Sur le serveur d'application
@@ -23,3 +23,9 @@ bash ./install.sh 
INSERT INTO SYGAL_DEV.CATEGORIE_PRIVILEGE (ID, CODE, LIBELLE, ORDRE) VALUES (7, 'page-information', 'Pages d''information', 15);

UPDATE PRIVILEGE SET CATEGORIE_ID=7 WHERE ID=10;

``` 



- Ajout de la colonne *ID_REF* dans la table *STRUCTURE*



```SQL

ALTER TABLE STRUCTURE ADD "ID_REF" VARCHAR2(1024);

```  
 No newline at end of file

module/Application/src/Application/Service/These/TheseRechercheService.php

+3 −3
Original line number Diff line number Diff line
@@ -827,15 +827,15 @@ EOS; 
    {

        if ($value instanceof Etablissement) {

            $subtext = $value->getLibelle();

            if ($value->getStructure()->isFerme()) $subtext.= "&nbsp; <span class='label' style='color:darkred;'>FERME</span>";

            if ($value->getStructure()->isFerme()) $subtext.= "&nbsp; FERME";

            return ['value' => $value->getStructure()->getCode(), 'label' => $subtext];

        } elseif ($value instanceof EcoleDoctorale) {

            $subtext = $value->getLibelle();

            if ($value->getStructure()->isFerme()) $subtext.= "&nbsp; <span class='label' style='color:darkred;'>FERMEE</span>";

            if ($value->getStructure()->isFerme()) $subtext.= "&nbsp; FERMEE";

            return ['value' => $value->getSourceCode(), 'label' => $value->getSigle(), 'subtext' => $subtext];

        } elseif ($value instanceof UniteRecherche) {

            $subtext = $value->getLibelle();

            if ($value->getStructure()->isFerme()) $subtext.= "&nbsp; <span class='label' style='color:darkred;'>FERMEE</span>";

            if ($value->getStructure()->isFerme()) $subtext.= "&nbsp; FERMEE";

            return ['value' => $value->getSourceCode(), 'label' => $value->getSigle(), 'subtext' => $subtext];

        } elseif ($value instanceof DomaineScientifique) {

            return ['value' => (string) $value->getId(), 'label' => $value->getLibelle()];

module/Application/src/Application/View/Helper/SelectsFilterPanel/partial/filter-form-item-select.phtml

+8 −2
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ $liveSearch = isset($paramAttributes['liveSearch']) ? (bool)$paramAttributes['li 
        class="filter selectpicker show-menu-arrow"

        name="<?php echo $paramName ?>"

        data-live-search="<?php echo $liveSearch ? 'true' : 'false' ?>"

        data-width="<?php echo $width ?>">

        data-width="<?php echo $width ?>"

        data-html="true"

>



<?php foreach ($filter->getOptions() as $data): ?>
@@ -31,7 +33,11 @@ $liveSearch = isset($paramAttributes['liveSearch']) ? (bool)$paramAttributes['li 
    $subtext = isset($data['subtext']) ? $data['subtext'] : '';

    $isActive = SelectsFilterPanelHelper::isSelectOptionActive($paramName, $value, $queryParams);

    ?>

    <option value="<?php echo $value ?>" <?php echo $isActive ? 'selected' : '' ?> data-subtext="<?php echo $subtext ?>">

    <option value="<?php echo $value ?>" <?php echo $isActive ? 'selected' : '' ?>

            <?php if (strpos($subtext,'FERME',0) !== false) : ?>

                style="background: #ea9e9e; "

            <?php endif; ?>

            data-subtext="<?php echo $subtext ?>">

        <?php echo $label ?>

    </option>