Commit 9ed38983 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'soutenance_horodatage' into release_5.2.11

parents 3a167ceb c698f477
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ return [
        'UnicaenPdf',
        'UnicaenRenderer',
        'UnicaenParametre',
        'Horodatage',
        'Structure',
        'These',
        'Fichier',
+17 −0
Original line number Diff line number Diff line
@@ -413,4 +413,21 @@ BEGIN
END;
$$;

-- Horodatage
drop table soutenance_evenement;

create table horodatage_horodatage (
  id         serial        constraint horodatage_horodatage_pk       primary key,
  date       timestamp     not null,
  user_id    integer       not null constraint horodatage_horodatage_utilisateur_id_fk references utilisateur,
  type       varchar(1024) not null,
  complement varchar(1024)
);
create table soutenance_horodatage
(
  proposition_id integer not null constraint soutenance_horodatage_soutenance_proposition_id_fk references soutenance_proposition on delete cascade,
  horodatage_id  integer not null constraint soutenance_horodatage_horodatage_horodatage_id_fk  references horodatage_horodatage  on delete cascade,
  constraint soutenance_horodatage_pk primary key (proposition_id, horodatage_id)
);

```
 No newline at end of file
+29 −0
Original line number Diff line number Diff line
<?php
namespace Horodatage;

use Laminas\Config\Factory as ConfigFactory;
use Laminas\Stdlib\Glob;

class Module
{
    public function getConfig()
    {
        $paths = array_merge(
            [__DIR__ . '/config/module.config.php'],
            Glob::glob(__DIR__ . '/config/others/{,*.}{config}.php', Glob::GLOB_BRACE)
        );

        return ConfigFactory::fromFiles($paths);
    }

    public function getAutoloaderConfig(): array
    {
        return array(
            'Laminas\Loader\StandardAutoloader' => array(
                'namespaces' => array(
                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
                ),
            ),
        );
    }
}
+24 −0
Original line number Diff line number Diff line
create table horodatage_horodatage
(
    id          serial
                constraint horodatage_horodatage_pk primary key,
    date        timestamp     not null,
    user_id     integer       not null
                constraint horodatage_horodatage_utilisateur_id_fk
                references utilisateur,
    type        varchar(1024) not null,
    complement  varchar(1024)
);

create table soutenance_horodatage
(
    proposition_id integer not null
        constraint soutenance_horodatage_soutenance_proposition_id_fk
            references soutenance_proposition on delete cascade,
    horodatage_id  integer not null
        constraint soutenance_horodatage_horodatage_horodatage_id_fk
        references horodatage_horodatage on delete cascade,
    constraint soutenance_horodatage_pk primary key (proposition_id, horodatage_id)
);

+78 −0
Original line number Diff line number Diff line
<?php

namespace Horodatage;

use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
use Doctrine\ORM\Mapping\Driver\XmlDriver;
use Formation\Provider\IdentityProvider;
use Formation\Provider\IdentityProviderFactory;
use Formation\Service\Notification\FormationNotificationFactory;
use Formation\Service\Notification\FormationNotificationFactoryFactory;
use Formation\Service\Url\UrlService;
use Formation\Service\Url\UrlServiceFactory;
use Formation\View\Helper\EtatViewHelper;
use Formation\View\Helper\FormateursViewHelper;
use Formation\View\Helper\ModaliteViewHelper;
use Formation\View\Helper\SeancesViewHelper;
use Formation\View\Helper\SessionInscriptionViewHelper;
use Formation\View\Helper\SessionLibelleViewHelper;
use Formation\View\Helper\SiteViewHelper;
use Formation\View\Helper\TypeViewHelper;
use UnicaenAuth\Provider\Rule\PrivilegeRuleProvider;

return array(
    'bjyauthorize' => [
        'resource_providers' => [
            'BjyAuthorize\Provider\Resource\Config' => [
                'Acteur' => [],
            ],
        ],
        'rule_providers' => [
            PrivilegeRuleProvider::class => [
                'allow' => [
                ],
            ],
        ],
    ],

    'doctrine' => [
        'driver' => [
            'orm_default' => [
                'class' => MappingDriverChain::class,
                'drivers' => [
                    'Horodatage\Entity\Db' => 'orm_default_xml_driver',
                ],
            ],
            'orm_default_xml_driver' => [
                'class' => XmlDriver::class,
                'cache' => 'array',
                'paths' => [
                    __DIR__ . '/../src/Horodatage/Entity/Db/Mapping',
                ],
            ],
        ],
    ],

    'service_manager' => [
        'factories' => [
        ],
    ],

    'view_manager' => [
        'template_path_stack' => [
            __DIR__ . '/../view',
        ],
    ],

    'view_helpers' => [
        'invokables' => [
        ]
    ],

    'public_files' => [
        'inline_scripts' => [
        ],
        'stylesheets' => [
        ],
    ],
);
Loading