Commit 0bbd8e8e authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'main' of https://git.unicaen.fr/lib/unicaen/etat into HEAD

parents de194f9b 95705a78

config/merged/unicaen-etat.global.php.dist

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?php



use UnicaenEtat\Controller\EtatTypeController;

use UnicaenPrivilege\Guard\PrivilegeController;



return [

'navigation' => [

        'default' => [

            'home' => [

                'pages' => [

                    'administration' => [

                        'pages' => [

                            'unicaen-etat' => [

                                'label' => 'État',

                                'route' => 'unicaen-etat/etat-type',

                                'resource' => PrivilegeController::getResourceId(EtatTypeController::class, 'index'),

                                'order'    => 5000,

                                'icon' => 'fas fa-angle-right',

                                'pages' => [

                                ],

                            ],

                        ],

                    ],

                ],

            ],

        ],

    ],

];



?>
 
 No newline at end of file

config/module.config.php

+0 −22
Original line number Diff line number Diff line
@@ -47,28 +47,6 @@ return [ 
        ],

    ],



    'navigation' => [

        'default' => [

            'home' => [

                'pages' => [

                    'administration' => [

                        'pages' => [

                            'unicaen-etat' => [

                                'label' => 'État',

                                'route' => 'unicaen-etat/etat-type',

                                'resource' => PrivilegeController::getResourceId(EtatTypeController::class, 'index'),

                                'order'    => 5000,

                                'icon' => 'fas fa-angle-right',

                                'pages' => [

                                ],

                            ],

                        ],

                    ],

                ],

            ],

        ],

    ],



    'view_manager'    => [

        'template_path_stack' => [

            __DIR__ . '/../view',

documentation/001_table.sql

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ create table unicaen_etat_instance 
(

    id                      serial          constraint unicaen_etat_instance_pk primary key,

    type_id                 integer         not null constraint unicaen_etat_instance_type_id references unicaen_etat_type,

    infos                   text            default null,

    histo_creation          timestamp       not null,

    histo_createur_id       integer         not null constraint unicaen_content_content_user_id_fk references unicaen_utilisateur_user,

    histo_modification      timestamp,

public/css/unicaen-etat.css

+9 −0
Original line number Diff line number Diff line
@@ -20,3 +20,12 @@ 
    border-radius: 0 0.25rem 0.25rem 0;

    height: 1.5rem;

}



.etat-solo {

    border-radius: 0.25rem;

    width:4rem;

    color:white;

    display: inline-block;

    text-align: center;

    height: 1.75rem;

}
 
 No newline at end of file

src/UnicaenEtat/Entity/Db/EtatInstance.php

+13 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ class EtatInstance implements HistoriqueAwareInterface { 


    private int $id;

    private EtatType $type;

    private ?string $infos;



    /**

     * @return int
@@ -35,4 +36,16 @@ class EtatInstance implements HistoriqueAwareInterface { 
        $this->type = $type;

    }



    public function getInfos(): ?string

    {

        return $this->infos;

    }



    public function setInfos(?string $infos): void

    {

        $this->infos = $infos;

    }







}
 
 No newline at end of file