Commit 90bed7fc authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Merge branch 'macclane-pcru' into spartan

parents bcbc31f3 49b932ee

.gitmodules

0 → 100644
+3 −0
Changes for .gitmodules: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
[submodule "public/js/certic-ui-components"]

	path = public/js/certic-ui-components

	url = git@git.unicaen.fr:certic/certic-ui-components.git

bin/oscar-worker.php

+3 −1
Changes for bin/oscar-worker.php: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -38,14 +38,16 @@ $worker->addFunction('hello', 'oscarJob_hello'); 


// Affiche dans le journalctl -u oscarworker.service -f

echo "OSCAR WORKER STARTED\n";

echo "Version: " . \Oscar\OscarVersion::getBuild() . "\n";



while($worker->work());



function getServiceManager(){

    global $app;

    return $app->getServiceManager();

}



while($worker->work());



function oscarJob_indexActivity(GearmanJob $job){

    $params = json_decode($job->workload());

config/autoload/global.php

+7 −0
Changes for config/autoload/global.php: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,13 @@ return array( 
        'theme' => 'oscar',

        'themes' => ['oscar', 'adaj', 'debug'],



        // Référenciel PCRU

        'pcru' => [

            'polecompetitivite' => __DIR__ .'/../../install/pcru-pole-competitivite.json',

            'sourcefinancement' => __DIR__ .'/../../install/pcru-sources-financement.json',

            'contracttype' => __DIR__ .'/../../install/pcru-contracts-types.json',

        ],



        'htmltopdfrenderer' => [

            'class' => \Oscar\Formatter\File\HtmlToPdfDomPDFFormatter::class,

            'arguments' => []

config/autoload/local.php.dist

+2 −0
Changes for config/autoload/local.php.dist: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ return array( 
        // gearman

        'gearman-job-server-host' => 'localhost',







        ////////////////////////////////////////////////////////////////////////

        // ! EXPERIMENTAL !

        'generated-documents' => [

doc/connectors.md

+2 −1
Changes for doc/connectors.md: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -264,7 +264,8 @@ De la même façon, 2 URL peuvent être utilisées pour synchroniser les donnée 
    "url" : "",

    "email" : "",

    "siret" : "",

    "type": "Type d'organisation tel que configuré dans Oscar"

    "type": "Type d'organisation tel que configuré dans Oscar",

    "labintel": ""

}

```