Skip to content
Snippets Groups Projects
Commit e2b5546f authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

init

parent 424c92bc
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1418 additions and 77 deletions
Module.php 0 → 100644
+ 42
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation;
use Laminas\Mvc\ModuleRouteListener;
use Laminas\Mvc\MvcEvent;
use Laminas\Config\Factory as ConfigFactory;
use Laminas\Stdlib\ArrayUtils;
use Laminas\Stdlib\Glob;
class Module
{
public function onBootstrap(MvcEvent $e)
{
$eventManager = $e->getApplication()->getEventManager();
$moduleRouteListener = new ModuleRouteListener();
$moduleRouteListener->attach($eventManager);
}
public function getConfig()
{
$configInit = [
__DIR__ . '/config/module.config.php'
];
$configFiles = ArrayUtils::merge(
$configInit,
Glob::glob(__DIR__ . '/config/merged/{,*.}{config}.php', Glob::GLOB_BRACE)
);
return ConfigFactory::fromFiles($configFiles);
}
public function getAutoloaderConfig()
{
return array(
'Laminas\Loader\StandardAutoloader' => array(
'namespaces' => array(
__NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
),
),
);
}
}
README.md
+ 41
− 77
View file @ e2b5546f
# observation
Bibliothèque unicaen/observation
===
La bibliothèque **unicaen/observation** est module proposant de gérer les observations déclaration des types d'observation et mise en place des instances d'observation.
## Getting started
La classe *ObservationType*
---
To make it easy for you to get started with GitLab, here's a list of recommended next steps.
Un type d'observation est constitué :
* d'un `code` unique permettant de récupérer simplement un type (idéalement regroupé dans un provider) ;
* d'un `libelle` décrivant le type de validation elle-même ;
* d'un `categorie` décrivant un regroupe thèmatique des observations ;
Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
De plus les types sont munis de l'interface/trait `HistoriqueAware`.
## Add your files
La classe *ObservationInstance*
---
- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
Une instance de validation est constitée :
* d'un `type` de validation (voir `ObservationType`) ;
* d'un texte `observation` portant l'observation elle-même.
```
cd existing_repo
git remote add origin https://git.unicaen.fr/lib/unicaen/observation.git
git branch -M master
git push -uf origin master
```
## Integrate with your tools
- [ ] [Set up project integrations](https://git.unicaen.fr/lib/unicaen/observation/-/settings/integrations)
## Collaborate with your team
- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
## Test and Deploy
Use the built-in continuous integration in GitLab.
- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
***
L'interface *HasValidationsInterface* et le trait *HasValidationsTrait*
---
# Editing this README
Ajouter l'interface et le trait `HasObservations` va ajouter une collection `observations` (qu'il faut initialiser dans le constructeur) qui sera en charge de stocker les différentes validations.
`HasObservations` fournit les méthodes suivantes :
When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template.
```php
public function getObservations(): Collection;
public function hasObservation(ObservationInstance $observationInstance): bool;
public function hasObservationWithType(ObservationType $observationType, bool $histo = false): bool;
public function hasObservationWithTypeCode(string $code, bool $histo = false): bool;
## Suggestions for a good README
Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
## Name
Choose a self-explaining name for your project.
## Description
Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
## Badges
On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
## Visuals
Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
## Installation
Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
## Usage
Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
## Support
Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
## Roadmap
If you have ideas for releases in the future, it is a good idea to list them in the README.
public function getObservationWithTypeCode(string $code, bool $histo = false): ?ObservationInstance;
public function addObservation(ObservationInstance $observationInstance): void;
public function removeObservation(ObservationInstance $observationInstance): void;
```
## Contributing
State if you are open to contributions and what your requirements are for accepting them.
Remarque :
___
Les instances de validation seront stockées dans la table `unicaen_observation_observation_instance` et il est nécessaire de créer en linker `entite_observation`.
For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
Changements
===
You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
**6.1**
- v1
## Authors and acknowledgment
Show your appreciation to those who have contributed to the project.
Scripts et description des tables
===
## License
For open source projects, say how it is licensed.
Troubleshooting
===
## Project status
If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
Aucun pour le moment ...
\ No newline at end of file
composer.json 0 → 100755
+ 21
− 0
View file @ e2b5546f
{
"name": "unicaen/observation",
"description": "Module de gestion d'observation (type et instance)",
"repositories": [
{
"type": "composer",
"url": "https://gest.unicaen.fr/packagist"
}
],
"require": {
"unicaen/app": "^6.1",
"unicaen/privilege": "^6.1",
"unicaen/validation": "^6.1"
},
"autoload": {
"psr-0": [],
"classmap": [
"./Module.php"
]
}
}
config/merged/observation-instance.config.php 0 → 100644
+ 208
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation;
use Laminas\Router\Http\Literal;
use Laminas\Router\Http\Segment;
use UnicaenObservation\Controller\ObservationInstanceController;
use UnicaenObservation\Controller\ObservationInstanceControllerFactory;
use UnicaenObservation\Form\ObservationInstance\ObservationInstanceForm;
use UnicaenObservation\Form\ObservationInstance\ObservationInstanceFormFactory;
use UnicaenObservation\Form\ObservationInstance\ObservationInstanceHydrator;
use UnicaenObservation\Form\ObservationInstance\ObservationInstanceHydratorFactory;
use UnicaenObservation\Provider\Privilege\ObservationinstancePrivileges;
use UnicaenObservation\Service\ObservationInstance\ObservationInstanceService;
use UnicaenObservation\Service\ObservationInstance\ObservationInstanceServiceFactory;
use UnicaenObservation\View\Helper\ObservationInstanceViewHelper;
use UnicaenPrivilege\Guard\PrivilegeController;
return [
'bjyauthorize' => [
'guards' => [
PrivilegeController::class => [
[
'controller' => ObservationInstanceController::class,
'action' => [
'index',
],
'privileges' => [
ObservationinstancePrivileges::OBSERVATIONINSTANCE_INDEX,
],
],
[
'controller' => ObservationInstanceController::class,
'action' => [
'afficher',
],
'privileges' => [
ObservationinstancePrivileges::OBSERVATIONINSTANCE_AFFICHER,
],
],
[
'controller' => ObservationInstanceController::class,
'action' => [
'ajouter',
],
'privileges' => [
ObservationinstancePrivileges::OBSERVATIONINSTANCE_AJOUTER,
],
],
[
'controller' => ObservationInstanceController::class,
'action' => [
'modifier',
'valider',
],
'privileges' => [
ObservationinstancePrivileges::OBSERVATIONINSTANCE_MODIFIER,
],
],
[
'controller' => ObservationInstanceController::class,
'action' => [
'historiser',
'restaurer',
],
'privileges' => [
ObservationinstancePrivileges::OBSERVATIONINSTANCE_HISTORISER,
],
],
[
'controller' => ObservationInstanceController::class,
'action' => [
'supprimer',
],
'privileges' => [
ObservationinstancePrivileges::OBSERVATIONINSTANCE_SUPPRIMER,
],
],
],
],
],
'router' => [
'routes' => [
'observation' => [
'type' => Literal::class,
'options' => [
'route' => '/observation',
],
'may_terminate' => false,
'child_routes' => [
'instance' => [
'type' => Literal::class,
'options' => [
'route' => '/instance',
'defaults' => [
/** @see ObservationInstanceController::indexAction() */
'controller' => ObservationInstanceController::class,
'action' => 'index',
],
],
'may_terminate' => true,
'child_routes' => [
'afficher' => [
'type' => Segment::class,
'options' => [
'route' => '/afficher/:observation-instance',
'defaults' => [
/** @see ObservationInstanceController::afficherAction() */
'action' => 'afficher',
],
],
],
'ajouter' => [
'type' => Literal::class,
'options' => [
'route' => '/ajouter',
'defaults' => [
/** @see ObservationInstanceController::ajouterAction() */
'action' => 'ajouter',
],
],
],
'modifier' => [
'type' => Segment::class,
'options' => [
'route' => '/modifier/:observation-instance',
'defaults' => [
/** @see ObservationInstanceController::modifierAction() */
'action' => 'modifier',
],
],
],
'historiser' => [
'type' => Segment::class,
'options' => [
'route' => '/historiser/:observation-instance',
'defaults' => [
/** @see ObservationInstanceController::historiserAction() */
'action' => 'historiser',
],
],
],
'restaurer' => [
'type' => Segment::class,
'options' => [
'route' => '/restaurer/:observation-instance',
'defaults' => [
/** @see ObservationInstanceController::restaurerAction() */
'action' => 'restaurer',
],
],
],
'supprimer' => [
'type' => Segment::class,
'options' => [
'route' => '/supprimer/:observation-instance',
'defaults' => [
/** @see ObservationInstanceController::supprimerAction() */
'action' => 'supprimer',
],
],
],
'valider' => [
'type' => Segment::class,
'options' => [
'route' => '/valider/:observation-instance',
'defaults' => [
/** @see ObservationInstanceController::validerAction() */
'action' => 'valider',
],
],
],
],
],
],
],
],
],
'service_manager' => [
'factories' => [
ObservationInstanceService::class => ObservationInstanceServiceFactory::class,
],
],
'controllers' => [
'factories' => [
ObservationInstanceController::class => ObservationInstanceControllerFactory::class,
],
],
'form_elements' => [
'factories' => [
ObservationInstanceForm::class => ObservationInstanceFormFactory::class,
],
],
'hydrators' => [
'factories' => [
ObservationInstanceHydrator::class => ObservationInstanceHydratorFactory::class,
],
],
'view_helpers' => [
'invokables' => [
'observationinstance' => ObservationInstanceViewHelper::class,
],
],
];
\ No newline at end of file
config/merged/observation-type.config.php 0 → 100644
+ 210
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation;
use Laminas\Router\Http\Literal;
use Laminas\Router\Http\Segment;
use UnicaenObservation\Controller\ObservationTypeController;
use UnicaenObservation\Controller\ObservationTypeControllerFactory;
use UnicaenObservation\Form\ObservationType\ObservationTypeForm;
use UnicaenObservation\Form\ObservationType\ObservationTypeFormFactory;
use UnicaenObservation\Form\ObservationType\ObservationTypeHydrator;
use UnicaenObservation\Form\ObservationType\ObservationTypeHydratorFactory;
use UnicaenObservation\Provider\Privilege\ObservationtypePrivileges;
use UnicaenObservation\Service\ObservationType\ObservationTypeService;
use UnicaenObservation\Service\ObservationType\ObservationTypeServiceFactory;
use UnicaenPrivilege\Guard\PrivilegeController;
return [
'bjyauthorize' => [
'guards' => [
PrivilegeController::class => [
[
'controller' => ObservationTypeController::class,
'action' => [
'index',
],
'privileges' => [
ObservationtypePrivileges::OBSERVATIONTYPE_INDEX,
],
],
[
'controller' => ObservationTypeController::class,
'action' => [
'afficher',
],
'privileges' => [
ObservationtypePrivileges::OBSERVATIONTYPE_AFFICHER,
],
],
[
'controller' => ObservationTypeController::class,
'action' => [
'ajouter',
],
'privileges' => [
ObservationtypePrivileges::OBSERVATIONTYPE_AJOUTER,
],
],
[
'controller' => ObservationTypeController::class,
'action' => [
'modifier',
],
'privileges' => [
ObservationtypePrivileges::OBSERVATIONTYPE_MODIFIER,
],
],
[
'controller' => ObservationTypeController::class,
'action' => [
'historiser',
'restaurer',
],
'privileges' => [
ObservationtypePrivileges::OBSERVATIONTYPE_HISTORISER,
],
],
[
'controller' => ObservationTypeController::class,
'action' => [
'supprimer',
],
'privileges' => [
ObservationtypePrivileges::OBSERVATIONTYPE_SUPPRIMER,
],
],
],
],
],
'navigation' => [
'default' => [
'home' => [
'pages' => [
'administration' => [
'pages' => [
'observation' => [
'label' => "Observations",
'route' => 'observation/otype',
'resource' => PrivilegeController::getResourceId(ObservationTypeController::class, 'index'),
'order' => 1000,
'icon' => 'fas fa-angle-right',
],
],
],
],
],
],
],
'router' => [
'routes' => [
'observation' => [
'type' => Literal::class,
'options' => [
'route' => '/observation',
],
'may_terminate' => false,
'child_routes' => [
'otype' => [
'type' => Literal::class,
'options' => [
'route' => '/type',
'defaults' => [
/** @see ObservationTypeController::indexAction() */
'controller' => ObservationTypeController::class,
'action' => 'index',
],
],
'may_terminate' => true,
'child_routes' => [
'afficher' => [
'type' => Segment::class,
'options' => [
'route' => '/afficher/:observation-type',
'defaults' => [
/** @see ObservationTypeController::afficherAction() */
'action' => 'afficher',
],
],
],
'ajouter' => [
'type' => Literal::class,
'options' => [
'route' => '/ajouter',
'defaults' => [
/** @see ObservationTypeController::ajouterAction() */
'action' => 'ajouter',
],
],
],
'modifier' => [
'type' => Segment::class,
'options' => [
'route' => '/modifier/:observation-type',
'defaults' => [
/** @see ObservationTypeController::modifierAction() */
'action' => 'modifier',
],
],
],
'historiser' => [
'type' => Segment::class,
'options' => [
'route' => '/historiser/:observation-type',
'defaults' => [
/** @see ObservationTypeController::historiserAction() */
'action' => 'historiser',
],
],
],
'restaurer' => [
'type' => Segment::class,
'options' => [
'route' => '/restaurer/:observation-type',
'defaults' => [
/** @see ObservationTypeController::restaurerAction() */
'action' => 'restaurer',
],
],
],
'supprimer' => [
'type' => Segment::class,
'options' => [
'route' => '/supprimer/:observation-type',
'defaults' => [
/** @see ObservationTypeController::supprimerAction() */
'action' => 'supprimer',
],
],
],
],
],
],
],
],
],
'service_manager' => [
'factories' => [
ObservationTypeService::class => ObservationTypeServiceFactory::class,
],
],
'controllers' => [
'factories' => [
ObservationTypeController::class => ObservationTypeControllerFactory::class,
],
],
'form_elements' => [
'factories' => [
ObservationTypeForm::class => ObservationTypeFormFactory::class,
],
],
'hydrators' => [
'factories' => [
ObservationTypeHydrator::class => ObservationTypeHydratorFactory::class,
],
]
];
\ No newline at end of file
config/module.config.php 0 → 100755
+ 66
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation;
use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
use Doctrine\ORM\Mapping\Driver\XmlDriver;
use UnicaenPrivilege\Guard\PrivilegeController;
return [
'bjyauthorize' => [
'guards' => [
PrivilegeController::class => [
],
],
],
'doctrine' => [
'driver' => [
'orm_default' => [
'class' => MappingDriverChain::class,
'drivers' => [
'Observation\Entity\Db' => 'orm_default_xml_driver',
],
],
'orm_default_xml_driver' => [
'class' => XmlDriver::class,
'cache' => 'apc',
'paths' => [
__DIR__ . '/../src/Observation/Entity/Db/Mapping',
],
],
],
'cache' => [
'apc' => [
'namespace' => 'PREECOG__Observation__' . __NAMESPACE__,
],
],
],
'service_manager' => [
'factories' => [
],
],
'controllers' => [
'factories' => [
]
],
'form_elements' => [
'factories' => [
],
],
'hydrators' => [
'factories' => [
],
],
'view_helpers' => [
'invokables' => [
],
],
'view_manager' => [
'template_path_stack' => [
__DIR__ . '/../view',
],
],
];
src/UnicaenObservation/Controller/ObservationInstanceController.php 0 → 100644
+ 194
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation\Controller;
use Laminas\Http\Request;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\View\Model\ViewModel;
use UnicaenObservation\Entity\Db\ObservationInstance;
use UnicaenObservation\Form\ObservationInstance\ObservationInstanceFormAwareTrait;
use UnicaenObservation\Provider\Validation\ObservationValidations;
use UnicaenObservation\Service\ObservationInstance\ObservationInstanceServiceAwareTrait;
use UnicaenValidation\Service\ValidationInstance\ValidationInstanceServiceAwareTrait;
class ObservationInstanceController extends AbstractActionController
{
use ObservationInstanceServiceAwareTrait;
use ValidationInstanceServiceAwareTrait;
use ObservationInstanceFormAwareTrait;
public function indexAction(): ViewModel
{
$observations = $this->getObservationInstanceService()->getObservationsInstances('histoCreation', 'DESC', true);
$params = $this->params()->fromQuery();
return new ViewModel([
'observations' => $observations,
'params' => $params,
]);
}
public function afficherAction(): ViewModel
{
$observation = $this->getObservationInstanceService()->getRequestedObservationInstance($this);
return new ViewModel([
'observation' => $observation,
]);
}
public function ajouterAction(): ViewModel
{
$observation = new ObservationInstance();
$form = $this->getObservationInstanceForm();
$form->setAttribute('action', $this->url()->fromRoute('observation/instance/ajouter', [], [], true));
$form->bind($observation);
$form->cacherType();
$request = $this->getRequest();
if ($request->isPost()) {
$data = $request->getPost();
$form->setData($data);
if ($form->isValid()) {
$this->getObservationInstanceService()->create($observation);
exit();
}
}
$vm = new ViewModel([
'title' => "Ajout d'une observation",
'form' => $form,
]);
$vm->setTemplate('observation/default/default-form');
return $vm;
}
public function modifierAction(): ViewModel
{
$observation = $this->getObservationInstanceService()->getRequestedObservationInstance($this);
$form = $this->getObservationInstanceForm();
$form->setAttribute('action', $this->url()->fromRoute('observation/instance/modifier', ['observation' => $observation->getId()], [], true));
$form->bind($observation);
$request = $this->getRequest();
if ($request->isPost()) {
$data = $request->getPost();
$form->setData($data);
if ($form->isValid()) {
$this->getObservationInstanceService()->update($observation);
exit();
}
}
$vm = new ViewModel([
'title' => "Modification d'une observation",
'form' => $form,
]);
$vm->setTemplate('observation/default/default-form');
return $vm;
}
public function historiserAction(): ViewModel
{
$observation = $this->getObservationInstanceService()->getRequestedObservationInstance($this);
$request = $this->getRequest();
if ($request->isPost()) {
$data = $request->getPost();
if ($data["reponse"] === "oui") $this->getObservationInstanceService()->historise($observation);;
exit();
}
$vm = new ViewModel();
if ($observation !== null) {
$vm->setTemplate('observation/default/confirmation');
$vm->setVariables([
'title' => "Historisation du type d'observation",
'text' => "L'historisation masquera votre observation que vous pourrez restaurer. Êtes-vous sûr&middot;e de vouloir continuer ?",
'action' => $this->url()->fromRoute('observation/instance/historiser', ["observation" => $observation->getId()], [], true),
]);
}
return $vm;
}
public function restaurerAction(): ViewModel
{
$observation = $this->getObservationInstanceService()->getRequestedObservationInstance($this);
$request = $this->getRequest();
if ($request->isPost()) {
$data = $request->getPost();
if ($data["reponse"] === "oui") $this->getObservationInstanceService()->restore($observation);;
exit();
}
$vm = new ViewModel();
if ($observation !== null) {
$vm->setTemplate('observation/default/confirmation');
$vm->setVariables([
'title' => "Restauration du type d'observation",
'text' => "La restauration va rétablir votre observation. Êtes-vous sûr&middot;e de vouloir continuer ?",
'action' => $this->url()->fromRoute('observation/instance/historiser', ["observation" => $observation->getId()], [], true),
]);
}
return $vm;
}
public function supprimerAction(): ViewModel
{
$observation = $this->getObservationInstanceService()->getRequestedObservationInstance($this);
$request = $this->getRequest();
if ($request->isPost()) {
$data = $request->getPost();
if ($data["reponse"] === "oui") $this->getObservationInstanceService()->delete($observation);
exit();
}
$vm = new ViewModel();
if ($observation !== null) {
$vm->setTemplate('observation/default/confirmation');
$vm->setVariables([
'title' => "Suppression du type d'observation",
'text' => "La suppression est définitive êtes-vous sûr&middot;e de vouloir continuer ?",
'action' => $this->url()->fromRoute('observation/instance/supprimer', ["observation" => $observation->getId()], [], true),
]);
}
return $vm;
}
public function validerAction(): ViewModel
{
$observation = $this->getObservationInstanceService()->getRequestedObservationInstance($this);
/** @var Request $request */
$request = $this->getRequest();
if ($request->isPost()) {
$data = $request->getPost();
$validation = $observation->getValidationActiveByTypeCode(ObservationValidations::OBSERVATION_VALIDEE);
if ($validation === null) {
if ($data["reponse"] === "oui") {
$this->getValidationInstanceService()->setValidationActive($observation, ObservationValidations::OBSERVATION_VALIDEE);
$this->getObservationInstanceService()->update($observation);
}
// if ($data["reponse"] === "non") {
// $this->getValidationInstanceService()->setValidationActive($ficheposte, $type, 'Refus');
// $this->getFichePosteService()->update($ficheposte);
// }
}
exit();
}
$vm = new ViewModel();
$vm->setTemplate('unicaen-validation/validation-instance/validation-modal');
$vm->setVariables([
'title' => "Validation de l'obsevation",
'text' => "La validation de l'observation figera celle-ci. Êtes-vous de vouloir valider cette validation ?",
'action' => $this->url()->fromRoute('observation/instance/valider', ['observation-instance' => $observation->getId()], [], true),
'refus' => false,
]);
return $vm;
}
}
\ No newline at end of file
src/UnicaenObservation/Controller/ObservationInstanceControllerFactory.php 0 → 100644
+ 36
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation\Controller;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface;
use Psr\Container\NotFoundExceptionInterface;
use UnicaenObservation\Form\ObservationInstance\ObservationInstanceForm;
use UnicaenObservation\Service\ObservationInstance\ObservationInstanceService;
use UnicaenValidation\Service\ValidationInstance\ValidationInstanceService;
class ObservationInstanceControllerFactory
{
/**
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function __invoke(ContainerInterface $container): ObservationInstanceController
{
/**
* @var ObservationInstanceService $observationInstanceService
* @var ValidationInstanceService $validationInstanceService
* @var ObservationInstanceForm $observationInstanceForm
*/
$observationInstanceService = $container->get(ObservationInstanceService::class);
$validationInstanceService = $container->get(ValidationInstanceService::class);
$observationInstanceForm = $container->get('FormElementManager')->get(ObservationInstanceForm::class);
$controller = new ObservationInstanceController();
$controller->setObservationInstanceService($observationInstanceService);
$controller->setValidationInstanceService($validationInstanceService);
$controller->setObservationInstanceForm($observationInstanceForm);
return $controller;
}
}
\ No newline at end of file
src/UnicaenObservation/Controller/ObservationTypeController.php 0 → 100644
+ 140
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation\Controller;
use Laminas\Http\Response;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\View\Model\ViewModel;
use UnicaenObservation\Entity\Db\ObservationType;
use UnicaenObservation\Form\ObservationType\ObservationTypeFormAwareTrait;
use UnicaenObservation\Service\ObservationType\ObservationTypeServiceAwareTrait;
class ObservationTypeController extends AbstractActionController
{
use ObservationTypeServiceAwareTrait;
use ObservationTypeFormAwareTrait;
public function indexAction(): ViewModel
{
//filtre ?
$types = $this->getObservationTypeService()->getObservationsTypes('libelle', 'ASC', true);
$categories = [];
foreach ($types as $type) {
$categories[$type->getCategorie()] = $type->getCategorie();
}
$params = $this->params()->fromQuery();
$types = $this->getObservationTypeService()->getObservationsTypesWithFiltre($params);
return new ViewModel([
'types' => $types,
'categories' => $categories,
'params' => $params,
]);
}
public function afficherAction(): ViewModel
{
$type = $this->getObservationTypeService()->getRequestedObservationType($this);
return new ViewModel([
'title' => "Affiche du type de validation",
'type' => $type,
]);
}
public function ajouterAction(): ViewModel
{
$type = new ObservationType();
$form = $this->getObservationTypeForm();
$form->setAttribute('action', $this->url()->fromRoute('observation/otype/ajouter', [], [], true));
$form->bind($type);
$request = $this->getRequest();
if ($request->isPost()) {
$data = $request->getPost();
$form->setData($data);
if ($form->isValid()) {
$this->getObservationTypeService()->create($type);
exit();
}
}
$vm = new ViewModel([
'title' => "Ajout d'un type d'observation",
'form' => $form,
]);
$vm->setTemplate('observation/default/default-form');
return $vm;
}
public function modifierAction(): ViewModel
{
$type = $this->getObservationTypeService()->getRequestedObservationType($this);
$form = $this->getObservationTypeForm();
$form->setAttribute('action', $this->url()->fromRoute('observation/otype/modifier', ['observation-type' => $type->getId()], [], true));
$form->bind($type);
$form->setOldCode($type->getCode());
$request = $this->getRequest();
if ($request->isPost()) {
$data = $request->getPost();
$form->setData($data);
if ($form->isValid()) {
$this->getObservationTypeService()->update($type);
exit();
}
}
$vm = new ViewModel([
'title' => "Modification d'un type d'observation",
'form' => $form,
]);
$vm->setTemplate('observation/default/default-form');
return $vm;
}
public function historiserAction(): Response
{
$type = $this->getObservationTypeService()->getRequestedObservationType($this);
$this->getObservationTypeService()->historise($type);
$retour = $this->params()->fromRoute('retour');
if ($retour) return $this->redirect()->toUrl($retour);
return $this->redirect()->toRoute('observation/otype');
}
public function restaurerAction(): Response
{
$type = $this->getObservationTypeService()->getRequestedObservationType($this);
$this->getObservationTypeService()->restore($type);
$retour = $this->params()->fromRoute('retour');
if ($retour) return $this->redirect()->toUrl($retour);
return $this->redirect()->toRoute('observation/otype');
}
public function supprimerAction(): ViewModel
{
$type = $this->getObservationTypeService()->getRequestedObservationType($this);
$request = $this->getRequest();
if ($request->isPost()) {
$data = $request->getPost();
if ($data["reponse"] === "oui") $this->getObservationTypeService()->delete($type);
exit();
}
$vm = new ViewModel();
if ($type !== null) {
$vm->setTemplate('observation/default/confirmation');
$vm->setVariables([
'title' => "Suppression du type d'observationt " . $type->getCode(),
'text' => "La suppression est définitive êtes-vous sûr&middot;e de vouloir continuer ?",
'action' => $this->url()->fromRoute('observation/otype/supprimer', ["observation-type" => $type->getId()], [], true),
]);
}
return $vm;
}
}
\ No newline at end of file
src/UnicaenObservation/Controller/ObservationTypeControllerFactory.php 0 → 100644
+ 36
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation\Controller;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface;
use Psr\Container\NotFoundExceptionInterface;
use UnicaenObservation\Form\ObservationType\ObservationTypeForm;
use UnicaenObservation\Service\ObservationType\ObservationTypeService;
class ObservationTypeControllerFactory
{
/**
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function __invoke(ContainerInterface $container): ObservationTypeController
{
/**
* @var ObservationTypeService $observationTypeService
*/
$observationTypeService = $container->get(ObservationTypeService::class);
/**
* @var ObservationTypeForm $observationTypeForm
*/
$observationTypeForm = $container->get('FormElementManager')->get(ObservationTypeForm::class);
$controller = new ObservationTypeController();
$controller->setObservationTypeService($observationTypeService);
$controller->setObservationTypeForm($observationTypeForm);
return $controller;
}
}
\ No newline at end of file
src/UnicaenObservation/Entity/Db/Mapping/Observation.Entity.Db.ObservationInstance.dcm.xml 0 → 100644
+ 41
− 0
View file @ e2b5546f
<?xml version="1.0" encoding="utf-8"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="UnicaenObservation\Entity\Db\ObservationInstance" table="unicaen_observation_observation_instance">
<id name="id" type="integer" column="id">
<generator strategy="IDENTITY"/>
</id>
<many-to-one target-entity="UnicaenObservation\Entity\Db\ObservationType" field="type">
<join-column name="type_id" referenced-column-name="id"/>
</many-to-one>
<field name="observation" type="text" column="observation" nullable="false"/>
<many-to-many field="validations" target-entity="UnicaenValidation\Entity\Db\ValidationInstance">
<join-table name="unicaen_observation_observation_validation">
<join-columns>
<join-column name="observation_instance_id" referenced-column-name="id" />
</join-columns>
<inverse-join-columns>
<join-column name="validation_id" referenced-column-name="id" />
</inverse-join-columns>
</join-table>
</many-to-many>
<!-- HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<field name="histoCreation" type="datetime" column="histo_creation" nullable="false"/>
<field name="histoModification" type="datetime" column="histo_modification" nullable="false"/>
<field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
<many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoCreateur">
<join-column name="histo_createur_id" referenced-column-name="ID"/>
</many-to-one>
<many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoModificateur">
<join-column name="histo_modificateur_id" referenced-column-name="ID"/>
</many-to-one>
<many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
<join-column name="histo_destructeur_id" referenced-column-name="ID"/>
</many-to-one>
</entity>
</doctrine-mapping>
src/UnicaenObservation/Entity/Db/Mapping/Observation.Entity.Db.ObservationType.dcm.xml 0 → 100644
+ 30
− 0
View file @ e2b5546f
<?xml version="1.0" encoding="utf-8"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
<entity name="UnicaenObservation\Entity\Db\ObservationType" table="unicaen_observation_observation_type">
<id name="id" type="integer" column="id">
<generator strategy="IDENTITY"/>
</id>
<field name="code" type="string" length="256" column="code" nullable="false"/>
<field name="libelle" type="string" length="1024" column="libelle" nullable="false"/>
<field name="categorie" type="string" length="1024" column="categorie" nullable="true"/>
<one-to-many target-entity="UnicaenObservation\Entity\Db\ObservationInstance" mapped-by="type" field="observations"/>
<!-- HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<field name="histoCreation" type="datetime" column="histo_creation" nullable="false"/>
<field name="histoModification" type="datetime" column="histo_modification" nullable="false"/>
<field name="histoDestruction" type="datetime" column="histo_destruction" nullable="true"/>
<many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoCreateur">
<join-column name="histo_createur_id" referenced-column-name="ID"/>
</many-to-one>
<many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoModificateur">
<join-column name="histo_modificateur_id" referenced-column-name="ID"/>
</many-to-one>
<many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
<join-column name="histo_destructeur_id" referenced-column-name="ID"/>
</many-to-one>
</entity>
</doctrine-mapping>
src/UnicaenObservation/Entity/Db/ObservationInstance.php 0 → 100644
+ 50
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation\Entity\Db;
use Doctrine\Common\Collections\ArrayCollection;
use UnicaenUtilisateur\Entity\Db\HistoriqueAwareInterface;
use UnicaenUtilisateur\Entity\Db\HistoriqueAwareTrait;
use UnicaenValidation\Entity\HasValidationsInterface;
use UnicaenValidation\Entity\HasValidationsTrait;
class ObservationInstance implements HistoriqueAwareInterface, HasValidationsInterface
{
use HistoriqueAwareTrait;
use HasValidationsTrait;
private ?int $id = null;
private ?ObservationType $type = null;
private ?string $observation = null;
public function __construct()
{
$this->validations = new ArrayCollection();
}
public function getId(): ?int
{
return $this->id;
}
public function getType(): ?ObservationType
{
return $this->type;
}
public function setType(?ObservationType $type): void
{
$this->type = $type;
}
public function getObservation(): ?string
{
return $this->observation;
}
public function setObservation(?string $observation): void
{
$this->observation = $observation;
}
}
src/UnicaenObservation/Entity/Db/ObservationType.php 0 → 100644
+ 67
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation\Entity\Db;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use UnicaenUtilisateur\Entity\Db\HistoriqueAwareInterface;
use UnicaenUtilisateur\Entity\Db\HistoriqueAwareTrait;
class ObservationType implements HistoriqueAwareInterface
{
use HistoriqueAwareTrait;
private ?int $id = null;
private ?string $code = null;
private ?string $libelle = null;
private ?string $categorie = null;
private Collection $observations;
public function __construct()
{
$this->observations = new ArrayCollection();
}
public function getId(): ?int
{
return $this->id;
}
public function getCode(): ?string
{
return $this->code;
}
public function setCode(?string $code): void
{
$this->code = $code;
}
public function getLibelle(): ?string
{
return $this->libelle;
}
public function setLibelle(?string $libelle): void
{
$this->libelle = $libelle;
}
public function getCategorie(): ?string
{
return $this->categorie;
}
public function setCategorie(?string $categorie): void
{
$this->categorie = $categorie;
}
/** @return Observation[] */
public function getObservations(): array
{
return $this->observations->toArray();
}
}
src/UnicaenObservation/Entity/Interface/HasObservationsInterface.php 0 → 100644
+ 20
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation\Entity\Interface;
use Doctrine\Common\Collections\Collection;
use UnicaenObservation\Entity\Db\ObservationInstance;
use UnicaenObservation\Entity\Db\ObservationType;
interface HasObservationsInterface
{
public function getObservations(): Collection;
public function hasObservation(ObservationInstance $observationInstance): bool;
public function hasObservationWithType(ObservationType $observationType, bool $histo = false): bool;
public function hasObservationWithTypeCode(string $code, bool $histo = false): bool;
public function getObservationWithTypeCode(string $code, bool $histo = false): ?ObservationInstance;
public function addObservation(ObservationInstance $observationInstance): void;
public function removeObservation(ObservationInstance $observationInstance): void;
}
\ No newline at end of file
src/UnicaenObservation/Entity/Trait/HasObservationsTrait.php 0 → 100644
+ 59
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation\Entity\Trait;
use Doctrine\Common\Collections\Collection;
use UnicaenObservation\Entity\Db\ObservationInstance;
use UnicaenObservation\Entity\Db\ObservationType;
trait HasObservationsTrait
{
private Collection $observations;
public function getObservations(): Collection
{
return $this->observations;
}
public function hasObservation(ObservationInstance $observationInstance): bool
{
return $this->getObservations()->contains($observationInstance);
}
public function hasObservationWithType(ObservationType $observationType, bool $histo = false): bool
{
/** @var ObservationInstance $observation */
foreach ($this->getObservations() as $observation) {
if ($observation->getType() === $observationType AND (!$histo OR $observation->estNonHistorise())) return true;
}
return false;
}
public function hasObservationWithTypeCode(string $code, bool $histo = false): bool
{
/** @var ObservationInstance $observation */
foreach ($this->getObservations() as $observation) {
if ($observation->getType()->getCode() === $code AND (!$histo OR $observation->estNonHistorise())) return true;
}
return false;
}
public function getObservationWithTypeCode(string $code, bool $histo = false): ?ObservationInstance
{
/** @var ObservationInstance $observation */
foreach ($this->getObservations() as $observation) {
if ($observation->getType()->getCode() === $code AND (!$histo OR $observation->estNonHistorise())) return $observation;
}
return null;
}
public function addObservation(ObservationInstance $observationInstance): void
{
$this->observations->add($observationInstance);
}
public function removeObservation(ObservationInstance $observationInstance): void
{
$this->observations->removeElement($observationInstance);
}
}
\ No newline at end of file
src/UnicaenObservation/Form/ObservationInstance/ObservationInstanceForm.php 0 → 100644
+ 74
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation\Form\ObservationInstance;
use Laminas\Form\Element\Button;
use Laminas\Form\Element\Select;
use Laminas\Form\Element\Textarea;
use Laminas\Form\Form;
use Laminas\InputFilter\Factory;
use UnicaenObservation\Service\ObservationType\ObservationTypeServiceAwareTrait;
class ObservationInstanceForm extends Form
{
use ObservationTypeServiceAwareTrait;
public function init(): void
{
// Type
$this->add([
'type' => Select::class,
'name' => 'observationtype',
'options' => [
'label' => "Type d'observation <span class='icon icon-obligatoire' title='Champ obligatoire'></span> :",
'label_options' => ['disable_html_escape' => true,],
'empty_option' => "Sélectionner un type d'observation ...",
'value_options' => $this->getObservationTypeService()->getObservationsTypesAsOption(),
],
'attributes' => [
'id' => 'observationtype',
'class' => 'bootstrap-selectpicker show-tick',
'data-live-search' => 'true',
],
]);
// Observation
$this->add([
'name' => 'observation',
'type' => Textarea::class,
'options' => [
'label' => "Observation <span class='icon icon-obligatoire' title='Champ obligatoire'></span> : ",
'label_options' => ['disable_html_escape' => true,],
'label_attributes' => [
'class' => 'control-label',
],
],
'attributes' => [
'id' => 'observation',
'class' => 'tinymce type2',
],
]);
// button
$this->add([
'type' => Button::class,
'name' => 'creer',
'options' => [
'label' => '<i class="fas fa-save"></i> Enregistrer',
'label_options' => ['disable_html_escape' => true,],
],
'attributes' => [
'type' => 'submit',
'class' => 'btn btn-primary',
],
]);
$this->setInputFilter((new Factory())->createInputFilter([
'observationtype' => ['required' => true,],
'observation' => ['required' => true,],
]));
}
public function cacherType(): void
{
$this->get('observationtype')->setAttribute('class', 'hidden');
}
}
\ No newline at end of file
src/UnicaenObservation/Form/ObservationInstance/ObservationInstanceFormAwareTrait.php 0 → 100644
+ 19
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation\Form\ObservationInstance;
trait ObservationInstanceFormAwareTrait
{
private ObservationInstanceForm $observationInstanceForm;
public function getObservationInstanceForm(): ObservationInstanceForm
{
return $this->observationInstanceForm;
}
public function setObservationInstanceForm(ObservationInstanceForm $observationInstanceForm): void
{
$this->observationInstanceForm = $observationInstanceForm;
}
}
\ No newline at end of file
src/UnicaenObservation/Form/ObservationInstance/ObservationInstanceFormFactory.php 0 → 100644
+ 30
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation\Form\ObservationInstance;
use UnicaenObservation\Service\ObservationType\ObservationTypeService;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface;
use Psr\Container\NotFoundExceptionInterface;
class ObservationInstanceFormFactory {
/**
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function __invoke(ContainerInterface $container): ObservationInstanceForm
{
/**
* @var ObservationTypeService $observationTypeService
* @var ObservationInstanceHydrator $hydrator
*/
$observationTypeService = $container->get(ObservationTypeService::class);
$hydrator = $container->get('HydratorManager')->get(ObservationInstanceHydrator::class);
$form = new ObservationInstanceForm();
$form->setObservationTypeService($observationTypeService);
$form->setHydrator($hydrator);
return $form;
}
}
\ No newline at end of file
src/UnicaenObservation/Form/ObservationInstance/ObservationInstanceHydrator.php 0 → 100644
+ 34
− 0
View file @ e2b5546f
<?php
namespace UnicaenObservation\Form\ObservationInstance;
use Laminas\Hydrator\HydratorInterface;
use UnicaenObservation\Entity\Db\ObservationInstance;
use UnicaenObservation\Service\ObservationType\ObservationTypeServiceAwareTrait;
class ObservationInstanceHydrator implements HydratorInterface {
use ObservationTypeServiceAwareTrait;
public function extract(object $object): array
{
/** @var ObservationInstance $object */
$data = [
'observationtype' => ($object->getType())?$object->getType()->getId():null,
'observation' => $object->getObservation(),
];
return $data;
}
public function hydrate(array $data, object $object): object
{
$type = (isset($data['observationtype']))?$this->getObservationTypeService()->getObservationType($data['observationtype']):null;
$observation = (isset($data['observation']) && trim($data['observation']) !== '')?trim($data['observation']):null;
/** @var ObservationInstance $object */
$object->setType($type);
$object->setObservation($observation);
return $object;
}
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment