Skip to content
Snippets Groups Projects
Commit 630159e2 authored by gauthierb's avatar gauthierb
Browse files

Branche de Travail sur l'upload de pièces justificatives

parent 6457df38
No related branches found
No related tags found
No related merge requests found
Showing
with 190 additions and 132 deletions
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "3a4abe9eb3a2f23392513e99e429a1ef", "hash": "b691393f43738916dc3251302722f7f5",
"packages": [ "packages": [
{ {
"name": "bjyoungblood/bjy-authorize", "name": "bjyoungblood/bjy-authorize",
...@@ -706,7 +706,7 @@ ...@@ -706,7 +706,7 @@
{ {
"name": "Johannes Schmitt", "name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com", "email": "schmittjoh@gmail.com",
"homepage": "https://github.com/schmittjoh", "homepage": "http://jmsyst.com",
"role": "Developer of wrapped JMSSerializerBundle" "role": "Developer of wrapped JMSSerializerBundle"
} }
], ],
...@@ -1012,17 +1012,17 @@ ...@@ -1012,17 +1012,17 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v2.5.3", "version": "v2.5.4",
"target-dir": "Symfony/Component/Console", "target-dir": "Symfony/Component/Console",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Console.git", "url": "https://github.com/symfony/Console.git",
"reference": "cd2d1e4bac2206b337326b0140ff475fe9ad5f63" "reference": "748beed2a1e73179c3f5154d33fe6ae100c1aeb1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Console/zipball/cd2d1e4bac2206b337326b0140ff475fe9ad5f63", "url": "https://api.github.com/repos/symfony/Console/zipball/748beed2a1e73179c3f5154d33fe6ae100c1aeb1",
"reference": "cd2d1e4bac2206b337326b0140ff475fe9ad5f63", "reference": "748beed2a1e73179c3f5154d33fe6ae100c1aeb1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1063,21 +1063,21 @@ ...@@ -1063,21 +1063,21 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-08-05 09:00:40" "time": "2014-08-14 16:10:54"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v2.5.3", "version": "v2.5.4",
"target-dir": "Symfony/Component/Process", "target-dir": "Symfony/Component/Process",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Process.git", "url": "https://github.com/symfony/Process.git",
"reference": "e0997d2a9a1a763484b34b989900b61322a9b056" "reference": "136cf0bdaacea81f779583376d47dd8aef4fc6ba"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Process/zipball/e0997d2a9a1a763484b34b989900b61322a9b056", "url": "https://api.github.com/repos/symfony/Process/zipball/136cf0bdaacea81f779583376d47dd8aef4fc6ba",
"reference": "e0997d2a9a1a763484b34b989900b61322a9b056", "reference": "136cf0bdaacea81f779583376d47dd8aef4fc6ba",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1110,7 +1110,7 @@ ...@@ -1110,7 +1110,7 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-08-05 09:00:40" "time": "2014-08-31 03:22:04"
}, },
{ {
"name": "unicaen/unicaen-app", "name": "unicaen/unicaen-app",
...@@ -1214,6 +1214,38 @@ ...@@ -1214,6 +1214,38 @@
}, },
"description": "Module Ldap de l'UCBN" "description": "Module Ldap de l'UCBN"
}, },
{
"name": "unicaen/unicaen-upload",
"version": "dev-trunk",
"source": {
"type": "svn",
"url": "https://svn.unicaen.fr/svn/UnicaenUpload",
"reference": "/trunk/@10"
},
"require": {
"php": ">=5.3.3",
"rwoverdijk/assetmanager": ">=1.3",
"zendframework/zend-i18n": ">=2.2",
"zendframework/zend-mvc": ">=2.2",
"zendframework/zend-navigation": ">=2.2",
"zendframework/zend-servicemanager": ">=2.2",
"zendframework/zend-version": ">=2.2",
"zendframework/zend-view": ">=2.2"
},
"require-dev": {
"phpunit/phpunit": ">=3.7"
},
"type": "library",
"autoload": {
"psr-0": {
"UnicaenUpload\\": "src/"
},
"classmap": [
"./Module.php"
]
},
"description": "Module ZF2 facilitant l'upload de fichiers"
},
{ {
"name": "zendframework/zend-authentication", "name": "zendframework/zend-authentication",
"version": "2.3.1", "version": "2.3.1",
...@@ -3177,23 +3209,23 @@ ...@@ -3177,23 +3209,23 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
"version": "1.2.17", "version": "1.2.18",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "6ef2bf3a1c47eca07ea95f0d8a902a6340390b34" "reference": "fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6ef2bf3a1c47eca07ea95f0d8a902a6340390b34", "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b",
"reference": "6ef2bf3a1c47eca07ea95f0d8a902a6340390b34", "reference": "fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3",
"phpunit/php-file-iterator": ">=1.3.0@stable", "phpunit/php-file-iterator": ">=1.3.0@stable",
"phpunit/php-text-template": ">=1.2.0@stable", "phpunit/php-text-template": ">=1.2.0@stable",
"phpunit/php-token-stream": ">=1.1.3@stable" "phpunit/php-token-stream": ">=1.1.3,<1.3.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "3.7.*@dev" "phpunit/phpunit": "3.7.*@dev"
...@@ -3234,7 +3266,7 @@ ...@@ -3234,7 +3266,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2014-03-28 10:53:45" "time": "2014-09-02 10:13:14"
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
...@@ -3543,17 +3575,17 @@ ...@@ -3543,17 +3575,17 @@
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v2.5.3", "version": "v2.5.4",
"target-dir": "Symfony/Component/Yaml", "target-dir": "Symfony/Component/Yaml",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Yaml.git", "url": "https://github.com/symfony/Yaml.git",
"reference": "5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f" "reference": "01a7695bcfb013d0a15c6757e15aae120342986f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Yaml/zipball/5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f", "url": "https://api.github.com/repos/symfony/Yaml/zipball/01a7695bcfb013d0a15c6757e15aae120342986f",
"reference": "5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f", "reference": "01a7695bcfb013d0a15c6757e15aae120342986f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3586,7 +3618,7 @@ ...@@ -3586,7 +3618,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-08-05 09:00:40" "time": "2014-08-31 03:22:04"
}, },
{ {
"name": "zendframework/zend-dom", "name": "zendframework/zend-dom",
...@@ -3693,7 +3725,8 @@ ...@@ -3693,7 +3725,8 @@
"stability-flags": { "stability-flags": {
"unicaen/unicaen-app": 20, "unicaen/unicaen-app": 20,
"unicaen/unicaen-auth": 20, "unicaen/unicaen-auth": 20,
"unicaen/unicaen-ldap": 20 "unicaen/unicaen-ldap": 20,
"unicaen/unicaen-upload": 20
}, },
"prefer-stable": false, "prefer-stable": false,
"platform": [ "platform": [
......
...@@ -7,6 +7,7 @@ $modules = array( ...@@ -7,6 +7,7 @@ $modules = array(
'UnicaenApp', //'AssetManager', 'UnicaenApp', //'AssetManager',
'UnicaenAuth', 'UnicaenAuth',
'UnicaenLdap', 'UnicaenLdap',
'UnicaenUpload',
'Common', 'Common',
'Import', 'Import',
'Application' 'Application'
......
...@@ -137,6 +137,19 @@ return array( ...@@ -137,6 +137,19 @@ return array(
), ),
), ),
), ),
'joindre' => array(
'type' => 'Segment',
'options' => array(
'route' => '/:intervenant/joindre[/:action]',
'constraints' => array(
'intervenant' => '[0-9]*',
),
'defaults' => array(
'controller' => 'Dossier',
'action' => 'joindre',
),
),
),
'validation-dossier' => array( 'validation-dossier' => array(
'type' => 'Segment', 'type' => 'Segment',
'options' => array( 'options' => array(
...@@ -351,7 +364,7 @@ return array( ...@@ -351,7 +364,7 @@ return array(
), ),
array( array(
'controller' => 'Application\Controller\Dossier', 'controller' => 'Application\Controller\Dossier',
'action' => array('voir', 'modifier', 'pieces-jointes'), 'action' => array('voir', 'modifier', 'pieces-jointes', 'joindre', 'upload', 'download'),
'roles' => array(IntervenantExterieurRole::ROLE_ID, ComposanteRole::ROLE_ID,'Administrateur'), 'roles' => array(IntervenantExterieurRole::ROLE_ID, ComposanteRole::ROLE_ID,'Administrateur'),
), ),
array( array(
......
...@@ -415,6 +415,7 @@ implements ContextProviderAwareInterface, ...@@ -415,6 +415,7 @@ implements ContextProviderAwareInterface,
$this->view = new ViewModel(array( $this->view = new ViewModel(array(
'intervenants' => $intervenants, 'intervenants' => $intervenants,
'typeAgrement' => $this->typeAgrement,
'title' => $this->title, 'title' => $this->title,
'form' => $this->formSaisie, 'form' => $this->formSaisie,
'role' => $this->role, 'role' => $this->role,
......
...@@ -281,6 +281,92 @@ class DossierController extends AbstractActionController implements ContextProvi ...@@ -281,6 +281,92 @@ class DossierController extends AbstractActionController implements ContextProvi
)); ));
} }
public function joindreAction()
{
$form = $this->getFormJoindre();
$request = $this->getRequest();
if ($request->isPost()) {
// Make certain to merge the files info!
$post = array_merge_recursive(
$request->getPost()->toArray(),
$request->getFiles()->toArray()
);
var_dump($post);
$form->setData($post);
if ($form->isValid()) {
$data = $form->getData();var_dump('valid');
// Form is valid, save the form!
return $this->redirect()->toRoute('upload-form/success');
}
}
$viewModel = new \Zend\View\Model\ViewModel();
$viewModel//->setTemplate('closer-module/ligne/joindre')
->setVariables(array(
'form' => $form,
'terminal' => $this->getRequest()->isXmlHttpRequest(),
'uploadUrl' => $this->url()->fromRoute(null, ['action' => 'download'], [], true),
));
return $viewModel;
}
public function uploadAction()
{
error_reporting(E_ALL | E_STRICT);
$this->uploader()
// ->setUploadDir($this->getUploadDir($ligne))
->setUploadUrl($this->getUploadUrl() . '/')
->setDownloadUrl($this->getDownloadUrl())
->handle();
exit;
}
public function downloadAction()
{
error_reporting(E_ALL | E_STRICT);
$this->uploader()
// ->setUploadDir($this->getUploadDir($ligne))
->setUploadUrl($this->getUploadUrl() . '/')
->setDownloadUrl($this->getDownloadUrl())
->handle();
exit;
}
protected $formJoindre;
protected function getFormJoindre()
{
if (null === $this->formJoindre) {
$this->formJoindre = new \Application\Form\Joindre();
$this->formJoindre//->setHydrator(HydratorFactory::getHydrator($ligne))
//->bind($ligne)
->setAttribute('action', $this->url()->fromRoute(null, [], [], true));
}
return $this->formJoindre;
}
protected function getDownloadUrl()
{
return $this->url()->fromRoute(null, ['action' => 'download'], [], true);
}
protected function getUploadUrl()
{
return $this->url()->fromRoute(null, ['action' => 'upload'], [], true);
}
// protected function getUploadDir(Ligne $ligne)
// {
// $options = $this->getServiceLocator()->get('closer-module_options'); /* @var $options \CloserModule\Options\ModuleOptions */
// return sprintf($options->getUploadDir() . '/acteur-%s/ligne-%s/',
// $ligne->getActeur()->getIdInterne(),
// $ligne->getId());
// }
/** /**
* @return array * @return array
*/ */
......
<?php
namespace Application\Rule\Intervenant;
/**
* Description of NecessitePassageConseilRestreintRule
*
* @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
*/
class NecessitePassageConseilRestreintRule extends IntervenantRule
{
public function execute()
{
$statut = $this->getIntervenant()->getStatut();
if (!$statut->estVacataire()) {
$this->setMessage("Le passage en Conseil Restreint de la composante n'est requis que pour les vacataires (BIATSS inclus).");
return false;
}
$this->setMessage(sprintf("Le statut de l'intervenant (%s) nécessite le passage en Conseil Restreint de la composante.", $statut));
return true;
}
public function isRelevant()
{
return true;
}
}
<?php
namespace Application\Rule\Intervenant;
/**
* Description of NecessitePassageConseilRestreintRule
*
* @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
*/
class NecessitePassageConseilRestreintRule extends IntervenantRule
{
public function execute()
{
$statut = $this->getIntervenant()->getStatut();
if (!$statut->estVacataire()) {
$this->setMessage("Le passage en Conseil Restreint de la composante n'est requis que pour les vacataires (BIATSS inclus).");
return false;
}
$this->setMessage(sprintf("Le statut de l'intervenant (%s) nécessite le passage en Conseil Restreint de la composante.", $statut));
return true;
}
public function isRelevant()
{
return true;
}
}
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace Application\Rule\Intervenant; namespace Application\Rule\Intervenant;
use Zend\Permissions\Acl\Role\RoleInterface;
use Application\Entity\Db\Intervenant; use Application\Entity\Db\Intervenant;
use Application\Acl\ComposanteDbRole; use Application\Acl\ComposanteDbRole;
...@@ -16,9 +17,9 @@ class PeutSaisirModificationServiceDuRule extends IntervenantRule ...@@ -16,9 +17,9 @@ class PeutSaisirModificationServiceDuRule extends IntervenantRule
* Constructeur. * Constructeur.
* *
* @param Intervenant $intervenant Intervenant dont on modifie le service dû * @param Intervenant $intervenant Intervenant dont on modifie le service dû
* @param ComposanteDbRole $role Role auteur de la modification * @param RoleInterface $role Role auteur de la modification
*/ */
public function __construct(Intervenant $intervenant, ComposanteDbRole $role) public function __construct(Intervenant $intervenant, RoleInterface $role)
{ {
parent::__construct($intervenant); parent::__construct($intervenant);
$this->role = $role; $this->role = $role;
...@@ -32,11 +33,13 @@ class PeutSaisirModificationServiceDuRule extends IntervenantRule ...@@ -32,11 +33,13 @@ class PeutSaisirModificationServiceDuRule extends IntervenantRule
return false; return false;
} }
if ($this->getRole() instanceof ComposanteDbRole) {
$estAffecte = new EstAffecteRule($this->getIntervenant(), $this->getRole()->getStructure()); $estAffecte = new EstAffecteRule($this->getIntervenant(), $this->getRole()->getStructure());
if (!$estAffecte->execute()) { if (!$estAffecte->execute()) {
$this->setMessage(sprintf("%s %s étant votre structure de responsabilité.", $estAffecte->getMessage(), $this->getRole()->getStructure())); $this->setMessage(sprintf("%s %s étant votre structure de responsabilité.", $estAffecte->getMessage(), $this->getRole()->getStructure()));
return false; return false;
} }
}
return true; return true;
} }
...@@ -47,11 +50,11 @@ class PeutSaisirModificationServiceDuRule extends IntervenantRule ...@@ -47,11 +50,11 @@ class PeutSaisirModificationServiceDuRule extends IntervenantRule
} }
/** /**
* @var \Application\Acl\ComposanteDbRole * @var RoleInterface
*/ */
protected $role; protected $role;
/** /**
* @return \Application\Acl\ComposanteDbRole * @return RoleInterface
*/ */
public function getRole() public function getRole()
{ {
......
<?php
namespace Application\Service\Workflow\Step;
use Application\Acl\IntervenantPermanentRole;
use Application\Acl\IntervenantExterieurRole;
use Application\Acl\ComposanteRole;
/**
* Description of AgrementConseilRestreintStep
*
* @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
*/
class AgrementConseilRestreintStep extends Step
{
public function __construct()
{
$labels = array(
IntervenantPermanentRole::ROLE_ID => "Je visualise l'agrément par le Conseil Restreint de chaque composante d'enseignement",
IntervenantExterieurRole::ROLE_ID => "Je visualise l'agrément par le Conseil Restreint de chaque composante d'enseignement",
ComposanteRole::ROLE_ID => "Je visualise l'agrément par le Conseil Restreint de chaque composante d'enseignement de l'intervenant",
);
$descriptions = array(
IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.",
IntervenantExterieurRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.",
ComposanteRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.",
);
$this
->setLabels($labels)
->setDescriptions($descriptions)
->setRoute('intervenant/agrement');
}
}
\ No newline at end of file
...@@ -29,6 +29,7 @@ class AgrementStep extends Step ...@@ -29,6 +29,7 @@ class AgrementStep extends Step
IntervenantPermanentRole::ROLE_ID => sprintf("Je visualise l'agrément &laquo; %s &raquo;", $this->typeAgrement), IntervenantPermanentRole::ROLE_ID => sprintf("Je visualise l'agrément &laquo; %s &raquo;", $this->typeAgrement),
IntervenantExterieurRole::ROLE_ID => sprintf("Je visualise l'agrément &laquo; %s &raquo;", $this->typeAgrement), IntervenantExterieurRole::ROLE_ID => sprintf("Je visualise l'agrément &laquo; %s &raquo;", $this->typeAgrement),
ComposanteRole::ROLE_ID => sprintf("Je visualise l'agrément &laquo; %s &raquo; de l'intervenant", $this->typeAgrement), ComposanteRole::ROLE_ID => sprintf("Je visualise l'agrément &laquo; %s &raquo; de l'intervenant", $this->typeAgrement),
'default' => sprintf("Je visualise l'agrément &laquo; %s &raquo; de l'intervenant", $this->typeAgrement),
); );
$descriptions = array( $descriptions = array(
IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.", IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.",
......
...@@ -19,6 +19,7 @@ class EditionContratStep extends Step ...@@ -19,6 +19,7 @@ class EditionContratStep extends Step
IntervenantPermanentRole::ROLE_ID => "Je visualise mes contrat/avenants", IntervenantPermanentRole::ROLE_ID => "Je visualise mes contrat/avenants",
IntervenantExterieurRole::ROLE_ID => "Je visualise mes contrat/avenants", IntervenantExterieurRole::ROLE_ID => "Je visualise mes contrat/avenants",
ComposanteRole::ROLE_ID => "Je visualise les contrat/avenants de l'intervenant", ComposanteRole::ROLE_ID => "Je visualise les contrat/avenants de l'intervenant",
'default' => "Je visualise les contrat/avenants de l'intervenant",
); );
$descriptions = array( $descriptions = array(
IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.", IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.",
......
...@@ -19,6 +19,7 @@ class SaisieDossierStep extends Step ...@@ -19,6 +19,7 @@ class SaisieDossierStep extends Step
IntervenantPermanentRole::ROLE_ID => "Je saisis mes données personnelles", IntervenantPermanentRole::ROLE_ID => "Je saisis mes données personnelles",
IntervenantExterieurRole::ROLE_ID => "Je saisis mes données personnelles", IntervenantExterieurRole::ROLE_ID => "Je saisis mes données personnelles",
ComposanteRole::ROLE_ID => "J'accède aux données personnelles de l'intervenant", ComposanteRole::ROLE_ID => "J'accède aux données personnelles de l'intervenant",
'default' => "J'accède aux données personnelles de l'intervenant",
); );
$descriptions = array( $descriptions = array(
IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.", IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.",
......
...@@ -18,7 +18,8 @@ class SaisiePiecesJointesStep extends Step ...@@ -18,7 +18,8 @@ class SaisiePiecesJointesStep extends Step
$labels = array( $labels = array(
IntervenantPermanentRole::ROLE_ID => "Je visualise la liste des pièces justificatives à fournir", IntervenantPermanentRole::ROLE_ID => "Je visualise la liste des pièces justificatives à fournir",
IntervenantExterieurRole::ROLE_ID => "Je visualise la liste des pièces justificatives à fournir", IntervenantExterieurRole::ROLE_ID => "Je visualise la liste des pièces justificatives à fournir",
ComposanteRole::ROLE_ID => "Liste des pièces justificatives à fournir", ComposanteRole::ROLE_ID => "Liste des pièces justificatives à fournir par l'intervenant",
'default' => "Liste des pièces justificatives à fournir par l'intervenant",
); );
$descriptions = array( $descriptions = array(
IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.", IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.",
......
...@@ -19,6 +19,7 @@ class SaisieServiceStep extends Step ...@@ -19,6 +19,7 @@ class SaisieServiceStep extends Step
IntervenantPermanentRole::ROLE_ID => "Je saisis mes services prévisionnels", IntervenantPermanentRole::ROLE_ID => "Je saisis mes services prévisionnels",
IntervenantExterieurRole::ROLE_ID => "Je saisis mes enseignements", IntervenantExterieurRole::ROLE_ID => "Je saisis mes enseignements",
ComposanteRole::ROLE_ID => "J'accède aux services prévisionnels de l'intervenant", ComposanteRole::ROLE_ID => "J'accède aux services prévisionnels de l'intervenant",
'default' => "J'accède aux services prévisionnels de l'intervenant",
); );
$descriptions = array( $descriptions = array(
IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.", IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.",
......
...@@ -47,7 +47,10 @@ abstract class Step ...@@ -47,7 +47,10 @@ abstract class Step
$roleId = \Application\Acl\ComposanteRole::ROLE_ID; $roleId = \Application\Acl\ComposanteRole::ROLE_ID;
} }
if (!isset($this->labels[$roleId])) { if (!isset($this->labels[$roleId])) {
throw new \Common\Exception\LogicException("Label not set for role '$roleId'!"); if (!isset($this->labels['default'])) {
throw new \Common\Exception\LogicException("Aucun label par défaut n'a été spécifié pour l'étape '" . get_class() . "'.");
}
return $this->labels['default'];
} }
return $this->labels[$roleId]; return $this->labels[$roleId];
} }
...@@ -86,7 +89,8 @@ EOS; ...@@ -86,7 +89,8 @@ EOS;
$roleId = \Application\Acl\ComposanteRole::ROLE_ID; $roleId = \Application\Acl\ComposanteRole::ROLE_ID;
} }
if (!isset($this->descriptions[$roleId])) { if (!isset($this->descriptions[$roleId])) {
throw new \Common\Exception\LogicException("Label not set for role '$roleId'!"); // throw new \Common\Exception\LogicException("Description not set for role '$roleId'!");
return "";
} }
return $this->descriptions[$roleId]; return $this->descriptions[$roleId];
} }
......
...@@ -19,6 +19,7 @@ class ValidationDossierStep extends Step ...@@ -19,6 +19,7 @@ class ValidationDossierStep extends Step
IntervenantPermanentRole::ROLE_ID => "Je visualise la validation de mes données personnelles par la composante", IntervenantPermanentRole::ROLE_ID => "Je visualise la validation de mes données personnelles par la composante",
IntervenantExterieurRole::ROLE_ID => "Je visualise la validation de mes données personnelles par la composante", IntervenantExterieurRole::ROLE_ID => "Je visualise la validation de mes données personnelles par la composante",
ComposanteRole::ROLE_ID => "Je visualise la validation des données personnelles de l'intervenant", ComposanteRole::ROLE_ID => "Je visualise la validation des données personnelles de l'intervenant",
'default' => "Je visualise la validation des données personnelles de l'intervenant",
); );
$descriptions = array( $descriptions = array(
IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.", IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.",
......
...@@ -19,6 +19,7 @@ class ValidationServiceStep extends Step ...@@ -19,6 +19,7 @@ class ValidationServiceStep extends Step
IntervenantPermanentRole::ROLE_ID => "Je visualise la validation de mes services par la composante", IntervenantPermanentRole::ROLE_ID => "Je visualise la validation de mes services par la composante",
IntervenantExterieurRole::ROLE_ID => "Je visualise la validation de mes enseignements par la composante", IntervenantExterieurRole::ROLE_ID => "Je visualise la validation de mes enseignements par la composante",
ComposanteRole::ROLE_ID => "Je visualise la validation des services de l'intervenant", ComposanteRole::ROLE_ID => "Je visualise la validation des services de l'intervenant",
'default' => "Je visualise la validation des services de l'intervenant",
); );
$descriptions = array( $descriptions = array(
IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.", IntervenantPermanentRole::ROLE_ID => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed sem libero. Nam urna magna, fringilla et blandit aliquam, condimentum a velit. Vivamus sollicitudin blandit augue ut dapibus. Vivamus faucibus quis massa id tempus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis auctor suscipit mauris, in suscipit quam lacinia ut. Nam ac mollis enim, quis tincidunt sem.",
......
<?php $this->headTitle()->append("Agrément $typeAgrement par lots") ?>
<h1 class="page-header"><?php echo $this->title ?></h1> <h1 class="page-header"><?php echo $this->title ?></h1>
<?php echo $this->messenger(true)->addMessages($messages) ?> <?php echo $this->messenger(true)->addMessages($messages) ?>
......
<?php $this->headTitle()->append("Agrément") ?>
<h1 class="page-header"><?php echo $title ?></h1> <h1 class="page-header"><?php echo $title ?></h1>
Sélectionnez dans le menu de gauche le type d'agrément qui vous intéresse... Sélectionnez dans le menu de gauche le type d'agrément qui vous intéresse...
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment