Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Replace sign button with signed statement if person/user has signed

Browse Source
This commit is contained in:
Julie Lenaerts 2024-08-07 12:44:34 +02:00 committed by Julien Fastré
parent 3e5a558cdf
commit 3e6d764b9b
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Bundle/ChillMainBundle/Controller/WorkflowController.php
View File

@ -14,11 +14,11 @@ namespace Chill\MainBundle\Controller;
use Chill\MainBundle\Entity\User; use Chill\MainBundle\Entity\User;
use Chill\MainBundle\Entity\Workflow\EntityWorkflow; use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep; use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep;
use Chill\MainBundle\Entity\Workflow\EntityWorkflowStepSignature;
use Chill\MainBundle\Form\WorkflowSignatureMetadataType; use Chill\MainBundle\Form\WorkflowSignatureMetadataType;
use Chill\MainBundle\Form\WorkflowStepType; use Chill\MainBundle\Form\WorkflowStepType;
use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Pagination\PaginatorFactory;
use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository; use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
use Chill\MainBundle\Repository\Workflow\EntityWorkflowStepSignatureRepository;
use Chill\MainBundle\Security\Authorization\EntityWorkflowVoter; use Chill\MainBundle\Security\Authorization\EntityWorkflowVoter;
use Chill\MainBundle\Security\ChillSecurity; use Chill\MainBundle\Security\ChillSecurity;
use Chill\MainBundle\Workflow\EntityWorkflowManager; use Chill\MainBundle\Workflow\EntityWorkflowManager;
@ -32,6 +32,7 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Validator\Validator\ValidatorInterface; use Symfony\Component\Validator\Validator\ValidatorInterface;
use Symfony\Component\Workflow\Registry; use Symfony\Component\Workflow\Registry;
@ -51,6 +52,7 @@ class WorkflowController extends AbstractController
private readonly ChillSecurity $security, private readonly ChillSecurity $security,
private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry, private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
private readonly ClockInterface $clock, private readonly ClockInterface $clock,
private readonly EntityWorkflowStepSignatureRepository $entityWorkflowStepSignatureRepository,
) {} ) {}
#[Route(path: '/{_locale}/main/workflow/create', name: 'chill_main_workflow_create')] #[Route(path: '/{_locale}/main/workflow/create', name: 'chill_main_workflow_create')]
@ -374,7 +376,11 @@ class WorkflowController extends AbstractController
#[Route(path: '/{_locale}/main/workflow/signature/{signature_id}/metadata', name: 'chill_main_workflow_signature_metadata')] #[Route(path: '/{_locale}/main/workflow/signature/{signature_id}/metadata', name: 'chill_main_workflow_signature_metadata')]
public function addSignatureMetadata(int $signature_id, Request $request): Response public function addSignatureMetadata(int $signature_id, Request $request): Response
{ {
$signature = $this->entityManager->getRepository(EntityWorkflowStepSignature::class)->find($signature_id); $signature = $this->entityWorkflowStepSignatureRepository->find($signature_id);
if (null === $signature) {
throw new NotFoundHttpException('signature not found');
}
if ($signature->getSigner() instanceof User) { if ($signature->getSigner() instanceof User) {
return $this->redirectToRoute('chill_main_workflow_signature_add', ['id' => $signature_id]); return $this->redirectToRoute('chill_main_workflow_signature_add', ['id' => $signature_id]);

16
src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature.html.twig
View File

@ -6,12 +6,16 @@
<div class="col-sm-12 col-md-8"><span>{{ s.signer|chill_entity_render_box }}</span></div> <div class="col-sm-12 col-md-8"><span>{{ s.signer|chill_entity_render_box }}</span></div>
<div class="col-sm-12 col-md-4"> <div class="col-sm-12 col-md-4">
<ul class="record_actions"> <ul class="record_actions">
<li> {% if s.state.value == 'signed' %}
<a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_workflow_signature_metadata', { 'signature_id': s.id}) }}"><i class="fa fa-pencil-square-o"></i> {{ 'workflow.signature_zone.button_sign'|trans }}</a> <p>{{ 'workflow.signature_zone.has_signed_statement'|trans( { '%datetime%' : s.stateDate|date('j M Y à H:i:s') } ) }}</p>
{% if s.state is same as('signed') %} {% else %}
<p class="updatedBy">{{ s.stateDate }}</p> <li>
{% endif %} <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_workflow_signature_metadata', { 'signature_id': s.id}) }}"><i class="fa fa-pencil-square-o"></i> {{ 'workflow.signature_zone.button_sign'|trans }}</a>
</li> {% if s.state is same as('signed') %}
<p class="updatedBy">{{ s.stateDate }}</p>
{% endif %}
</li>
{% endif %}
</ul> </ul>
</div> </div>
{% endfor %} {% endfor %}

1
src/Bundle/ChillMainBundle/translations/messages.fr.yml
View File

@ -531,6 +531,7 @@ workflow:
signature_zone: signature_zone:
title: Appliquer les signatures électroniques title: Appliquer les signatures électroniques
button_sign: Signer button_sign: Signer
has_signed_statement: 'À signé le %datetime%'
metadata: metadata:
sign_by: 'Signature pour %name%' sign_by: 'Signature pour %name%'
docType: Type de document docType: Type de document