+
+
+
+ ![]()
+
+ {{ this.title }}
+
+
+
+ {{ $t('save_and_quit') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('invalid_title') }}
+ + +{{ $t('invalid_message') }}
+
+
+
- {% if user is not empty %}
- {{ 'Last updated by'| trans }}
-
- {{ user|chill_entity_render_box(options['user']) }}
-
- {% endif %}
{% if comment.date is not empty %}
- {% if user is empty %}
- {{ 'Last updated on'|trans ~ ' ' }}
- {% else %}
- {{ 'on'|trans ~ ' ' }}
- {% endif %}
+ {{ 'Last updated on'|trans ~ ' ' }}
{{ comment.date|format_datetime("medium", "short") }}
{% endif %}
+ {% if user is not empty %}
+ {% if comment.date is empty %}
+ {{ 'Last updated by'| trans }}
+ {% else %}
+ {{ 'by_user'|trans ~ ' ' }}
+ {% endif %}
+
+ {{ user|chill_entity_render_box(options['user']) }}
+
+ {% endif %}
{% endif %}
-{{ closing_box|raw }}
+{{ closing_box|raw }}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
index cc35be33a..bc39a9275 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
@@ -23,7 +23,7 @@
-
-
-
++ {% block v_menu_title %}{% endblock %} - + {% for menu in menus %} -diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig index 91de10f99..5750a3a2c 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig @@ -2,7 +2,7 @@ @@ -58,14 +58,15 @@
- - {{ menu.label|trans }} -
+ + {{ menu.label|upper }} + {% endfor %} - +- {% if c.action_button is not defined or c.action_button != 'false' %} + {% if c.action_button is not defined or c.action_button != false %}- {% if c.full_content is defined and c.full_content == 'true' %} + {% if c.full_content is defined and c.full_content == true %} {{ c.notification.message|chill_markdown_to_html }} {% else %} {{ c.notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }} + {% endif %}@@ -87,6 +87,7 @@ {% endif %} + {% if appendCommentForm is not null %}- @@ -85,7 +86,13 @@ {% if is_granted('CHILL_MAIN_NOTIFICATION_SEE', c.notification) %}
- + class="btn {% if not c.notification.isSystem %}btn-show change-icon{% else %}btn-misc{% endif %}" title="{{ 'notification.see_comments_thread'|trans }}"> + {% if not c.notification.isSystem() %} + + {% else %} + {{ 'Read more'|trans }} + {% endif %} + {% endif %}
- {% if fold_item is defined and fold_item != 'false' %} + {% if fold_item is defined and fold_item != false %}diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig index d556da65f..ed4a05c34 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig @@ -40,8 +40,8 @@ 'template': handler.getTemplate(notification), 'template_data': handler.getTemplateData(notification) }, - 'action_button': 'false', - 'full_content': 'true' + 'action_button': false, + 'full_content': true } %}+ {% include handler.template(notification) with handler.templateData(notification) %} + {{ form_end(form) }}-
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_counter_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_counter_notifications_for.html.twig
new file mode 100644
index 000000000..d9d50a9a9
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_counter_notifications_for.html.twig
@@ -0,0 +1,12 @@
+
+ {% if counter.total > 0 %} + + {{ 'notification.counter total notifications'|trans({'total': counter.total }) }} + + {% endif %} + {% if counter.unread > 0 %} + + {{ 'notification.counter unread notifications'|trans({'unread': counter.unread }) }} + + {% endif %} +\ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig index 8bb695078..ac1daad6f 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig @@ -18,7 +18,7 @@ data-notification-id="{{ notification.id }}" data-notification-current-is-read="{{ notification.isReadBy(app.user) }}" data-container="notification-status" - data-show-button-url="{{ chill_path_add_return_path('chill_main_notification_show', {'id': notification.id}) }}" + data-show-button-url="{{ chill_path_add_return_path('chill_main_notification_show', {'id': notification.id}, false) }}" data-button-class="btn-outline-primary" data-button-text="false" > diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig index a8a3eb7e8..b2f6169ee 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig @@ -50,7 +50,7 @@ {% for data in datas %} {% set notification = data.notification %} {% include 'ChillMainBundle:Notification:_list_item.html.twig' with { - 'fold_item': 'true' + 'fold_item': true } %} {% endfor %}-
diff --git a/src/Bundle/ChillMainBundle/Resources/views/OnTheFly/_insert_vue_onthefly.html.twig b/src/Bundle/ChillMainBundle/Resources/views/OnTheFly/_insert_vue_onthefly.html.twig
index 666743fb2..1f29bfe7a 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/OnTheFly/_insert_vue_onthefly.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/OnTheFly/_insert_vue_onthefly.html.twig
@@ -11,6 +11,7 @@
* buttonText string
* displayBadge boolean (default: false) replace button by badge, need to define buttonText for content
* parent object (optional) pass parent context of the targetEntity (used for course resource comment)
+ * isDead boolean (default: false) is the person dead
#}
{{ 'Document'|trans ~ 'target'|trans }}
+
+
- Date de début : 25/11/2021 +
- Date de fin : 10/03/2022 +
- Résultat : Arrêt à l'initiative du ménage pour déménagement +
- Orientation vers une MASP +
- + + +
- + {% set x = random(1) %} + + +
- + + +
- + + +
- {{ u|chill_entity_render_box }} + {%- endfor %} +
- + + {{ 'Show'|trans }} + + +
- + {{ 'By'|trans ~ ' : ' }} + {{ step.transitionBy|chill_entity_render_box }} + +
- + {{ 'Le'|trans ~ ' : ' }} + {{ step.transitionAt|format_datetime('short', 'short') }} + +
- ${capitalizeFirstLetter(el)} `); + container.innerHTML = pre + suggestions.join(' ') + after; + }) + } + + const tags = document.querySelectorAll('[data-suggest-target]').forEach((tag) => { + tag.addEventListener('click', function(e) { + const field = document.querySelector(`[name="${e.target.dataset.suggestTarget}"]`); + let suggestion = e.target.textContent.trim(); + switch (field.dataset.suggestTransform) { + case 'uppercase_all': + suggestion = suggestion.toLocaleUpperCase(); + break; + case 'uppercase_first_letter': + default: + suggestion = capitalizeFirstLetter(suggestion); + } + + if (field.value === '') { + field.value = suggestion; + } else { + field.value = `${field.value} ${suggestion}` + } + e.target.style.display = "none"; + + [...document.querySelectorAll("[data-suggest-target]")] + .filter(p => p.textContent.includes(e.target.textContent)) + .forEach(p => p.remove()); + }) + }) + +}) + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js index 8e4134205..ab95229a2 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js @@ -15,21 +15,15 @@ const getAccompanyingCourse = (id) => { }); }; -const getUsers = () => { - const url = `/api/1.0/main/user.json`; - - return fetchResults(url); -}; +const getUsers = () => fetchResults('/api/1.0/main/user.json'); const getReferrersSuggested = (course) => { const url = `/api/1.0/person/accompanying-course/${course.id}/referrers-suggested.json`; - return fetchResults(url); } -/* -* Endpoint -*/ +const getUserJobs = () => fetchResults('/api/1.0/main/user-job.json'); + const getSocialIssues = () => { const url = `/api/1.0/person/social-work/social-issue.json`; return fetch(url) @@ -54,4 +48,5 @@ export { getAccompanyingCourse, getUsers, getReferrersSuggested, + getUserJobs }; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AdminLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AdminLocation.vue index 201360a6e..9b3a6ade9 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AdminLocation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AdminLocation.vue @@ -19,6 +19,9 @@ :options="options" group-values="locations" group-label="locationCategories" + :select-label="$t('multiselect.select_label')" + :deselect-label="$t('multiselect.deselect_label')" + :selected-label="$t('multiselect.selected_label')" @select="updateAdminLocation"> diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue index 8c4aa2910..faba287c5 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue @@ -59,9 +59,35 @@
-
+
+
+ - + + +
- + + +
- + + + + +
- - @@ -104,6 +104,13 @@ export default { return false; }, + lastStepIsSaveAllowed() { + let r = !this.$store.getters.isHouseholdNew || + (this.$store.state.numberOfChildren !== null && this.$store.state.householdCompositionType !== null); + console.log('is saved allowed ?', r); + + return r; + }, }, methods: { goToNext() { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue index 3be8822be..74271954f 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue @@ -7,18 +7,14 @@
- + {{ c.person.text }} + +
++ +{% else %} + + {# For an action #} ++ ++++Imprimé unique, parcours n°14635
+ Document PDF (6.2 Mo) ++ Description du document. Sed euismod nisi porta lorem mollis aliquam. Non curabitur gravida arcu ac tortor. +
+{{ 'Accompanying Course Action'|trans ~ 'target'|trans }}
+ ++ {# dynamic insertion + ::: TODO delete all static insertion, remove condition and pass work object in inclusion + #}{% if dynamic is defined %} + + {% set work = '+ +{% endif %} + +' %} + {% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with { 'w': work } %} + + {% else %} + + {# BEGIN static insertion #} + ++ {# END static insertion #} + + {% endif %} ++++ + Exercer un AEB > Conclure l'AEB +
+-
+
+++++++Référent
+Fred
+++Usagers du parcours
+ Vernon SUBUTEX + Juan RAMON +++++Problématique sociale
+++ AD - PREVENTION, ACCES AUX DROITS, BUDGET >SOUTIEN EQUILIBRE BUDGET +
++++ +
+Objectif - motif - dispositif
Résultats - orientations
+ + ++ +Aucun objectif - motif - dispositif
++ +-
+
+++ Dernière mise à jour par + Fred(Responsable tous les territoires)(ASE),+
+ le 3 décembre 2021 à 15:19 +-
+
{{ 'Join a comment'|trans }}
+ +{{ form_start(comment_form) }} + +{{ form_widget(comment_form.comment) }} + +-
+
{{ 'Decision'|trans }}
+ +{% if transition_form is not null %} + {{ form_start(transition_form) }} + + {{ form_row(transition_form.transition) }} + ++ {{ form_row(transition_form.finalizeAfter) }} ++ + {% if transition_form.freezeAfter is defined %} + {{ form_row(transition_form.freezeAfter) }} + {% endif %} + ++ {{ form_row(transition_form.future_dest_users) }} ++ +{{ form_label(transition_form.comment) }}
+ + {{ form_widget(transition_form.comment) }} + +-
+
+ + {% if entity_workflow.currentStep.isFinalizeAfter %} ++ +{% endif %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_extension_list_workflow_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_extension_list_workflow_for.html.twig new file mode 100644 index 000000000..67037465b --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_extension_list_workflow_for.html.twig @@ -0,0 +1,13 @@ +{% if is_granted('CHILL_MAIN_WORKFLOW_CREATE', blank_workflow) %} + {# vue component #} + +{% endif %} + +{% if entity_workflows|length > 0 %} + {# vue component #} + +{% endif %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_follow.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_follow.html.twig new file mode 100644 index 000000000..7a14e83fe --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_follow.html.twig @@ -0,0 +1,8 @@ +{{ 'workflow.This workflow is finalized'|trans }}
+ {% else %} +{{ 'workflow.You are not allowed to apply a transition on this workflow'|trans }}
+{{ 'workflow.Only those users are allowed'|trans }}:
+ +-
+ {% for u in entity_workflow.currentStep.destUser -%}
+
{{ 'Follow workflow'|trans }}
+ +{# vue component #} + diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig new file mode 100644 index 000000000..faa94e3a7 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig @@ -0,0 +1,59 @@ +{{ 'Workflow history'|trans }}
+ ++ {% for step in entity_workflow.stepsChained %} +diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_notification_include.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_notification_include.html.twig new file mode 100644 index 000000000..c20f51193 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_notification_include.html.twig @@ -0,0 +1,12 @@ +++ + {% endfor %} + ++ {% if loop.first and step.next is null %} ++ {% if step.next is not null %} ++ {{ 'workflow.No transitions'|trans }} ++ {% endif %} + ++++ {% if not loop.first %} + + {% endif %} + {{ step.currentStep }} ++ {# ++ + Refusé ++ #} +++ {% endif %} + {% if step.comment is not empty %} ++ {% if step.transitionBy is not null %} +++ {{ step.transitionBy|chill_entity_render_box }} ++ {% endif %} ++ {{ step.transitionAt|format_datetime('long', 'medium') }} +++++ + {{ step.next.currentStep }} ++++ {% endif %} ++ {{ step.comment|chill_markdown_to_html }} +
++diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig new file mode 100644 index 000000000..588e2de0b --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig @@ -0,0 +1,56 @@ +{% extends '@ChillMain/layout.html.twig' %} + +{% block title %} + {{ 'Workflow'|trans }} +{% endblock %} + +{% block js %} + {{ parent() }} + + {{ encore_entry_script_tags('mod_async_upload') }} + {{ encore_entry_script_tags('mod_pickentity_type') }} + {{ encore_entry_script_tags('mod_entity_workflow_subscribe') }} + {{ encore_entry_script_tags('page_workflow_show') }} + {{ encore_entry_script_tags('mod_wopi_link') }} +{% endblock %} + +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('mod_pickentity_type') }} + {{ encore_entry_link_tags('mod_entity_workflow_subscribe') }} + {{ encore_entry_link_tags('page_workflow_show') }} + {{ encore_entry_link_tags('mod_wopi_link') }} +{% endblock %} + +{% block content %} ++ {{ 'workflow_'|trans }} +
+ {% include handler.templateTitle(l.entity_workflow) with handler.templateTitleData(entity_workflow)|merge({ + 'description': true, + 'breadcrumb': true, + 'add_classes': 'ms-3 h3' + }) %} + + +++{% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig new file mode 100644 index 000000000..6da68e390 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig @@ -0,0 +1,97 @@ +{% extends 'ChillMainBundle::layout.html.twig' %} + +{% import '@ChillMain/Workflow/macro_breadcrumb.html.twig' as macro %} + +{% block title %} + {{ 'workflow.My workflows'|trans }} +{% endblock %} + +{% block content %} +{{ block('title') }}
+ + {# handler_template: + - src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig + - src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig + - src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig + #} ++ + ++ {% include handler_template_title with handler_template_data|merge({'breadcrumb': true }) %} ++ {% include handler_template with handler_template_data|merge({'display_action': true }) %} +{% include '@ChillMain/Workflow/_follow.html.twig' %} +{% include '@ChillMain/Workflow/_decision.html.twig' %} {# +{% include '@ChillMain/Workflow/_comment.html.twig' %} #} +{% include '@ChillMain/Workflow/_history.html.twig' %} + + {# useful ? + + #} ++ ++{% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig new file mode 100644 index 000000000..436394012 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig @@ -0,0 +1,45 @@ +{% macro popoverContent(step) %} +{{ block('title') }}
+ + + + {% if workflows|length == 0 %} +{{ 'workflow.No workflow'|trans }}
+ {% else %} ++ {% for l in workflows %} ++ {% endif %} +++ {% endfor %} ++ + {{ macro.breadcrumb(l) }} + +++ +++ {% include l.handler.template(l.entity_workflow) with l.handler.templateData(l.entity_workflow)|merge({ + 'display_action': false + }) %} ++++ ++++ {% if l.entity_workflow.isUserSubscribedToStep(app.user) %} + + {{ 'workflow.you subscribed to all steps'|trans }} + {% endif %} +
++ {% if l.entity_workflow.isUserSubscribedToFinal(app.user) %} + + {{ 'workflow.you subscribed to final step'|trans }} + {% endif %} +
+++-
+
-
+
+ {% for step in _ctx.entity_workflow.stepsChained %} + {% if step.previous is null %} + {# + {% set popContent = "Point de départ du workflow" %} + {{ dump(step) }} + #} + {% set popContent = _self.popoverContent(step) %} + {% else %} + {% set popContent = _self.popoverContent(step.previous) %} + {% endif %} + + {% if step.currentStep == 'initial' %} + + {% endif %} + {{ step.currentStep }} + + {% if not loop.last %} + → + {% endif %} + {% endfor %} ++{% endmacro %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_content.fr.txt.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_content.fr.txt.twig new file mode 100644 index 000000000..1e8469968 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_content.fr.txt.twig @@ -0,0 +1,13 @@ +{{ dest.label }}, + +Un suivi "{{ workflow.text }}" a atteint une nouvelle étape: {{ workflow.text }} +{%- if is_dest %} + +Vous êtes invités à valider cette étape au plus tôt. +{% endif %} + +Vous pouvez visualiser le workflow sur cette page: + +{{ absolute_url(path('chill_main_workflow_show', {'id': entity_workflow.id})) }} + +Cordialement, diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_title.fr.txt.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_title.fr.txt.twig new file mode 100644 index 000000000..4960b6138 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_title.fr.txt.twig @@ -0,0 +1,5 @@ +{%- if is_dest -%} +Un suivi {{ workflow.text }} demande votre attention +{%- else -%} +Un suivi {{ workflow.text }} a atteint une nouvelle étape: {{ place.text }} +{%- endif -%} diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php index ae2eb1f2c..9b6d89e83 100644 --- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php +++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php @@ -69,6 +69,15 @@ class UserMenuBuilder implements LocalMenuBuilderInterface 'counter' => $nbNotifications, ]); + $menu + ->addChild( + $this->translator->trans('workflow.My workflows'), + ['route' => 'chill_main_workflow_list_dest'] + ) + ->setExtras([ + 'order' => 700, + ]); + $menu ->addChild( 'Change password', diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php new file mode 100644 index 000000000..9542d3acb --- /dev/null +++ b/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php @@ -0,0 +1,70 @@ +manager = $manager; + $this->security = $security; + } + + protected function supports($attribute, $subject) + { + return $subject instanceof EntityWorkflow && in_array($attribute, self::getRoles(), true); + } + + protected function voteOnAttribute($attribute, $subject, TokenInterface $token) + { + switch ($attribute) { + case self::CREATE: + case self::SEE: + $handler = $this->manager->getHandler($subject); + + $entityAttribute = $handler->getRoleShow($subject); + + if (null === $entityAttribute) { + return true; + } + + return $this->security->isGranted($entityAttribute, $handler->getRelatedEntity($subject)); + + default: + throw new UnexpectedValueException("attribute {$attribute} not supported"); + } + } + + private static function getRoles(): array + { + return [ + self::SEE, + self::CREATE, + ]; + } +} diff --git a/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php b/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php new file mode 100644 index 000000000..9e1648753 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php @@ -0,0 +1,50 @@ +initial = $initial; + $this->chillLogger = $chillLogger; + } + + public function send(RawMessage $message, ?Envelope $envelope = null): void + { + if ($message instanceof Email) { + $message->subject($this->prefix . $message->getSubject()); + } + + $this->chillLogger->info('chill email sent', [ + 'to' => array_map(static function (Address $address) { + return $address->getAddress(); + }, $message->getTo()), + 'subject' => $message->getSubject(), + ]); + + $this->initial->send($message, $envelope); + } +} diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php new file mode 100644 index 000000000..c89101c5b --- /dev/null +++ b/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php @@ -0,0 +1,81 @@ +getCurrentStep()->setFinalizeAfter(true); + $entityWorkflow->setStep('final'); + + $this->assertTrue($entityWorkflow->isFinalize()); + } + + public function testIsFinalizeWith4Steps() + { + $entityWorkflow = new EntityWorkflow(); + + $this->assertFalse($entityWorkflow->isFinalize()); + + $entityWorkflow->setStep('two'); + + $this->assertFalse($entityWorkflow->isFinalize()); + + $entityWorkflow->setStep('previous_final'); + + $this->assertFalse($entityWorkflow->isFinalize()); + + $entityWorkflow->getCurrentStep()->setFinalizeAfter(true); + $entityWorkflow->setStep('final'); + + $this->assertTrue($entityWorkflow->isFinalize()); + } + + public function testIsFreeze() + { + $entityWorkflow = new EntityWorkflow(); + + $this->assertFalse($entityWorkflow->isFreeze()); + + $entityWorkflow->setStep('step_one'); + + $this->assertFalse($entityWorkflow->isFreeze()); + + $entityWorkflow->setStep('step_three'); + + $this->assertFalse($entityWorkflow->isFreeze()); + + $entityWorkflow->getCurrentStep()->setFreezeAfter(true); + + $this->assertFalse($entityWorkflow->isFreeze()); + + $entityWorkflow->setStep('freezed'); + + $this->assertTrue($entityWorkflow->isFreeze()); + + $entityWorkflow->setStep('after_freeze'); + + $this->assertTrue($entityWorkflow->isFreeze()); + + $this->assertTrue($entityWorkflow->getCurrentStep()->isFreezeAfter()); + } +} diff --git a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php new file mode 100644 index 000000000..2e97f77af --- /dev/null +++ b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php @@ -0,0 +1,39 @@ +handlers = $handlers; + $this->registry = $registry; + } + + public function getHandler(EntityWorkflow $entityWorkflow, array $options = []): EntityWorkflowHandlerInterface + { + foreach ($this->handlers as $handler) { + if ($handler->supports($entityWorkflow, $options)) { + return $handler; + } + } + + throw new HandlerNotFoundException(); + } + + public function getSupportedWorkflows(EntityWorkflow $entityWorkflow): array + { + return $this->registry->all($entityWorkflow); + } +} diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php new file mode 100644 index 000000000..fba36924a --- /dev/null +++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php @@ -0,0 +1,114 @@ +chillLogger = $chillLogger; + $this->security = $security; + $this->userRender = $userRender; + } + + public static function getSubscribedEvents(): array + { + return [ + 'workflow.transition' => 'onTransition', + 'workflow.guard' => [ + ['guardEntityWorkflow', 0], + ], + ]; + } + + public function guardEntityWorkflow(GuardEvent $event) + { + if (!$event->getSubject() instanceof EntityWorkflow) { + return; + } + + /** @var EntityWorkflow $entityWorkflow */ + $entityWorkflow = $event->getSubject(); + + if ($entityWorkflow->isFinalize()) { + $event->addTransitionBlocker( + new TransitionBlocker( + 'workflow.The workflow is finalized', + 'd6306280-7535-11ec-a40d-1f7bee26e2c0' + ) + ); + + return; + } + + if (!$entityWorkflow->getCurrentStep()->getDestUser()->contains($this->security->getUser())) { + if (!$event->getMarking()->has('initial')) { + $event->addTransitionBlocker(new TransitionBlocker( + 'workflow.You are not allowed to apply a transition on this workflow. Only those users are allowed: %users%', + 'f3eeb57c-7532-11ec-9495-e7942a2ac7bc', + [ + '%users%' => implode( + ', ', + $entityWorkflow->getCurrentStep()->getDestUser()->map(function (User $u) { + return $this->userRender->renderString($u, []); + })->toArray() + ), + ] + )); + } + } + } + + public function onTransition(Event $event) + { + if (!$event->getSubject() instanceof EntityWorkflow) { + return; + } + + /** @var EntityWorkflow $entityWorkflow */ + $entityWorkflow = $event->getSubject(); + $step = $entityWorkflow->getCurrentStep(); + + $step + ->setTransitionAfter($event->getTransition()->getName()) + ->setTransitionAt(new DateTimeImmutable('now')) + ->setTransitionBy($this->security->getUser()); + + $this->chillLogger->info('[workflow] apply transition on entityWorkflow', [ + 'relatedEntityClass' => $entityWorkflow->getRelatedEntityClass(), + 'relatedEntityId' => $entityWorkflow->getRelatedEntityId(), + 'transition' => $event->getTransition()->getName(), + 'by_user' => $this->security->getUser(), + 'entityWorkflow' => $entityWorkflow->getId(), + ]); + } +} diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php new file mode 100644 index 000000000..fd251bca6 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php @@ -0,0 +1,103 @@ +entityManager = $entityManager; + $this->engine = $engine; + $this->metadataExtractor = $metadataExtractor; + $this->registry = $registry; + $this->security = $security; + } + + public static function getSubscribedEvents(): array + { + return [ + 'workflow.completed' => 'onCompleted', + ]; + } + + public function onCompleted(Event $event): void + { + if (!$event->getSubject() instanceof EntityWorkflow) { + return; + } + + /** @var EntityWorkflow $entityWorkflow */ + $entityWorkflow = $event->getSubject(); + + $dests = array_merge( + $entityWorkflow->getSubscriberToStep()->toArray(), + $entityWorkflow->isFinalize() ? $entityWorkflow->getSubscriberToFinal()->toArray() : [], + $entityWorkflow->getCurrentStep()->getDestUser()->toArray() + ); + + $place = $this->metadataExtractor->buildArrayPresentationForPlace($entityWorkflow); + $workflow = $this->metadataExtractor->buildArrayPresentationForWorkflow( + $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName()) + ); + + $visited = []; + + foreach ($dests as $subscriber) { + if ( + $this->security->getUser() === $subscriber + || in_array($subscriber->getId(), $visited, true) + ) { + continue; + } + + $context = [ + 'entity_workflow' => $entityWorkflow, + 'dest' => $subscriber, + 'place' => $place, + 'workflow' => $workflow, + 'is_dest' => $entityWorkflow->getCurrentStep()->getDestUser()->contains($subscriber), + ]; + + $notification = new Notification(); + $notification + ->setRelatedEntityId($entityWorkflow->getId()) + ->setRelatedEntityClass(EntityWorkflow::class) + ->setTitle($this->engine->render('@ChillMain/Workflow/workflow_notification_on_transition_completed_title.fr.txt.twig', $context)) + ->setMessage($this->engine->render('@ChillMain/Workflow/workflow_notification_on_transition_completed_content.fr.txt.twig', $context)) + ->addAddressee($subscriber); + $this->entityManager->persist($notification); + + $visited[] = $subscriber->getId(); + } + } +} diff --git a/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php b/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php new file mode 100644 index 000000000..99ad5b88c --- /dev/null +++ b/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php @@ -0,0 +1,18 @@ +registry = $registry; + $this->translatableStringHelper = $translatableStringHelper; + } + + public function availableWorkflowFor(string $relatedEntityClass, ?int $relatedEntityId = 0): array + { + $blankEntityWorkflow = new EntityWorkflow(); + $blankEntityWorkflow + ->setRelatedEntityId($relatedEntityId) + ->setRelatedEntityClass($relatedEntityClass); + + // build the list of available workflows, and extract their names from metadata + $workflows = $this->registry->all($blankEntityWorkflow); + $workflowsList = []; + + foreach ($workflows as $workflow) { + $metadata = $workflow->getMetadataStore()->getWorkflowMetadata(); + $text = array_key_exists('label', $metadata) ? + $this->translatableStringHelper->localize($metadata['label']) : $workflow->getName(); + + $workflowsList[] = ['name' => $workflow->getName(), 'text' => $text]; + } + + return $workflowsList; + } + + public function buildArrayPresentationForPlace(EntityWorkflow $entityWorkflow): array + { + $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName()); + + $markingMetadata = $workflow->getMetadataStore()->getPlaceMetadata($entityWorkflow->getCurrentStep()->getCurrentStep()); + + $text = array_key_exists('label', $markingMetadata) ? + $this->translatableStringHelper->localize($markingMetadata['label']) : $entityWorkflow->getCurrentStep()->getCurrentStep(); + + return ['name' => $entityWorkflow->getCurrentStep()->getCurrentStep(), 'text' => $text]; + } + + public function buildArrayPresentationForWorkflow(WorkflowInterface $workflow): array + { + $metadata = $workflow->getMetadataStore()->getWorkflowMetadata(); + $text = array_key_exists('label', $metadata) ? + $this->translatableStringHelper->localize($metadata['label']) : $workflow->getName(); + + return ['name' => $workflow->getName(), 'text' => $text]; + } +} diff --git a/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php b/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php new file mode 100644 index 000000000..756d79fbf --- /dev/null +++ b/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php @@ -0,0 +1,45 @@ +entityWorkflowRepository->find($notification->getRelatedEntityId()); + + return [ + 'entity_workflow' => $entityWorkflow, + 'handler' => $this->entityWorkflowManager->getHandler($entityWorkflow), + ]; + } + + public function supports(Notification $notification, array $options = []): bool + { + return $notification->getRelatedEntityClass() === EntityWorkflow::class; + } +} diff --git a/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php b/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php new file mode 100644 index 000000000..310c0126b --- /dev/null +++ b/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php @@ -0,0 +1,35 @@ +getMetadataStore()->getWorkflowMetadata()['related_entity'] + as $relatedEntityClass) { + if ($subject->getRelatedEntityClass() === $relatedEntityClass) { + return true; + } + } + + return false; + } +} diff --git a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtension.php b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtension.php new file mode 100644 index 000000000..09dce0c6e --- /dev/null +++ b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtension.php @@ -0,0 +1,29 @@ + true, 'is_safe' => ['html']] + ), + ]; + } +} diff --git a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php new file mode 100644 index 000000000..0f034267f --- /dev/null +++ b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php @@ -0,0 +1,79 @@ +entityWorkflowManager = $entityWorkflowManager; + $this->registry = $registry; + $this->repository = $repository; + $this->metadataExtractor = $metadataExtractor; + $this->normalizer = $normalizer; + } + + public function listWorkflows(Environment $environment, string $relatedEntityClass, int $relatedEntityId, array $options = []): string + { + $blankEntityWorkflow = new EntityWorkflow(); + $blankEntityWorkflow + ->setRelatedEntityId($relatedEntityId) + ->setRelatedEntityClass($relatedEntityClass); + + $workflowsList = $this->metadataExtractor->availableWorkflowFor($relatedEntityClass, $relatedEntityId); + + // get the related entity already created + $entityWorkflows = []; + + foreach ($entityWorkflowsNaked = $this->repository->findBy( + ['relatedEntityClass' => $relatedEntityClass, 'relatedEntityId' => $relatedEntityId] + ) as $entityWorkflow) { + $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName()); + $entityWorkflows[] = [ + 'entity_workflow' => $entityWorkflow, + 'workflow' => $this->metadataExtractor->buildArrayPresentationForWorkflow($workflow), + 'handler' => $this->entityWorkflowManager->getHandler($entityWorkflow), + ]; + } + + return $environment->render('@ChillMain/Workflow/_extension_list_workflow_for.html.twig', [ + 'entity_workflows_json' => $this->normalizer->normalize($entityWorkflowsNaked, 'json', ['groups' => 'read']), + 'entity_workflows' => $entityWorkflows, + 'blank_workflow' => $blankEntityWorkflow, + 'workflows_availables' => $workflowsList, + ]); + } +} diff --git a/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreation.php b/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreation.php new file mode 100644 index 000000000..dc01f9019 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreation.php @@ -0,0 +1,35 @@ +entityWorkflowManager = $entityWorkflowManager; + } + + /** + * @param EntityWorkflow $value + * @param Constraint|EntityWorkflowCreation $constraint + */ + public function validate($value, Constraint $constraint) + { + if (!$value instanceof EntityWorkflow) { + throw new UnexpectedValueException($value, EntityWorkflow::class); + } + + if (!$constraint instanceof EntityWorkflowCreation) { + throw new UnexpectedTypeException($constraint, EntityWorkflowCreation::class); + } + + try { + $handler = $this->entityWorkflowManager->getHandler($value); + } catch (HandlerNotFoundException $e) { + $this->context->buildViolation($constraint->messageHandlerNotFound) + ->addViolation(); + + return; + } + + if (null === $handler->getRelatedEntity($value)) { + $this->context->buildViolation($constraint->messageEntityNotFound) + ->addViolation(); + } + + $workflows = $this->entityWorkflowManager->getSupportedWorkflows($value); + + $matched = array_filter($workflows, static function (WorkflowInterface $workflow) use ($value) { + return $workflow->getName() === $value->getWorkflowName(); + }); + + if (0 === count($matched)) { + $this->context->buildViolation($constraint->messageWorkflowNotAvailable) + ->addViolation(); + } + } +} diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml index 753cb855c..4f2e3648e 100644 --- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml +++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml @@ -116,7 +116,15 @@ components: type: number minItems: 2 maxItems: 2 - + UserJob: + type: object + properties: + id: + type: integer + label: + type: object + type: + type: string paths: /1.0/search.json: @@ -771,5 +779,16 @@ paths: description: "accepted" 403: description: "unauthorized" - + /1.0/main/user-job.json: + get: + tags: + - user + summary: Return a list of all user jobs + responses: + 200: + description: "ok" + content: + application/json: + schema: + $ref: '#/components/schemas/UserJob' diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js index 47aa32865..113d326c1 100644 --- a/src/Bundle/ChillMainBundle/chill.webpack.config.js +++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js @@ -52,6 +52,7 @@ module.exports = function(encore, entries) // Page entrypoints encore.addEntry('page_login', __dirname + '/Resources/public/page/login/index.js'); encore.addEntry('page_location', __dirname + '/Resources/public/page/location/index.js'); + encore.addEntry('page_workflow_show', __dirname + '/Resources/public/page/workflow-show/index.js'); buildCKEditor(encore); @@ -64,6 +65,9 @@ module.exports = function(encore, entries) encore.addEntry('mod_input_address', __dirname + '/Resources/public/vuejs/Address/mod_input_address_index.js'); encore.addEntry('mod_notification_toggle_read_status', __dirname + '/Resources/public/module/notification/toggle_read.js'); encore.addEntry('mod_pickentity_type', __dirname + '/Resources/public/module/pick-entity/index.js'); + encore.addEntry('mod_entity_workflow_subscribe', __dirname + '/Resources/public/module/entity-workflow-subscribe/index.js'); + encore.addEntry('mod_entity_workflow_pick', __dirname + '/Resources/public/module/entity-workflow-pick/index.js'); + encore.addEntry('mod_wopi_link', __dirname + '/Resources/public/module/wopi-link/index.js'); // Vue entrypoints encore.addEntry('vue_address', __dirname + '/Resources/public/vuejs/Address/index.js'); diff --git a/src/Bundle/ChillMainBundle/config/services.yaml b/src/Bundle/ChillMainBundle/config/services.yaml index adf38988e..dd2407d2b 100644 --- a/src/Bundle/ChillMainBundle/config/services.yaml +++ b/src/Bundle/ChillMainBundle/config/services.yaml @@ -26,6 +26,20 @@ services: tags: - { name: 'doctrine.event_subscriber' } + # workflow related + Chill\MainBundle\Workflow\: + resource: '../Workflow/' + autowire: true + autoconfigure: true + + Chill\MainBundle\Workflow\EntityWorkflowManager: + autoconfigure: true + autowire: true + arguments: + $handlers: !tagged_iterator chill_main.workflow_handler + + # other stuffes + chill.main.helper.translatable_string: class: Chill\MainBundle\Templating\TranslatableStringHelper diff --git a/src/Bundle/ChillMainBundle/config/services/form.yaml b/src/Bundle/ChillMainBundle/config/services/form.yaml index 0d0a17201..7efc9a69f 100644 --- a/src/Bundle/ChillMainBundle/config/services/form.yaml +++ b/src/Bundle/ChillMainBundle/config/services/form.yaml @@ -141,3 +141,5 @@ services: autoconfigure: true Chill\MainBundle\Form\Type\LocationFormType: ~ + + Chill\MainBundle\Form\WorkflowStepType: ~ diff --git a/src/Bundle/ChillMainBundle/config/services/mailer.yaml b/src/Bundle/ChillMainBundle/config/services/mailer.yaml new file mode 100644 index 000000000..d7305f4b1 --- /dev/null +++ b/src/Bundle/ChillMainBundle/config/services/mailer.yaml @@ -0,0 +1,10 @@ +services: + _defaults: + autowire: true + autoconfigure: true + + Chill\MainBundle\Service\Mailer\: + resource: '../../Service/Mailer' + + Chill\MainBundle\Service\Mailer\ChillMailer: + decorates: Symfony\Component\Mailer\MailerInterface diff --git a/src/Bundle/ChillMainBundle/config/services/security.yaml b/src/Bundle/ChillMainBundle/config/services/security.yaml index 30eed05c0..b884a92fc 100644 --- a/src/Bundle/ChillMainBundle/config/services/security.yaml +++ b/src/Bundle/ChillMainBundle/config/services/security.yaml @@ -26,6 +26,8 @@ services: Chill\MainBundle\Security\Authorization\NotificationVoter: ~ + Chill\MainBundle\Security\Authorization\EntityWorkflowVoter: ~ + Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface: '@Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory' chill.main.security.authorization.helper: diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220112123436.php b/src/Bundle/ChillMainBundle/migrations/Version20220112123436.php new file mode 100644 index 000000000..7358a3b4b --- /dev/null +++ b/src/Bundle/ChillMainBundle/migrations/Version20220112123436.php @@ -0,0 +1,72 @@ +addSql('ALTER TABLE chill_main_workflow_entity_subscriber_to_final DROP CONSTRAINT FK_C2CE504C7D99CE94'); + $this->addSql('ALTER TABLE chill_main_workflow_entity_subscriber_to_step DROP CONSTRAINT FK_ECB8F5417D99CE94'); + $this->addSql('ALTER TABLE chill_main_workflow_entity_step DROP CONSTRAINT FK_440AA6FEFB054143'); + $this->addSql('ALTER TABLE chill_main_entity_workflow_step_user DROP CONSTRAINT FK_A9F001FA7E6AF9D4'); + $this->addSql('DROP SEQUENCE chill_main_workflow_entity_id_seq CASCADE'); + $this->addSql('DROP SEQUENCE chill_main_workflow_entity_step_id_seq CASCADE'); + $this->addSql('DROP TABLE chill_main_workflow_entity'); + $this->addSql('DROP TABLE chill_main_workflow_entity_subscriber_to_final'); + $this->addSql('DROP TABLE chill_main_workflow_entity_subscriber_to_step'); + $this->addSql('DROP TABLE chill_main_workflow_entity_step'); + $this->addSql('DROP TABLE chill_main_entity_workflow_step_user'); + } + + public function getDescription(): string + { + return 'Create tables for workflow'; + } + + public function up(Schema $schema): void + { + $this->addSql('CREATE SEQUENCE chill_main_workflow_entity_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE SEQUENCE chill_main_workflow_entity_step_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE TABLE chill_main_workflow_entity (id INT NOT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, relatedEntityClass VARCHAR(255) NOT NULL, relatedEntityId INT NOT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, workflowName TEXT NOT NULL, createdBy_id INT DEFAULT NULL, updatedBy_id INT DEFAULT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_5F087D553174800F ON chill_main_workflow_entity (createdBy_id)'); + $this->addSql('CREATE INDEX IDX_5F087D5565FF1AEC ON chill_main_workflow_entity (updatedBy_id)'); + $this->addSql('COMMENT ON COLUMN chill_main_workflow_entity.createdAt IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_main_workflow_entity.updatedAt IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('CREATE TABLE chill_main_workflow_entity_subscriber_to_final (entityworkflow_id INT NOT NULL, user_id INT NOT NULL, PRIMARY KEY(entityworkflow_id, user_id))'); + $this->addSql('CREATE INDEX IDX_C2CE504C7D99CE94 ON chill_main_workflow_entity_subscriber_to_final (entityworkflow_id)'); + $this->addSql('CREATE INDEX IDX_C2CE504CA76ED395 ON chill_main_workflow_entity_subscriber_to_final (user_id)'); + $this->addSql('CREATE TABLE chill_main_workflow_entity_subscriber_to_step (entityworkflow_id INT NOT NULL, user_id INT NOT NULL, PRIMARY KEY(entityworkflow_id, user_id))'); + $this->addSql('CREATE INDEX IDX_ECB8F5417D99CE94 ON chill_main_workflow_entity_subscriber_to_step (entityworkflow_id)'); + $this->addSql('CREATE INDEX IDX_ECB8F541A76ED395 ON chill_main_workflow_entity_subscriber_to_step (user_id)'); + $this->addSql('CREATE TABLE chill_main_workflow_entity_step (id INT NOT NULL, currentStep TEXT NOT NULL, destEmail JSON NOT NULL, finalizeAfter BOOLEAN DEFAULT \'false\' NOT NULL, freezeAfter BOOLEAN DEFAULT \'false\' NOT NULL, transitionAfter TEXT DEFAULT NULL, transitionByEmail TEXT DEFAULT NULL, transitionAt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, entityWorkflow_id INT DEFAULT NULL, transitionBy_id INT DEFAULT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_440AA6FEFB054143 ON chill_main_workflow_entity_step (entityWorkflow_id)'); + $this->addSql('CREATE INDEX IDX_440AA6FE8829EF37 ON chill_main_workflow_entity_step (transitionBy_id)'); + $this->addSql('COMMENT ON COLUMN chill_main_workflow_entity_step.transitionAt IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('CREATE TABLE chill_main_entity_workflow_step_user (entityworkflowstep_id INT NOT NULL, user_id INT NOT NULL, PRIMARY KEY(entityworkflowstep_id, user_id))'); + $this->addSql('CREATE INDEX IDX_A9F001FA7E6AF9D4 ON chill_main_entity_workflow_step_user (entityworkflowstep_id)'); + $this->addSql('CREATE INDEX IDX_A9F001FAA76ED395 ON chill_main_entity_workflow_step_user (user_id)'); + $this->addSql('ALTER TABLE chill_main_workflow_entity ADD CONSTRAINT FK_5F087D553174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_workflow_entity ADD CONSTRAINT FK_5F087D5565FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_workflow_entity_subscriber_to_final ADD CONSTRAINT FK_C2CE504C7D99CE94 FOREIGN KEY (entityworkflow_id) REFERENCES chill_main_workflow_entity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_workflow_entity_subscriber_to_final ADD CONSTRAINT FK_C2CE504CA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_workflow_entity_subscriber_to_step ADD CONSTRAINT FK_ECB8F5417D99CE94 FOREIGN KEY (entityworkflow_id) REFERENCES chill_main_workflow_entity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_workflow_entity_subscriber_to_step ADD CONSTRAINT FK_ECB8F541A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_workflow_entity_step ADD CONSTRAINT FK_440AA6FEFB054143 FOREIGN KEY (entityWorkflow_id) REFERENCES chill_main_workflow_entity (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_workflow_entity_step ADD CONSTRAINT FK_440AA6FE8829EF37 FOREIGN KEY (transitionBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_entity_workflow_step_user ADD CONSTRAINT FK_A9F001FA7E6AF9D4 FOREIGN KEY (entityworkflowstep_id) REFERENCES chill_main_workflow_entity_step (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_entity_workflow_step_user ADD CONSTRAINT FK_A9F001FAA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + } +} diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220114132105.php b/src/Bundle/ChillMainBundle/migrations/Version20220114132105.php new file mode 100644 index 000000000..2e7d7a99c --- /dev/null +++ b/src/Bundle/ChillMainBundle/migrations/Version20220114132105.php @@ -0,0 +1,47 @@ +addSql('DROP SEQUENCE chill_main_workflow_entity_comment_id_seq CASCADE'); + $this->addSql('DROP TABLE chill_main_workflow_entity_comment'); + $this->addSql('ALTER TABLE chill_main_workflow_entity_step DROP comment'); + $this->addSql('ALTER TABLE chill_main_workflow_entity_step_user RENAME TO chill_main_entity_workflow_step_user'); + } + + public function getDescription(): string + { + return 'Add comment to entity workflow'; + } + + public function up(Schema $schema): void + { + $this->addSql('CREATE SEQUENCE chill_main_workflow_entity_comment_id_seq INCREMENT BY 1 MINVALUE 1 START 1;'); + $this->addSql('CREATE TABLE chill_main_workflow_entity_comment (id INT NOT NULL, comment TEXT NOT NULL DEFAULT \'\', createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, createdBy_id INT DEFAULT NULL, entityWorkflow_id INT DEFAULT NULL, updatedBy_id INT DEFAULT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_2655252F3174800F ON chill_main_workflow_entity_comment (createdBy_id)'); + $this->addSql('CREATE INDEX IDX_2655252FFB054143 ON chill_main_workflow_entity_comment (entityWorkflow_id)'); + $this->addSql('CREATE INDEX IDX_2655252F65FF1AEC ON chill_main_workflow_entity_comment (updatedBy_id)'); + $this->addSql('COMMENT ON COLUMN chill_main_workflow_entity_comment.createdAt IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_main_workflow_entity_comment.updatedAt IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('ALTER TABLE chill_main_workflow_entity_comment ADD CONSTRAINT FK_2655252F3174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_workflow_entity_comment ADD CONSTRAINT FK_2655252FFB054143 FOREIGN KEY (entityWorkflow_id) REFERENCES chill_main_workflow_entity (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_workflow_entity_comment ADD CONSTRAINT FK_2655252F65FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_workflow_entity_step ADD comment TEXT NOT NULL DEFAULT \'\''); + $this->addSql('ALTER TABLE chill_main_entity_workflow_step_user RENAME TO chill_main_workflow_entity_step_user'); + } +} diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220114165950.php b/src/Bundle/ChillMainBundle/migrations/Version20220114165950.php new file mode 100644 index 000000000..5489d3f1c --- /dev/null +++ b/src/Bundle/ChillMainBundle/migrations/Version20220114165950.php @@ -0,0 +1,37 @@ +addSql('ALTER TABLE chill_main_workflow_entity_step ALTER transitionat SET NOT NULL'); + } + + public function getDescription(): string + { + return 'remove not null on transition at'; + } + + public function up(Schema $schema): void + { + $this->addSql('ALTER TABLE chill_main_workflow_entity_step ALTER transitionat DROP NOT NULL'); + $this->addSql('ALTER TABLE chill_main_workflow_entity_step ALTER transitionat SET DEFAULT NULL'); + } +} diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220120155303.php b/src/Bundle/ChillMainBundle/migrations/Version20220120155303.php new file mode 100644 index 000000000..617d24b27 --- /dev/null +++ b/src/Bundle/ChillMainBundle/migrations/Version20220120155303.php @@ -0,0 +1,33 @@ +addSql('DROP INDEX chill_main_notification_related_entity_idx'); + } + + public function getDescription(): string + { + return 'Create index for counting notifications'; + } + + public function up(Schema $schema): void + { + $this->addSql('CREATE INDEX chill_main_notification_related_entity_idx ON chill_main_notification (relatedentityclass, relatedentityid DESC)'); + } +} diff --git a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml index 4f25b46da..7a5b328f4 100644 --- a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml +++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml @@ -13,3 +13,19 @@ notification: few {# notifications} other {# notifications} } + + counter total notifications: >- + {total, plural, + =0 {Aucune notification} + one {# notification} + few {# notifications} + other {# notifications} + } + + counter unread notifications: >- + {unread, plural, + =0 {Aucune non-lue} + one {# non-lue} + few {# non-lues} + other {# non-lues} + } diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml index af0dc77d7..5c214367c 100644 --- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml @@ -36,8 +36,9 @@ Choose an user: Choisir un utilisateur "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?": "Vous allez quitter la page alors que des données n'ont pas été enregistrées. Êtes vous sûr de vouloir partir ?" No value: Aucune information Last updated by: Dernière mise à jour par -Last updated on: Dernière mise à jour le on: "le " +Last updated on: Dernière mise à jour le +by_user: "par " Edit: Modifier Update: Mettre à jour @@ -58,6 +59,7 @@ comment: commentaire Comment: Commentaire Pinned comment: Commentaire épinglé Any comment: Aucun commentaire +Read more: Lire la suite # comment embeddable No comment associated: Aucun commentaire @@ -353,6 +355,43 @@ For: Pour Created for: Créé pour Created by: Créé par + +# Workflows 💊 +Workflow: Workflow — chemin de décision +Workflow n°%id%: 'Workflow (n°%id%)' +workflow_: Workflow +target: ' (cible)' +Decision: Décision +Join a comment: Laisser un commentaire +Follow workflow: Suivre la décision +Workflow history: Historique de la décision + +workflow: + Created by: Créé par + Transition: Prochaine étape + dest for next steps: Utilisateurs qui valideront la prochaine étape + Freeze: Geler + The associated element will be freezed: L'élément associé sera gelé et ne pourra plus être modifié après cette décision. + Finalize: Étape finale + The workflow will be finalized: Le suivi est clôturé lors de cette décision. + No transitions: Aucune transition + Comment added: Commentaire ajouté + This workflow is finalized: Ce suivi est finalisé. + You are not allowed to apply a transition on this workflow: Vous n'êtes pas autorisé à appliquer une décision pour ce suivi + Only those users are allowed: Seuls ces utilisateurs sont autorisés + My workflows: Mes workflows + No workflow: Aucun workflow + Evaluation (n°%eval%): "Évaluation (n°%eval%)" + Document (n°%doc%): "Document (n°%doc%)" + Work (n°%w%): "Action d'accompagnement (n°%w%)" + subscribed: Souscrit + dest: Destinataire de l'étape finale + you subscribed to all steps: Vous recevrez une notification à chaque étape + you subscribed to final step: Vous recevrez une notification à l'étape finale + +Subscribe final: Recevoir une notification à l'étape finale +Subscribe all steps: Recevoir une notification à chaque étape + notification: Notification: Notification My own notifications: Mes notifications diff --git a/src/Bundle/ChillMainBundle/translations/validators.fr.yml b/src/Bundle/ChillMainBundle/translations/validators.fr.yml index 23eccd91d..7bd943f25 100644 --- a/src/Bundle/ChillMainBundle/translations/validators.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/validators.fr.yml @@ -23,3 +23,8 @@ address: street1-should-be-set: Une ligne d'adresse doit être présente date-should-be-set: La date de début de validité doit être présente postcode-should-be-set: Le code postal doit être renseigné + +notification: + At least one addressee: Indiquez au moins un destinataire + Title must be defined: Un titre doit être indiqué + diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Workflow/WorkflowEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php similarity index 53% rename from src/Bundle/ChillPersonBundle/AccompanyingPeriod/Workflow/WorkflowEventSubscriber.php rename to src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php index 3b7626903..590874ab4 100644 --- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Workflow/WorkflowEventSubscriber.php +++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php @@ -9,19 +9,20 @@ declare(strict_types=1); -namespace Chill\PersonBundle\AccompanyingPeriod\Workflow; +namespace Chill\PersonBundle\AccompanyingPeriod\Events; use Chill\MainBundle\Entity\Notification; use Chill\MainBundle\Entity\User; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Doctrine\ORM\EntityManagerInterface; +use Doctrine\Persistence\Event\LifecycleEventArgs; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Security\Core\Security; use Symfony\Component\Templating\EngineInterface; use Symfony\Component\Workflow\Event\EnteredEvent; use Symfony\Contracts\Translation\TranslatorInterface; -class WorkflowEventSubscriber implements EventSubscriberInterface +class UserRefEventSubscriber implements EventSubscriberInterface { private EntityManagerInterface $em; @@ -55,23 +56,46 @@ class WorkflowEventSubscriber implements EventSubscriberInterface } } + public function postUpdate(AccompanyingPeriod $period, LifecycleEventArgs $args): void + { + if ($period->hasPreviousUser() + && $period->getUser() !== $this->security->getUser() + && $period->getStep() !== AccompanyingPeriod::STEP_DRAFT + ) { + $this->generateNotificationToUser($period); + } + + // we are just out of a flush operation. Launch a new one + $this->em->flush(); + } + + private function generateNotificationToUser(AccompanyingPeriod $period) + { + $notification = new Notification(); + + $urgentStatement = + $period->isEmergency() ? strtoupper($this->translator->trans('accompanying_period.emergency')) . ' ' : ''; + + $notification + ->setRelatedEntityId($period->getId()) + ->setRelatedEntityClass(AccompanyingPeriod::class) + ->setTitle($urgentStatement . $this->translator->trans('period_notification.period_designated_subject')) + ->setMessage($this->engine->render( + '@ChillPerson/Notification/accompanying_course_designation.md.twig', + [ + 'accompanyingCourse' => $period, + ] + )) + ->addAddressee($period->getUser()); + + $this->em->persist($notification); + } + private function onPeriodConfirmed(AccompanyingPeriod $period) { if ($period->getUser() instanceof User && $period->getUser() !== $this->security->getUser()) { - $notification = new Notification(); - $notification - ->setRelatedEntityId($period->getId()) - ->setRelatedEntityClass(AccompanyingPeriod::class) - ->setTitle($this->translator->trans('period_notification.period_designated_subject')) - ->setMessage($this->engine->render( - '@ChillPerson/Notification/accompanying_course_designation.md.twig', - [ - 'accompanyingCourse' => $period, - ] - )) - ->addAddressee($period->getUser()); - $this->em->persist($notification); + $this->generateNotificationToUser($period); } } } diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php index 9abd85f64..7ae5c5f73 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php @@ -275,4 +275,34 @@ class AccompanyingCourseController extends Controller 'accompanying_period_id' => $period->getId(), ]); } + + /** + * @Route("/{_locale}/parcours/{accompanying_period_id}/open", name="chill_person_accompanying_course_reopen") + * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"}) + */ + public function reOpenAction(AccompanyingPeriod $accompanyingCourse, Request $request): Response + { + $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $accompanyingCourse); + + if (null === $accompanyingCourse) { + throw $this->createNotFoundException('period not found'); + } + + $form = $this->createFormBuilder([])->getForm(); + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + $accompanyingCourse->reOpen(); + $this->getDoctrine()->getManager()->flush(); + + return $this->redirectToRoute('chill_person_accompanying_course_index', [ + 'accompanying_period_id' => $accompanyingCourse->getId(), + ]); + } + + return $this->render('@ChillPerson/AccompanyingCourse/re_open.html.twig', [ + 'form' => $form->createView(), + 'accompanyingCourse' => $accompanyingCourse, + ]); + } } diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php new file mode 100644 index 000000000..c74113a05 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php @@ -0,0 +1,149 @@ +security = $security; + $this->householdCompositionRepository = $householdCompositionRepository; + $this->paginatorFactory = $paginatorFactory; + $this->formFactory = $formFactory; + $this->entityManager = $entityManager; + $this->translator = $translator; + $this->engine = $engine; + $this->urlGenerator = $urlGenerator; + } + + /** + * @Route("/{_locale}/person/household/{id}/composition/index", name="chill_person_household_composition_index") + */ + public function index(Household $household, Request $request): Response + { + if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) { + throw new AccessDeniedException('not allowed to edit an household'); + } + + $count = $this->householdCompositionRepository->countByHousehold($household); + $paginator = $this->paginatorFactory->create($count); + $compositions = $this->householdCompositionRepository->findByHousehold( + $household, + ['startDate' => 'DESC', 'id' => 'DESC'], + $paginator->getItemsPerPage(), + $paginator->getCurrentPageFirstItemNumber() + ); + + if ($this->security->isGranted(HouseholdVoter::EDIT, $household)) { + $isEdit = $request->query->has('edit'); + + if ($isEdit) { + $householdCompositions = $household->getCompositions()->filter(static function (HouseholdComposition $composition) use ($request) { + return $composition->getId() === $request->query->getInt('edit'); + }); + + if ($householdCompositions->count() !== 1) { + throw new BadRequestHttpException('could not find the composition with this id associated to the household'); + } + $householdComposition = $householdCompositions->first(); + } else { + $householdComposition = (new HouseholdComposition()) + ->setStartDate(new DateTimeImmutable()); + } + $form = $this->formFactory->create(HouseholdCompositionType::class, $householdComposition); + + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + if (!$isEdit) { + $this->entityManager->persist($householdComposition); + $household->addComposition($householdComposition); + } + + $this->entityManager->flush(); + + $request->getSession()->getFlashBag()->add( + 'success', + $this->translator->trans('household_composition.Composition added') + ); + + return new RedirectResponse( + $this->urlGenerator->generate('chill_person_household_composition_index', [ + 'id' => $household->getId(), + ]) + ); + } + + if ($form->isSubmitted() && !$form->isValid()) { + $request->getSession()->getFlashBag()->add( + 'warning', + $this->translator->trans('This form contains errors') + ); + } + } + + return new Response($this->engine->render( + '@ChillPerson/HouseholdComposition/index.html.twig', + [ + 'household' => $household, + 'compositions' => $compositions, + 'form' => isset($form) ? $form->createView() : null, + 'isPosted' => isset($form) ? $form->isSubmitted() : false, + 'editId' => $request->query->getInt('edit', -1), + ] + )); + } +} diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php new file mode 100644 index 000000000..418d04531 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php @@ -0,0 +1,36 @@ +andWhere($query->expr()->eq('e.active', "'TRUE'")); + + break; + + default: + throw new UnexpectedValueException('unexepcted action: ' . $action); + } + } +} diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php new file mode 100644 index 000000000..b1d306ef8 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php @@ -0,0 +1,48 @@ + 'Couple avec enfant(s)'], + ['fr' => 'Couple sans enfant'], + ['fr' => 'Mère seule'], + ['fr' => 'Père seul'], + ['fr' => 'Mère isolée'], + ['fr' => 'Père isolé'], + ['fr' => 'Homme seul'], + ['fr' => 'Femme seule'], + ]; + + public static function getGroups(): array + { + return ['composition-type']; + } + + public function load(ObjectManager $manager) + { + foreach (self::TYPES as $type) { + $manager->persist( + (new HouseholdCompositionType()) + ->setLabel($type) + ); + } + + $manager->flush(); + } +} diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php index 5982fcebe..01df460e3 100644 --- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php +++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php @@ -13,6 +13,7 @@ namespace Chill\PersonBundle\DependencyInjection; use Chill\MainBundle\DependencyInjection\MissingBundleException; use Chill\MainBundle\Security\Authorization\ChillExportVoter; +use Chill\PersonBundle\Controller\HouseholdCompositionTypeApiController; use Chill\PersonBundle\Doctrine\DQL\AddressPart; use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodResourceVoter; use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter; @@ -760,6 +761,21 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac ], ], ], + [ + 'class' => \Chill\PersonBundle\Entity\Household\HouseholdCompositionType::class, + 'name' => 'household_composition', + 'base_path' => '/api/1.0/person/houehold/composition/type', + 'base_role' => 'ROLE_USER', + 'controller' => HouseholdCompositionTypeApiController::class, + 'actions' => [ + '_index' => [ + 'methods' => [ + Request::METHOD_GET => true, + Request::METHOD_HEAD => true, + ], + ], + ], + ], ], ]); } diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php index 06e4f0c8b..12291672b 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php @@ -20,6 +20,7 @@ use Chill\MainBundle\Entity\HasScopesInterface; use Chill\MainBundle\Entity\Location; use Chill\MainBundle\Entity\Scope; use Chill\MainBundle\Entity\User; +use Chill\MainBundle\Entity\UserJob; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork; use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive; use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment; @@ -198,6 +199,15 @@ class AccompanyingPeriod implements */ private $intensity = self::INTENSITY_OCCASIONAL; + /** + * @ORM\ManyToOne( + * targetEntity=UserJob::class + * ) + * @Groups({"read", "write"}) + * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED}) + */ + private ?UserJob $job = null; + /** * @var DateTime * @@ -327,6 +337,13 @@ class AccompanyingPeriod implements */ private ?User $user = null; + /** + * Temporary field, which is filled when the user is changed. + * + * Used internally for listener when user change + */ + private ?User $userPrevious = null; + /** * @ORM\OneToMany( * targetEntity=AccompanyingPeriodWork::class, @@ -612,7 +629,7 @@ class AccompanyingPeriod implements return [[self::STEP_DRAFT, self::STEP_CONFIRMED]]; } - throw new LogicException('no validation group permitted with this step'); + throw new LogicException('no validation group permitted with this step: '.$this->getStep()); } public function getId(): ?int @@ -625,6 +642,11 @@ class AccompanyingPeriod implements return $this->intensity; } + public function getJob(): ?UserJob + { + return $this->job; + } + /** * Get the location, taking precedence into account. * @@ -755,6 +777,11 @@ class AccompanyingPeriod implements return $this->pinnedComment; } + public function getPreviousUser(): ?User + { + return $this->userPrevious; + } + /** * @return Collection|SocialAction[] All the descendant social actions of all * the descendants of the entity @@ -868,6 +895,11 @@ class AccompanyingPeriod implements return $this->works; } + public function hasPreviousUser(): bool + { + return null !== $this->userPrevious; + } + /** * Returns true if the closing date is after the opening date. */ @@ -981,6 +1013,7 @@ class AccompanyingPeriod implements { $this->setClosingDate(null); $this->setClosingMotive(null); + $this->setStep(AccompanyingPeriod::STEP_CONFIRMED); } /** @@ -1058,6 +1091,13 @@ class AccompanyingPeriod implements return $this; } + public function setJob(?UserJob $job): self + { + $this->job = $job; + + return $this; + } + /** * Set openingDate. * @@ -1099,6 +1139,9 @@ class AccompanyingPeriod implements } if ($comment instanceof Comment) { + if (null !== $this->pinnedComment) { + $this->addComment($this->pinnedComment); + } $this->addComment($comment); } @@ -1172,6 +1215,10 @@ class AccompanyingPeriod implements public function setUser(User $user): self { + if ($this->user !== $user) { + $this->userPrevious = $this->user; + } + $this->user = $user; return $this; diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php index 865526250..ef718bc2e 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php +++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Entity\Household; +use ArrayIterator; use Chill\MainBundle\Entity\Address; use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable; use Chill\PersonBundle\Validator\Constraints\Household\MaxHolder; @@ -23,8 +24,8 @@ use Doctrine\Common\Collections\Criteria; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Serializer\Annotation as Serializer; use Symfony\Component\Validator\Constraints as Assert; -use Symfony\Component\Validator\Context\ExecutionContextInterface; +use Symfony\Component\Validator\Context\ExecutionContextInterface; use function count; /** @@ -56,6 +57,18 @@ class Household */ private CommentEmbeddable $commentMembers; + /** + * @ORM\OneToMany( + * targetEntity=HouseholdComposition::class, + * mappedBy="household", + * orphanRemoval=true, + * cascade={"persist"} + * ) + * @ORM\OrderBy({"startDate": "DESC"}) + * @Assert\Valid(traverse=true, groups={"household_composition"}) + */ + private Collection $compositions; + /** * @ORM\Id * @ORM\GeneratedValue @@ -90,6 +103,7 @@ class Household $this->addresses = new ArrayCollection(); $this->members = new ArrayCollection(); $this->commentMembers = new CommentEmbeddable(); + $this->compositions = new ArrayCollection(); } /** @@ -108,6 +122,18 @@ class Household return $this; } + public function addComposition(HouseholdComposition $composition): self + { + if (!$this->compositions->contains($composition)) { + $composition->setHousehold($this); + $this->compositions[] = $composition; + } + + $this->householdCompositionConsistency(); + + return $this; + } + public function addMember(HouseholdMember $member): self { if (!$this->members->contains($member)) { @@ -136,6 +162,14 @@ class Household return $this->commentMembers; } + /** + * @return ArrayCollection|Collection|HouseholdComposition[] + */ + public function getCompositions(): Collection + { + return $this->compositions; + } + /** * @Serializer\Groups({"read", "docgen:read"}) * @Serializer\SerializedName("current_address") @@ -157,6 +191,31 @@ class Household return null; } + public function getCurrentComposition(?DateTimeImmutable $at = null): ?HouseholdComposition + { + $at ??= new DateTimeImmutable('today'); + $criteria = new Criteria(); + $expr = Criteria::expr(); + + $criteria->where( + $expr->andX( + $expr->orX( + $expr->isNull('endDate'), + $expr->gt('endDate', $at) + ), + $expr->lte('startDate', $at) + ) + ); + + $compositions = $this->compositions->matching($criteria); + + if ($compositions->count() > 0) { + return $compositions->first(); + } + + return null; + } + /** * @Serializer\Groups({"docgen:read"}) */ @@ -369,11 +428,54 @@ class Household return $this->waitingForBirthDate; } + /** + * @internal + */ + public function householdCompositionConsistency(): void + { + $compositionOrdered = $this->compositions->toArray(); + + usort( + $compositionOrdered, + static function (HouseholdComposition $a, HouseholdComposition $b) { + return $a->getStartDate() <=> $b->getStartDate(); + } + ); + + $iterator = new ArrayIterator($compositionOrdered); + $iterator->rewind(); + + /** @var ?HouseholdComposition $previous */ + $previous = null; + + do { + /** @var ?HouseholdComposition $current */ + $current = $iterator->current(); + + if (null !== $previous) { + if (null === $previous->getEndDate() || $previous->getEndDate() > $current->getStartDate()) { + $previous->setEndDate($current->getStartDate()); + } + } + $previous = $current; + $iterator->next(); + } while ($iterator->valid()); + } + public function removeAddress(Address $address) { $this->addresses->removeElement($address); } + public function removeComposition(HouseholdComposition $composition): self + { + if ($this->compositions->removeElement($composition)) { + $composition->setHousehold(null); + } + + return $this; + } + public function removeMember(HouseholdMember $member): self { if ($this->members->removeElement($member)) { diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php new file mode 100644 index 000000000..a381fafd8 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php @@ -0,0 +1,171 @@ +comment = new CommentEmbeddable(); + } + + public function getComment(): CommentEmbeddable + { + return $this->comment; + } + + public function getEndDate(): ?DateTimeImmutable + { + return $this->endDate; + } + + public function getHousehold(): ?Household + { + return $this->household; + } + + public function getHouseholdCompositionType(): ?HouseholdCompositionType + { + return $this->householdCompositionType; + } + + public function getId(): ?int + { + return $this->id; + } + + public function getNumberOfChildren(): ?int + { + return $this->numberOfChildren; + } + + public function getStartDate(): ?DateTimeImmutable + { + return $this->startDate; + } + + public function setComment(CommentEmbeddable $comment): HouseholdComposition + { + $this->comment = $comment; + + return $this; + } + + public function setEndDate(?DateTimeImmutable $endDate): HouseholdComposition + { + $this->endDate = $endDate; + + if (null !== $this->household) { + $this->household->householdCompositionConsistency(); + } + + return $this; + } + + public function setHousehold(?Household $household): HouseholdComposition + { + $this->household = $household; + + return $this; + } + + public function setHouseholdCompositionType(?HouseholdCompositionType $householdCompositionType): HouseholdComposition + { + $this->householdCompositionType = $householdCompositionType; + + return $this; + } + + public function setNumberOfChildren(?int $numberOfChildren): HouseholdComposition + { + $this->numberOfChildren = $numberOfChildren; + + return $this; + } + + public function setStartDate(?DateTimeImmutable $startDate): HouseholdComposition + { + $this->startDate = $startDate; + + if (null !== $this->household) { + $this->household->householdCompositionConsistency(); + } + + return $this; + } +} diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php new file mode 100644 index 000000000..03d1a401a --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php @@ -0,0 +1,76 @@ +id; + } + + public function getLabel(): array + { + return $this->label; + } + + public function isActive(): bool + { + return $this->active; + } + + public function setActive(bool $active): HouseholdCompositionType + { + $this->active = $active; + + return $this; + } + + public function setLabel(array $label): HouseholdCompositionType + { + $this->label = $label; + + return $this; + } +} diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php index 91e430a2f..c588b70a3 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person.php @@ -687,7 +687,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI $result = new ArrayCollection(); if ($asParticipantOpen) { - foreach ($this->getOpenedParticipations() + foreach ($this->getAccompanyingPeriodParticipations() ->map(fn (AccompanyingPeriodParticipation $app) => $app->getAccompanyingPeriod()) as $period ) { @@ -1142,7 +1142,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI ->where( $expr->eq('shareHousehold', true) ) - ->orderBy(['startDate' => Criteria::DESC]); + ->orderBy(['startDate' => Criteria::DESC, 'id' => Criteria::DESC]); return $this->getHouseholdParticipations() ->matching($criteria); diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php index 3d409129b..a33858c02 100644 --- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php +++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php @@ -22,6 +22,8 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\EmailType; +use Symfony\Component\Form\Extension\Core\Type\TelType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -52,11 +54,20 @@ final class CreationPersonType extends AbstractType $builder ->add('firstName') ->add('lastName') + ->add('gender', GenderType::class, [ + 'required' => true, 'placeholder' => null, + ]) ->add('birthdate', ChillDateType::class, [ 'required' => false, ]) - ->add('gender', GenderType::class, [ - 'required' => true, 'placeholder' => null, + ->add('phonenumber', TelType::class, [ + 'required' => false, + ]) + ->add('mobilenumber', TelType::class, [ + 'required' => false, + ]) + ->add('email', EmailType::class, [ + 'required' => false, ]); if ($this->askCenters) { diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php new file mode 100644 index 000000000..0348b0c39 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php @@ -0,0 +1,60 @@ +householdCompositionTypeRepository = $householdCompositionTypeRepository; + $this->translatableStringHelper = $translatableStringHelper; + } + + public function buildForm(FormBuilderInterface $builder, array $options) + { + $types = $this->householdCompositionTypeRepository->findAllActive(); + + $builder + ->add('householdCompositionType', EntityType::class, [ + 'class' => \Chill\PersonBundle\Entity\Household\HouseholdCompositionType::class, + 'choices' => $types, + 'choice_label' => function (\Chill\PersonBundle\Entity\Household\HouseholdCompositionType $type) { + return $this->translatableStringHelper->localize($type->getLabel()); + }, + 'label' => 'household_composition.Household composition', + ]) + ->add('startDate', ChillDateType::class, [ + 'required' => true, + 'input' => 'datetime_immutable', + ]) + ->add('numberOfChildren', IntegerType::class, [ + 'required' => true, + 'label' => 'household_composition.numberOfChildren', + ]) + ->add('comment', CommentType::class, [ + 'required' => false, + ]); + } +} diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php index 4d855a980..adc97a4ac 100644 --- a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php +++ b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php @@ -29,6 +29,8 @@ class MembersEditor { public const VALIDATION_GROUP_AFFECTED = 'household_memberships'; + public const VALIDATION_GROUP_COMPOSITION = 'household_composition'; + public const VALIDATION_GROUP_CREATED = 'household_memberships_created'; private ?Household $household = null; @@ -77,6 +79,15 @@ class MembersEditor $this->oldMembershipsHashes[] = spl_object_hash($participation); } } + + foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) { + if ($participation->getHousehold() === $this->household + && $participation->getEndDate() === null || $participation->getEndDate() > $membership->getStartDate() + && $participation->getStartDate() <= $membership->getStartDate() + ) { + $participation->setEndDate($membership->getStartDate()); + } + } } $this->membershipsAffected[] = $membership; @@ -129,7 +140,7 @@ class MembersEditor { if ($this->hasHousehold()) { $list = $this->validator - ->validate($this->getHousehold(), null, [self::VALIDATION_GROUP_AFFECTED]); + ->validate($this->getHousehold(), null, [self::VALIDATION_GROUP_AFFECTED, self::VALIDATION_GROUP_COMPOSITION]); } else { $list = new ConstraintViolationList(); } diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php index 60455b201..0efbf9ac3 100644 --- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php @@ -82,6 +82,15 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface $workflow = $this->registry->get($period, 'accompanying_period_lifecycle'); + if (null !== $period->getClosingDate()) { + $menu->addChild($this->translator->trans('Re-open accompanying course'), [ + 'route' => 'chill_person_accompanying_course_reopen', + 'routeParameters' => [ + 'accompanying_period_id' => $period->getId(), + ], ]) + ->setExtras(['order' => 99998]); + } + if ($workflow->can($period, 'close')) { $menu->addChild($this->translator->trans('Close Accompanying Course'), [ 'route' => 'chill_person_accompanying_course_close', diff --git a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php index a144bf65b..a4d3f8d03 100644 --- a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php @@ -29,6 +29,7 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface public function buildMenu($menuId, MenuItem $menu, array $parameters): void { + /** @var \Chill\PersonBundle\Entity\Household\Household $household */ $household = $parameters['household']; $menu->addChild($this->translator->trans('household.Household summary'), [ @@ -38,6 +39,20 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface ], ]) ->setExtras(['order' => 10]); + $menu->addChild($this->translator->trans('household.Relationship'), [ + 'route' => 'chill_person_household_relationship', + 'routeParameters' => [ + 'household_id' => $household->getId(), + ], ]) + ->setExtras(['order' => 15]); + + $menu->addChild($this->translator->trans('household_composition.Compositions'), [ + 'route' => 'chill_person_household_composition_index', + 'routeParameters' => [ + 'id' => $household->getId(), + ], ]) + ->setExtras(['order' => 17]); + $menu->addChild($this->translator->trans('household.Accompanying period'), [ 'route' => 'chill_person_household_accompanying_period', 'routeParameters' => [ @@ -51,13 +66,6 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface 'household_id' => $household->getId(), ], ]) ->setExtras(['order' => 30]); - - $menu->addChild($this->translator->trans('household.Relationship'), [ - 'route' => 'chill_person_household_relationship', - 'routeParameters' => [ - 'household_id' => $household->getId(), - ], ]) - ->setExtras(['order' => 15]); } public static function getMenuIds(): array diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php new file mode 100644 index 000000000..06634b3cc --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php @@ -0,0 +1,61 @@ +repository = $entityManager->getRepository(AccompanyingPeriodWorkEvaluation::class); + } + + public function find($id): ?AccompanyingPeriodWorkEvaluation + { + return $this->repository->find($id); + } + + /** + * @return array|AccompanyingPeriodWorkEvaluation[] + */ + public function findAll(): array + { + return $this->repository->findAll(); + } + + /** + * @param null|mixed $limit + * @param null|mixed $offset + * + * @return array|AccompanyingPeriodWorkEvaluation[] + */ + public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array + { + return $this->repository->findBy($criteria, $orderBy, $limit, $offset); + } + + public function findOneBy(array $criteria): ?AccompanyingPeriodWorkEvaluation + { + return $this->findOneBy($criteria); + } + + public function getClassName() + { + return AccompanyingPeriodWorkEvaluation::class; + } +} diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php index 0649dae1c..dc5e8f5d3 100644 --- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php @@ -39,7 +39,7 @@ final class HouseholdACLAwareRepository implements HouseholdACLAwareRepositoryIn { $centers = $this->authorizationHelper->getReachableCenters( $this->security->getUser(), - HouseholdVoter::SHOW + HouseholdVoter::SEE ); if ([] === $centers) { diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php new file mode 100644 index 000000000..23f79c7f5 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php @@ -0,0 +1,75 @@ +repository = $entityManager->getRepository(HouseholdComposition::class); + } + + public function countByHousehold(Household $household): int + { + return $this->repository->count(['household' => $household]); + } + + public function find($id): ?HouseholdComposition + { + return $this->repository->find($id); + } + + /** + * @return array|HouseholdComposition[] + */ + public function findAll(): array + { + return $this->repository->findAll(); + } + + /** + * @param int $limit + * @param int $offset + * + * @return array|object[]|HouseholdComposition[] + */ + public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array + { + return $this->repository->findBy($criteria, $orderBy, $limit, $offset); + } + + /** + * @return array|HouseholdComposition[]|object[] + */ + public function findByHousehold(Household $household, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array + { + return $this->findBy(['household' => $household], $orderBy, $limit, $offset); + } + + public function findOneBy(array $criteria): ?HouseholdComposition + { + return $this->repository->findOneBy($criteria); + } + + public function getClassName(): string + { + return HouseholdComposition::class; + } +} diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php new file mode 100644 index 000000000..45931b4da --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php @@ -0,0 +1,69 @@ +repository = $entityManager->getRepository(HouseholdCompositionType::class); + } + + public function find($id): ?HouseholdCompositionType + { + return $this->repository->find($id); + } + + /** + * @return array|HouseholdCompositionType[]|object[] + */ + public function findAll(): array + { + return $this->repository->findAll(); + } + + /** + * @return array|HouseholdCompositionType[] + */ + public function findAllActive(): array + { + return $this->findBy(['active' => true]); + } + + /** + * @param $limit + * @param $offset + * + * @return array|HouseholdCompositionType[]|object[] + */ + public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array + { + return $this->repository->findBy($criteria, $orderBy, $limit, $offset); + } + + public function findOneBy(array $criteria): ?HouseholdCompositionType + { + return $this->repository->findOneBy($criteria); + } + + public function getClassName(): string + { + return HouseholdCompositionType::class; + } +} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person/suggest-names.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person/suggest-names.js new file mode 100644 index 000000000..8973d0e6c --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person/suggest-names.js @@ -0,0 +1,61 @@ +function capitalizeFirstLetter(string) { + return string.charAt(0).toLocaleUpperCase() + string.slice(1); +} + +window.addEventListener('DOMContentLoaded', function() { + + const uri = decodeURI(location.hash.substring(1)) + let searchFragments = uri.split(' ') + searchFragments = searchFragments.filter((el) => { + if ( ( el.startsWith("firstname") || el.startsWith("lastname") ) || (el !== '' && !el.startsWith('birthdate') && !el.startsWith('gender') && !el.startsWith('city') && !el.startsWith('phonenumber') && !el.startsWith('@'))) { + return el + } + }) + + searchFragments = searchFragments.map((el) => { + if (el.startsWith("firstname")) { + return el.slice(10) + } else if (el.startsWith("lastname")) { + return el.slice(10) + } + return el.replace('\"', '') + }) + + if (searchFragments) { + const pre = '- ';
+ const after = '
{{ $t('confirm.sure_description') }}
++- @@ -74,11 +100,13 @@ diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue index c0ad9c9e7..fd856141e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue @@ -61,6 +61,32 @@ +++{{ $t('confirm.no_suggested_referrer') }}
+++{{ $t('confirm.one_suggested_referrer') }}:
+-
+
{{ $t('confirm.choose_suggested_referrer') }}
+-
+
++{{ $t('Documents') }} :
+ ++++++++{{ d.template.name.fr }}
++Créé par {{ d.createdBy.text }}
+ +
+ Le {{ $d(ISOToDatetime(d.createdAt.datetime), 'long') }}++-
+
{ let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id; return Promise.resolve({entityId: evaluationId}); diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js index a4beb223e..cff5b98ea 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js @@ -205,6 +205,7 @@ const store = createStore({ warningInterval: null, comment: "", editEvaluation: true, + workflows_availables: state.work.workflows_availables_evaluation, }; state.evaluationsPicked.push(e); }, @@ -371,7 +372,8 @@ const store = createStore({ if (typeof(callback) !== 'undefined') { return callback(data); } else { - console.info('nothing to do here, bye bye');window.location.assign(`/fr/person/accompanying-period/${state.work.accompanyingPeriod.id}/work`); + console.info('nothing to do here, bye bye'); + window.location.assign(`/fr/person/accompanying-period/${state.work.accompanyingPeriod.id}/work`); } }).catch(error => { console.log('error on submit', error); diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue index 22b4f54a6..52047c630 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue @@ -32,7 +32,7 @@ -- {{ $t('household_members_editor.concerned.persons_will_be_moved') }} : - -
+- - - {{ $t('household_members_editor.concerned.persons_will_be_moved') }} :
+ +-
+
{{ $t('household_members_editor.concerned.persons_with_household') }}
-
@@ -108,9 +104,14 @@ export default {
this.$refs.addPersons.resetSearch(); // to cast child method
modal.showModal = false;
},
- removePerson(person) {
- console.log('remove person in concerned', person);
- this.$store.dispatch('removePerson', person);
+ removeConcerned(concerned) {
+ console.log('removedconcerned', concerned);
+
+ if (!concerned.allowRemove) {
+ return;
+ }
+
+ this.$store.dispatch('removePerson', concerned.person);
},
makeHouseholdLink(id) {
return `/fr/person/household/${id}/summary`
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue
index c40cc9cbc..94c1a146a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue
@@ -4,17 +4,38 @@
{{ $t('household_members_editor.dates.dates_title') }}
--
{{ 'Write a new comment'|trans }}
@@ -102,6 +103,7 @@ {{ form_end(appendCommentForm) }}