Commit c130825d authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'develop'

parents d2ff9d35 deabf09d
Loading
Loading
Loading
Loading
Loading

.gitmodules

deleted100644 → 0
+0 −3
Changes for .gitmodules: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
[submodule "deploiement"]
	path = deploiement
	url = git@git.unicaen.fr:dsi/deploiement/sygal.git

bin/fichiers.csv

deleted100755 → 0
+0 −97
Changes for bin/fichiers.csv: 0 added lines, 97 removed lines.
Original line number Diff line number Diff line
enabled|directory|filename|command
0|/var/www/Theses/data|2014-FOSSEZ-KEVIN.pdf|cines
0|/var/www/Theses/data|2015-BUARD-PIERRE-YVES.pdf|cines
0|/var/www/Theses/data|2015-DESMONT-JEAN_RENE.pdf|cines
0|/var/www/Theses/data|2015-GLEITZ-ANNE-SOPHIE.pdf|cines
0|/var/www/Theses/data|2013-MARMIN-STELLA.pdf|cines
1|/var/www/Theses/data|2014- DUPONT-XAVIER.pdf|cines
0|/var/www/Theses/data|2014- HUN- KANAL.pdf|cines
0|/var/www/Theses/data|2014- NGUYEN- THI THU  HIEN.pdf|cines
0|/var/www/Theses/data|2014-ADONG-FEDDY.pdf|cines
0|/var/www/Theses/data|2014-BEAUMALE-MARINE.pdf|cines
0|/var/www/Theses/data|2014-BECHOUX-KEVIN.pdf|cines
0|/var/www/Theses/data|2014-BILLARD-VINCENT.pdf|cines
0|/var/www/Theses/data|2014-CHAFFIN-LAURENCE.pdf|cines
0|/var/www/Theses/data|2014-CHEN-JIANJUN.pdf|cines
0|/var/www/Theses/data|2014-CUFFOLO-RAPHAEL.pdf|cines
0|/var/www/Theses/data|2014-DAVESNNE-CHRISTIAN.pdf|cines
0|/var/www/Theses/data|2014-DEKHICI-MEBROUKA.pdf|cines
0|/var/www/Theses/data|2014-DING-JING_JIE.pdf|cines
0|/var/www/Theses/data|2014-DUDOUET-JEREMY.pdf|cines
0|/var/www/Theses/data|2014-ELCHAKIK-ABDALLAH.pdf|cines
0|/var/www/Theses/data|2014-ELKHAWAGA-MOHAMED.pdf|cines
0|/var/www/Theses/data|2014-FODIL-KAMEL.pdf|cines
0|/var/www/Theses/data|2014-FURGEROT-LUCILLE.pdf|cines
0|/var/www/Theses/data|2014-GRUYER-DIEGO.pdf|cines
0|/var/www/Theses/data|2014-GUEYDAN-ANTOINE.pdf|cines
0|/var/www/Theses/data|2014-HABACHA-HAMDI.pdf|cines
0|/var/www/Theses/data|2014-HEBERT- MARIE.docx|cines
0|/var/www/Theses/data|2014-HEBERT- MARIE.pdf|cines
0|/var/www/Theses/data|2014-HELAINE-VICTOR.pdf|cines
0|/var/www/Theses/data|2014-HEUGUET-ROMAIN.pdf|cines
0|/var/www/Theses/data|2014-JAMET-GUILLAUME.pdf|cines
0|/var/www/Theses/data|2014-KAMWA-ERIC.pdf|cines
0|/var/www/Theses/data|2014-LABADIE-MATHIEU.pdf|cines
0|/var/www/Theses/data|2014-LANGLINAY-THOMAS.pdf|cines
0|/var/www/Theses/data|2014-LELIEVRE-GUILLAUME.pdf|cines
0|/var/www/Theses/data|2014-LEPABIC-CHARLES.pdf|cines
0|/var/www/Theses/data|2014-LESEPT-FLAVIE.pdf|cines
0|/var/www/Theses/data|2014-MARTIN-MARIE.pdf|cines
0|/var/www/Theses/data|2014-MIECAZE-CATHERINE.pdf|cines
0|/var/www/Theses/data|2014-MORENO-JOSE.pdf|cines
0|/var/www/Theses/data|2014-MOUAWIA-ALI.pdf|cines
0|/var/www/Theses/data|2014-MOVAHHEDI-MOHAMMAD.pdf|cines
0|/var/www/Theses/data|2014-NGUYEN THI -THU  HIEN.pdf|cines
0|/var/www/Theses/data|2014-NGUYEN THI- VAN ANH.pdf|cines
0|/var/www/Theses/data|2014-NGUYEN-DANG HAN.pdf|cines
0|/var/www/Theses/data|2014-PADOVANI-SIMONA.pdf|cines
0|/var/www/Theses/data|2014-PAUL-CLEMENT.pdf|cines
0|/var/www/Theses/data|2014-ROBERT-MARIE.pdf|cines
0|/var/www/Theses/data|2014-ROBITAILLE-AUDREY.pdf|cines
0|/var/www/Theses/data|2014-SAAVEDRA MAYORGA-JUAN JAVIER.pdf|cines
0|/var/www/Theses/data|2014-SAGGESE- ALESSIA.pdf|cines
0|/var/www/Theses/data|2014-SANABRIA-MAURICIO.pdf|cines
0|/var/www/Theses/data|2014-SYED-IDRUS.pdf|cines
0|/var/www/Theses/data|2014-THOREL-MAXIME.pdf|cines
0|/var/www/Theses/data|2014-UGARTE ROJAS- WILLY.pdf|cines
0|/var/www/Theses/data|2014-VIGNET-JULIEN.pdf|cines
0|/var/www/Theses/data|2015- DAISY-MAXIME.pdf|cines
0|/var/www/Theses/data|2015-ALBINI-MATHIEU.pdf|cines
0|/var/www/Theses/data|2015-AYMARD-FRANCOIS.pdf|cines
0|/var/www/Theses/data|2015-BOISSONAT-GUILLAUME.pdf|cines
0|/var/www/Theses/data|2015-BOQUET-CAROLINE.pdf|cines
0|/var/www/Theses/data|2015-BOUGHZALA-OUALID.pdf|cines
0|/var/www/Theses/data|2015-CORNET-VALERIE.pdf|cines
0|/var/www/Theses/data|2015-CRESPIN-CYRIL.pdf|cines
0|/var/www/Theses/data|2015-CUADRADO RICA-HECTOR.pdf|cines
0|/var/www/Theses/data|2015-CUARDO-HECTOR.pdf|cines
0|/var/www/Theses/data|2015-DELACOTTE-CHARLENE.pdf|cines
0|/var/www/Theses/data|2015-DEMESLAY-FLORENT.pdf|cines
0|/var/www/Theses/data|2015-DEMESLAY-FLORENT.pdf|cines
0|/var/www/Theses/data|2015-FABIAN-XAVIER.pdf|cines
0|/var/www/Theses/data|2015-FALL-MAMADOU LAMINE.pdf|cines
0|/var/www/Theses/data|2015-GEORGIEVA-VESELINA.pdf|cines
0|/var/www/Theses/data|2015-GIRONDE-ALEXANDRA.pdf|cines
0|/var/www/Theses/data|2015-ISKANLAR-WAEL.pdf|cines
0|/var/www/Theses/data|2015-KIN-NATHALIE.pdf|cines
0|/var/www/Theses/data|2015-KOHLER-CAROLINE.pdf|cines
0|/var/www/Theses/data|2015-LACOTTE-MORGANE.pdf|cines
0|/var/www/Theses/data|2015-LAHBIB-IMENE.pdf|cines
0|/var/www/Theses/data|2015-LALUT-JULIEN.pdf|cines
0|/var/www/Theses/data|2015-LECARPENTIER-JUSTIN-Vol.1.pdf|cines
0|/var/www/Theses/data|2015-LECARPENTIER-JUSTIN-Vol.2.pdf|cines
0|/var/www/Theses/data|2015-LEPREVOST-ALEXANDRE.pdf|cines
0|/var/www/Theses/data|2015-LEQUESNE-JUSTINE.pdf|cines
0|/var/www/Theses/data|2015-LOZES-FRANCOIS.pdf|cines
0|/var/www/Theses/data|2015-MARTIN-PAUL.pdf|cines
0|/var/www/Theses/data|2015-MARTIN-TRISTAN.pdf|cines
0|/var/www/Theses/data|2015-MORE-CHEVALIER.pdf|cines
0|/var/www/Theses/data|2015-PELE-ANNE-LAURE.pdf|cines
0|/var/www/Theses/data|2015-POUTOT-CLEMENT.pdf|cines
0|/var/www/Theses/data|2015-TIBI-ZEINA.pdf|cines
0|/var/www/Theses/data|2015-TOUTAIN-MATTHIEU.pdf|cines
0|/var/www/Theses/data|2015-ZHIGANG-YAO.pdf|cines
0|/var/www/Theses/data|2016-AL ALWANI-ADNAN SALIH SAHLE.pdf|cines
0|/var/www/Theses/data|2016-BROUARD-VANESSA.pdf|cines
0|/var/www/Theses/data|2016-GALMICHE-MARION.pdf|cines
0|/var/www/Theses/data|2016-MAILLARD ANNE.pdf|cines

code/db_file_gen.php

deleted100644 → 0
+0 −104
Changes for code/db_file_gen.php: 0 added lines, 104 removed lines.
Original line number Diff line number Diff line
<?php
/**
 * @var $this       \Zend\View\Renderer\PhpRenderer
 * @var $controller \UnicaenCode\Controller\Controller
 * @var $viewName   string
 */

use Doctrine\DBAL\Connection;
use Doctrine\ORM\NoResultException;
use UnicaenOracle\Service\DataService;
use UnicaenOracle\Service\SchemaService;

$destDir = __DIR__ . '/';

/** @var SchemaService $schemaService */
$schemaService = $controller->getServiceLocator()->get(SchemaService::class);
/** @var DataService $dataService */
$dataService = $controller->getServiceLocator()->get(DataService::class);

/** @var Connection $srcSchemaConn */
$srcSchemaConn = $controller->getServiceLocator()->get('doctrine.connection.orm_default');

$srcSchema = 'SYGAL';
$dstSchema = 'SYGAL_TEST';

echo "<h1>DB Schema files generator</h1>";

/**
 * Schema clearing.
 */
$outputFilePath = $destDir . "/oracle-clear-schema-$dstSchema.sql";
echo "<h2>Schema clearing</h2>";
try {
    $schemaService->createSchemaClearingScriptFile($srcSchemaConn, $dstSchema, $outputFilePath);
    var_dump($outputFilePath);
} catch (NoResultException $e) {
    var_dump("Impossible de générer le script de vidage du schéma '$dstSchema'. 
    Peut-être est-il déjà vide ou alors le schéma n'est pas accessible avec la connexion utilisée.");
}

/**
 * Schema creation.
 */
$outputFilePath = $destDir . "/oracle-generate-schema-$dstSchema-from-$srcSchema.sql";
$schemaService->createSchemaCreationScriptFile($srcSchemaConn, $srcSchema, $dstSchema, $outputFilePath);
echo "<h2>Schema creation</h2>";
var_dump($outputFilePath);

/**
 * Data inserts.
 */
$tableNames = [
    'ACTEUR',
    'ATTESTATION',
    'CATEGORIE_PRIVILEGE',
    'DIFFUSION',
    'DOCTORANT',
    'DOCTORANT_COMPL',
    'DOMAINE_SCIENTIFIQUE',
    'ECOLE_DOCT',
    'ETABLISSEMENT',
    'ETABLISSEMENT_RATTACH',
    'FAQ',
    'FICHIER',
    'IMPORT_NOTIF',
    'IMPORT_OBS_NOTIF',
    'IMPORT_OBS_RESULT_NOTIF',
    'IMPORT_OBSERV',
    'IMPORT_OBSERV_RESULT',
    'INDIVIDU',
    'INDIVIDU_ROLE',
    'MAIL_CONFIRMATION',
    'METADONNEE_THESE',
    'NATURE_FICHIER',
    'NOTIF',
    'NOTIF_RESULT',
    'PRIVILEGE',
    'RDV_BU',
    'ROLE',
    'ROLE_MODELE',
    'ROLE_PRIVILEGE',
    'ROLE_PRIVILEGE_MODELE',
    'SOURCE',
    'STRUCTURE',
    'STRUCTURE_SUBSTIT',
    'THESE',
    'TYPE_STRUCTURE',
    'TYPE_VALIDATION',
    'UNITE_DOMAINE_LINKER',
    'UNITE_RECH',
    'UTILISATEUR',
    'VALIDATION',
    'VALIDITE_FICHIER',
    'VARIABLE',
    'VERSION_FICHIER',
    'WF_ETAPE',
];
$outputFilePathTemplate = $destDir . "/oracle-data-insert-from-$srcSchema.%s-into-$dstSchema.sql";
$outputFilePaths = $dataService->createDataInsertsScriptFile($srcSchemaConn, $dstSchema, $tableNames, $outputFilePathTemplate);
echo "<h2>Data inserts</h2>";
var_dump($outputFilePaths);


code/structure.php

deleted100644 → 0
+0 −50
Changes for code/structure.php: 0 added lines, 50 removed lines.
Original line number Diff line number Diff line
<?php

/**
 * @var $this \Zend\View\Renderer\PhpRenderer
 * @var $controller \UnicaenCode\Controller\Controller
 * @var $viewName string
 */

use Application\Entity\Db\Structure;
use Application\Entity\Db\UniteRecherche;
use Application\Service\Structure\StructureService;


/** @var StructureService $structureService */
$structureService = $controller->getServiceLocator()->get(StructureService::class);

///** @var Structure $s1 */
///** @var Structure $s2 */
///** @var Structure $s3 */
//$s1 = $structureService->getEntityManager()->getRepository(UniteRecherche::class)->findOneBySourceCode('UCN::UMR6176');
//$s2 = $structureService->getEntityManager()->getRepository(UniteRecherche::class)->findOneBySourceCode('UCN::UMR6185');
//$s3 = $structureService->getEntityManager()->getRepository(UniteRecherche::class)->findOneBySourceCode('UCN::UMR6194');
//
//$dataObject = new UniteRecherche();
//$dataObject->setLibelle('UMR6176 * UMR6185 * UMR6194');
//$dataObject->setCheminLogo('/tmp/test.png');
//$dataObject->setSigle('U*U*U');
//
//$strSubstits = $structureService->createStructureSubstitutions([$s1, $s2, $s3], $dataObject);
//$sc = $strSubstits[0]->getToStructure();


/** @var UniteRecherche $sc */
$sc = $structureService->getEntityManager()->getRepository(UniteRecherche::class)->createQueryBuilder('ur')
    ->join('ur.structure', 's')
    ->where('s.sigle = :sigle')
    ->setParameter('sigle', 'U*U*U')
    ->getQuery()->getSingleResult();
//var_dump($sc, count($sc->getStructure()->getStructuresSubstituees()));
array_map(
    function(Structure $s) {
        var_dump($s->getSourceCode());
    },
    $sc->getStructure()->getStructuresSubstituees()->toArray()
);




//$sc = $structureService->getEntityManager()->getRepository(UniteRecherche::class)->findOneBySigle('U*U*U');
+6 −6
Changes for composer.lock: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -1864,11 +1864,11 @@
        },
        {
            "name": "unicaen/app",
            "version": "1.3.17",
            "version": "1.3.21",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/app.git",
                "reference": "e043750b9658219ececbe8fe4280b742b53ea332"
                "reference": "b9bff28b8f304748390ef9b8b8d4f30889147a0f"
            },
            "require": {
                "doctrine/doctrine-orm-module": ">=0.7",
@@ -1911,7 +1911,7 @@
                ]
            },
            "description": "Module de base des applications unicaen",
            "time": "2018-11-19T11:09:37+00:00"
            "time": "2018-12-14T10:27:17+00:00"
        },
        {
            "name": "unicaen/auth",
@@ -2094,11 +2094,11 @@
        },
        {
            "name": "unicaen/oracle",
            "version": "1.2.1",
            "version": "1.2.3",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/oracle.git",
                "reference": "fc16a7394c40ffa50324f7028e90431f9ecae12a"
                "reference": "bc79ca51396e377999225c02f1726a153a2f342c"
            },
            "require": {
                "doctrine/dbal": "^2.5",
@@ -2118,7 +2118,7 @@
                ]
            },
            "description": "Bibliothèque utile lorsqu'on utilise un base de données Oracle",
            "time": "2018-09-11T07:47:55+00:00"
            "time": "2018-12-06T10:39:40+00:00"
        },
        {
            "name": "webmozart/assert",
Loading