changing evaluation for document -> no render for twig

This commit is contained in:
Lucas Silva 2023-03-22 18:11:41 +01:00
parent 457d71b4f3
commit 1a759cabe4
4 changed files with 20 additions and 16 deletions

View File

@ -14,33 +14,33 @@ namespace Chill\PersonBundle\Notification;
use Chill\MainBundle\Entity\Notification; use Chill\MainBundle\Entity\Notification;
use Chill\MainBundle\Notification\NotificationHandlerInterface; use Chill\MainBundle\Notification\NotificationHandlerInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationRepository; use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocumentRepository;
final class AccompanyingPeriodWorkEvaluationNotificationHandler implements NotificationHandlerInterface final class AccompanyingPeriodWorkEvaluationDocumentNotificationHandler implements NotificationHandlerInterface
{ {
private AccompanyingPeriodWorkEvaluationRepository $accompanyingPeriodWorkEvaluationRepository; private AccompanyingPeriodWorkEvaluationDocumentRepository $accompanyingPeriodWorkEvaluationDocumentRepository;
public function __construct(AccompanyingPeriodWorkEvaluationRepository $accompanyingPeriodWorkEvaluationRepository) public function __construct(AccompanyingPeriodWorkEvaluationDocumentRepository $accompanyingPeriodWorkEvaluationDocumentRepository)
{ {
$this->accompanyingPeriodWorkEvaluationRepository = $accompanyingPeriodWorkEvaluationRepository; $this->accompanyingPeriodWorkEvaluationDocumentRepository = $accompanyingPeriodWorkEvaluationDocumentRepository;
} }
public function getTemplate(Notification $notification, array $options = []): string public function getTemplate(Notification $notification, array $options = []): string
{ {
return 'ChillPersonBundle:AccompanyingCourseWork:showEvaluationInNotification.html.twig'; return 'ChillPersonBundle:AccompanyingCourseWork:showEvaluationDocumentInNotification.html.twig';
} }
public function getTemplateData(Notification $notification, array $options = []): array public function getTemplateData(Notification $notification, array $options = []): array
{ {
return [ return [
'notification' => $notification, 'notification' => $notification,
'evaluation' => $this->accompanyingPeriodWorkEvaluationRepository->find($notification->getRelatedEntityId()), 'document' => $this->accompanyingPeriodWorkEvaluationDocumentRepository->find($notification->getRelatedEntityId()),
]; ];
} }
public function supports(Notification $notification, array $options = []): bool public function supports(Notification $notification, array $options = []): bool
{ {
return $notification->getRelatedEntityClass() === AccompanyingPeriodWorkEvaluation::class; return $notification->getRelatedEntityClass() === AccompanyingPeriodWorkEvaluationDocument::class;
} }
} }

View File

@ -130,13 +130,15 @@
{% import "@ChillDocStore/Macro/macro.html.twig" as m %} {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %} {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
{% if e.documents|length > 0 %} {% if e.documents|length > 0 %}
<table class="table mt-4 mx-auto"> <table class="table mt-4 mx-auto">
{% for d in e.documents %} {% for d in e.documents %}
{{ dump(d) }}
<tr class="border-0"> <tr class="border-0">
<td class="border-0">{{ d.title }}</td> <td class="border-0">{{ d.title }}</td>
<td class="border-0">{{ mm.mimeIcon(d.storedObject.type) }}</td> <td class="border-0">{{ mm.mimeIcon(d.storedObject.type) }}</td>
<td class="border-0"> <td class="border-0">
<a class="btn btn-notify btn-sm btn-outline-primary" title="{{ 'notification.Notify'|trans }} " href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation', 'entityId': e.id}) }}"></a> <a class="btn btn-notify btn-sm btn-outline-primary" title="{{ 'notification.Notify'|trans }} " href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'entityId': d.id}) }}"></a>
</td> </td>
<td class="border-0 text-end">{{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}</td> <td class="border-0 text-end">{{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}</td>
</tr> </tr>

View File

@ -1,19 +1,21 @@
{% macro recordAction(evaluation) %} {% macro recordAction(document) %}
<li> <li>
<a href={{ path('chill_person_accompanying_period_work_list', { 'id': accompanyingCourse.id }) }}"" <a href={{ path('chill_person_accompanying_period_work_list', { 'id': accompanyingCourse.id }) }}""
class="btn btn-show" title="{{ 'See accompanying period'|trans }}"></a> class="btn btn-show" title="{{ 'See accompanying period'|trans }}"></a>
</li> </li>
{% endmacro %} {% endmacro %}
{% if evaluation is not null %} {% if document is not null %}
<div class="flex-table"> <div class="flex-table">
{% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', evaluation) %} {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', document) %}
{% else %} {% else %}
{% endif %} {% endif %}
{{ dump(document) }}
{% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with { {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
'w': evaluation.accompanyingPeriodWork
'w': document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork
} %} } %}
<div class="alert alert-warning border-warning border-1"> <div class="alert alert-warning border-warning border-1">
{{ 'This is the minimal period details'|trans ~ ': ' ~ evaluation.id }}<br> {{ 'This is the minimal period details'|trans ~ ': ' ~ document.id }}<br>
{{ 'You are getting a notification for a period you are not allowed to see'|trans }} {{ 'You are getting a notification for a period you are not allowed to see'|trans }}
</div> </div>
</div> </div>

View File

@ -5,6 +5,6 @@ services:
Chill\PersonBundle\Notification\AccompanyingPeriodWorkNotificationHandler: Chill\PersonBundle\Notification\AccompanyingPeriodWorkNotificationHandler:
autowire: true autowire: true
autoconfigure: true autoconfigure: true
Chill\PersonBundle\Notification\AccompanyingPeriodWorkEvaluationNotificationHandler: Chill\PersonBundle\Notification\AccompanyingPeriodWorkEvaluationDocumentNotificationHandler:
autowire: true autowire: true
autoconfigure: true autoconfigure: true