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

Merge branch 'zf-3.x'

parents 01608459 69123da8

.gitignore

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

composer.json

100644 → 100755
+3 −5
Original line number Diff line number Diff line
@@ -8,12 +8,10 @@ 
        }

    ],

    "require": {

        "unicaen/app":                                  "^1.3",

        "zf-commons/zfc-user-doctrine-orm":             ">=0.1",

        "bjyoungblood/bjy-authorize":                   ">=1.4"

        "unicaen/app":                                  "dev-zf-3.x"

    },

    "require-dev": {

        "phpunit/PHPUnit":                              ">=3.7"

        "phpunit/phpunit":                              ">=3.7"

    },

    "autoload": {

        "psr-0": {

config/module.config.php

+6 −2
Original line number Diff line number Diff line
@@ -14,10 +14,13 @@ use Octopus\Service\Immobilier\ImmobilierService; 
use Octopus\Service\Immobilier\ImmobilierServiceFactory;

use Octopus\Service\Individu\IndividuService;

use Octopus\Service\Individu\IndividuServiceFactory;

use Octopus\Service\OffreDeFormation\OffreDeFormationService;

use Octopus\Service\OffreDeFormation\OffreDeFormationServiceFactory;

use Octopus\Service\Structure\StructureService;

use Octopus\Service\Structure\StructureServiceFactory;

use UnicaenAuth\Guard\PrivilegeController;

use Zend\Mvc\Router\Http\Literal;

//use UnicaenAuth\Guard\PrivilegeController;

use UnicaenAutorisation\Guard\PrivilegeController;

use Zend\Router\Http\Literal;



return [

    'bjyauthorize' => [
@@ -79,6 +82,7 @@ return [ 
            IndividuService::class => IndividuServiceFactory::class,

            GeographieService::class => GeographieServiceFactory::class,

            FonctionService::class => FonctionServiceFactory::class,

            OffreDeFormationService::class => OffreDeFormationServiceFactory::class,

        ],

    ],

    'controllers'     => [

readme.md

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# Quoi de neuf ?



**version 0.7.0** 

 + intégration des premières tables liées à l'offre de formation

    + ODF_DIPLOME => OffreDeFormationDiplome

    + ODF_ETAPE => OffreDeFormationEtape

 + récupération des inscriptions et ajout des liens avec la table individu

    + INDIVIDU_INSCRIPTION => IndividuInscription 

 + Création du service OffreDeFormationService pour récupérer les informations associées à l'offre de formation

 

 **version 0.6.0**

 

 + intégration des fonctions
 
 No newline at end of file

src/Octopus/Controller/OctopusController.php

100644 → 100755
+8 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ use Octopus\Service\Fonction\FonctionServiceAwareTrait; 
use Octopus\Service\Geographie\GeographieServiceAwareTrait;

use Octopus\Service\Immobilier\ImmobilierServiceAwareTrait;

use Octopus\Service\Individu\IndividuServiceAwareTrait;

use Octopus\Service\OffreDeFormation\OffreDeFormationServiceAwareTrait;

use Octopus\Service\Structure\StructureServiceAwareTrait;

use Zend\Mvc\Controller\AbstractActionController;

use Zend\View\Model\ViewModel;
@@ -15,6 +16,7 @@ class OctopusController extends AbstractActionController { 
    use GeographieServiceAwareTrait;

    use ImmobilierServiceAwareTrait;

    use IndividuServiceAwareTrait;

    use OffreDeFormationServiceAwareTrait;

    use StructureServiceAwareTrait;



    public function indexAction() {
@@ -35,6 +37,9 @@ class OctopusController extends AbstractActionController { 


        $pays           = $this->getGeographieService()->getPays('libelleCourt');



        $diplomes       = $this->getOffreDeFormationService()->getDiplomes();

        $etapes         = $this->getOffreDeFormationService()->getEtapes();

        

        return new ViewModel([

            'structureTypes' => $structureTypes,

            'structures' => $structures,
@@ -51,6 +56,9 @@ class OctopusController extends AbstractActionController { 
            'fonctionsTypes' => $fonctionsTypes,



            'pays' => $pays,

            

            'diplomes' => $diplomes,

            'etapes' => $etapes,            

        ]);

    }

}
 
 No newline at end of file