Commit 703c9b6a authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'Fix-TheseUR_et_TheseED'

parents 3124ff01 65c94ad2

module/Application/view/application/these/index.phtml

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ $acteursFormatter->asSeparated() 
                <abbr title="<?php echo $these->getEcoleDoctorale()->getLibelle() ?>"><?php echo $these->getEcoleDoctorale()->getSourceCode() ?></abbr>

                <?php endif ?>

            </td>

            <td><abbr title="<?php echo $these->getLibelleUniteRecherche() ?>"><?php echo $these->getCodeUniteRecherche() ?></abbr></td>

            <td><abbr title="<?php echo $these->getLibelleUniteRecherche() ?>"><?php echo $these->getUniteRecherche()->getSourceCode() ?></abbr></td>

            <td><?php

                echo $this->dateFormat($these->getDatePremiereInscription(),IntlDateFormatter::MEDIUM);

                ?>

module/Import/src/Import/Service/FetcherService.php

+2 −2
Original line number Diff line number Diff line
@@ -296,8 +296,8 @@ class FetcherService 
            elseif ($propriete === "theseId")       $value = $this->code."::".$entity_json->{'theseId'};

            elseif ($propriete === "doctorantId")   $value = $this->code."::".$entity_json->{'doctorantId'};

            elseif ($propriete === "structureId")   $value = $this->code."::".$entity_json->{'structureId'};

//            elseif ($propriete === "ecoleDoctoraleId")   $value = $this->code."::".$entity_json->{'ecoleDoctoraleId'};

//            elseif ($propriete === "uniteRechercheId")   $value = $this->code."::".$entity_json->{'uniteRechercheId'};

            elseif ($propriete === "ecoleDoctId")   $value = $this->code."::".$entity_json->{'ecoleDoctId'};

            elseif ($propriete === "uniteRechId")   $value = $this->code."::".$entity_json->{'uniteRechId'};

            else $value = $entity_json->{$propriete};

            $valuesArray[] = $this->prepValue($value, $type);

        }