{{ $t('my_works.description') }}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
index b5ae78e34..edc781087 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
@@ -15,11 +15,11 @@ const appMessages = {
description_warning: "Liste des tâches auxquelles je suis assigné et dont la date d'échéance est dépassée.",
},
my_accompanying_courses: {
- tab: "Mes parcours",
- description: "Liste des parcours d'accompagnement que l'on vient de m'attribuer.",
+ tab: "Mes nouveaux parcours",
+ description: "Liste des parcours d'accompagnement que l'on vient de m'attribuer depuis moins de 15 jours.",
},
my_notifications: {
- tab: "Mes notifications",
+ tab: "Mes nouvelles notifications",
description: "Liste des notifications reçues et non lues.",
},
my_workflows: {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js
index c33ec2123..44127da1c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js
@@ -13,7 +13,7 @@ const isEmpty = (obj) => {
const store = createStore({
strict: debug,
state: {
- works: {},
+ // works: {},
evaluations: {},
tasks: {
warning: {},
@@ -26,9 +26,9 @@ const store = createStore({
loading: false
},
getters: {
- isWorksLoaded(state) {
- return !isEmpty(state.works);
- },
+ // isWorksLoaded(state) {
+ // return !isEmpty(state.works);
+ // },
isEvaluationsLoaded(state) {
return !isEmpty(state.evaluations);
},
@@ -49,7 +49,7 @@ const store = createStore({
},
counter(state) {
return {
- works: state.works.count,
+ // works: state.works.count,
evaluations: state.evaluations.count,
tasksWarning: state.tasks.warning.count,
tasksAlert: state.tasks.alert.count,
@@ -60,10 +60,10 @@ const store = createStore({
}
},
mutations: {
- addWorks(state, works) {
- //console.log('addWorks', works);
- state.works = works;
- },
+ // addWorks(state, works) {
+ // //console.log('addWorks', works);
+ // state.works = works;
+ // },
addEvaluations(state, evaluations) {
//console.log('addEvaluations', evaluations);
state.evaluations = evaluations;
@@ -99,22 +99,22 @@ const store = createStore({
switch (tab) {
case 'MyCustoms':
break;
- case 'MyWorks':
- if (!getters.isWorksLoaded) {
- commit('setLoading', true);
- const url = `/api/1.0/person/accompanying-period/work/my-near-end${'?'+ param}`;
- makeFetch('GET', url)
- .then((response) => {
- commit('addWorks', response);
- commit('setLoading', false);
- })
- .catch((error) => {
- commit('catchError', error);
- throw error;
- })
- ;
- }
- break;
+ // case 'MyWorks':
+ // if (!getters.isWorksLoaded) {
+ // commit('setLoading', true);
+ // const url = `/api/1.0/person/accompanying-period/work/my-near-end${'?'+ param}`;
+ // makeFetch('GET', url)
+ // .then((response) => {
+ // commit('addWorks', response);
+ // commit('setLoading', false);
+ // })
+ // .catch((error) => {
+ // commit('catchError', error);
+ // throw error;
+ // })
+ // ;
+ // }
+ // break;
case 'MyEvaluations':
if (!getters.isEvaluationsLoaded) {
commit('setLoading', true);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 979f53d74..e3991fe2f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -210,10 +210,10 @@ export default {
let
type = this.type,
data = {} ;
-
switch (type) {
case 'person':
data = this.$refs.castPerson.$data.person;
+ console.log('person data are', data);
break;
case 'thirdparty':
@@ -235,8 +235,12 @@ export default {
type = this.$refs.castNew.radioType;
data = this.$refs.castNew.castDataByType();
// console.log('type', type);
- data.civility = data.civility !== null ? {type: 'chill_main_civility', id: data.civility.id} : null;
- data.profession = data.profession !== null ? {type: 'third_party_profession', id: data.profession.id} : null;
+ if (typeof data.civility !== 'undefined' && null !== data.civility) {
+ data.civility = data.civility !== null ? {type: 'chill_main_civility', id: data.civility.id} : null;
+ }
+ if (typeof data.profession !== 'undefined' && null !== data.profession) {
+ data.profession = data.profession !== null ? {type: 'third_party_profession', id: data.profession.id} : null;
+ }
// console.log('onthefly data', data);
}
} else {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index c75001005..e69b26619 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -66,9 +66,18 @@ export default {
translatedListOfTypes() {
let trans = [];
this.types.forEach(t => {
- trans.push(appMessages.fr.pick_entity[t].toLowerCase());
+ if (this.$props.multiple) {
+ trans.push(appMessages.fr.pick_entity[t].toLowerCase());
+ } else {
+ trans.push(appMessages.fr.pick_entity[t + '_one'].toLowerCase());
+ }
})
- return appMessages.fr.pick_entity.modal_title + trans.join(', ');
+
+ if (this.$props.multiple) {
+ return appMessages.fr.pick_entity.modal_title + trans.join(', ');
+ } else {
+ return appMessages.fr.pick_entity.modal_title_one + trans.join(', ');
+ }
}
},
methods: {
@@ -79,15 +88,10 @@ export default {
);
this.$refs.addPersons.resetSearch(); // to cast child method
modal.showModal = false;
- console.log(this.picked)
},
removeEntity(entity) {
- console.log('remove entity', entity);
this.$emit('removeEntity', entity);
}
},
- mounted() {
- console.log(this.picked);
- }
}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js
index f3ae3a928..cc3f324e8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js
@@ -11,6 +11,10 @@ const appMessages = {
user: 'Utilisateurs',
person: 'Usagers',
thirdparty: 'Tiers',
+ modal_title_one: 'Indiquer un ',
+ user_one: 'Utilisateur',
+ thirdparty_one: 'Tiers',
+ person_one: 'Usager',
}
}
}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue
index c60124592..892e905b6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue
@@ -81,7 +81,7 @@ export default {
/// [Option] showUrl is href for show page second button.
// When passed, the component return a button-group with 2 buttons.
isButtonGroup() {
- return !!this.showUrl
+ return this.showUrl;
}
},
methods: {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index 6ae44be41..1371989ba 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -69,7 +69,7 @@ const messages = {
person: "Usager"
},
holder: "Titulaire",
- years_old: "an | {n} an | {n} ans",
+ years_old: "1 an | {n} an | {n} ans",
residential_address: "Adresse de résidence",
located_at: "réside chez"
}
diff --git a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/AppKernel.php b/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/AppKernel.php
deleted file mode 100644
index 4f0542aec..000000000
--- a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/AppKernel.php
+++ /dev/null
@@ -1,54 +0,0 @@
-load(__DIR__ . '/config/config_' . $this->getEnvironment() . '.yml');
- }
-}
diff --git a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore b/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore
deleted file mode 100644
index c96a04f00..000000000
--- a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php b/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php
deleted file mode 100644
index ea351fb8a..000000000
--- a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php
+++ /dev/null
@@ -1,20 +0,0 @@
-getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
-$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
-
-if ($debug) {
- Debug::enable();
-}
-
-$kernel = new AppKernel($env, $debug);
-$application = new Application($kernel);
-$application->run($input);
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index 8bb09623f..1da384920 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -217,6 +217,7 @@
{% endblock %}
{% block pick_entity_dynamic_widget %}
+ {{ form_help(form)}}
{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
index a04ae73a9..aa883c603 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
@@ -47,6 +47,8 @@
+ {{ chill_pagination(paginator) }}
+
@@ -61,17 +66,28 @@
{% if c.full_content is defined and c.full_content == true %}
- {{ c.notification.message|chill_markdown_to_html }}
+ {% if c.notification.message is not empty %}
+ {{ c.notification.message|chill_markdown_to_html }}
+ {% else %}
+
{{ 'Any comment'|trans }}
+ {% endif %}
{% else %}
- {{ c.notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }}
-
{{ 'Read more'|trans }}
+ {% if c.notification.message is not empty %}
+ {{ c.notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }}
+
{{ 'Read more'|trans }}
+ {% else %}
+
{{ 'Any comment'|trans }}
+ {% endif %}
{% endif %}
+{% endmacro %}
+
+{% macro actions(c) %}
{% if c.action_button is not defined or c.action_button != false %}
-
+
{% if c.notification.comments|length > 0 %}
{% endif %}
-
+
{# Vue component #}
{% if is_granted('CHILL_MAIN_NOTIFICATION_UPDATE', c.notification) %}
@@ -122,24 +138,25 @@
-
+
{{ _self.title(_context) }}
{{ _self.header(_context) }}
-
+
-
+
{{ _self.content(_context) }}
-
+ {{ _self.actions(_context) }}
{% else %}
{{ _self.title(_context) }}
{{ _self.header(_context) }}
{{ _self.content(_context) }}
+ {{ _self.actions(_context) }}
{% endif %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig
index f15380083..4dfd340b6 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig
@@ -20,7 +20,9 @@
{{ form_row(form.title, { 'label': 'notification.subject'|trans }) }}
{{ form_row(form.addressees, { 'label': 'notification.sent_to'|trans }) }}
-
+
+ {{ form_row(form.addressesEmails) }}
+
{% include handler.template(notification) with handler.templateData(notification) %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig
index b51cc4dab..fd3b3b6bf 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig
@@ -21,6 +21,8 @@
{{ form_row(form.title, { 'label': 'notification.subject'|trans }) }}
{{ form_row(form.addressees, { 'label': 'notification.sent_to'|trans }) }}
+ {{ form_row(form.addressesEmails) }}
+
{% include handler.template(notification) with handler.templateData(notification) %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content_to_email.fr.md.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content_to_email.fr.md.twig
new file mode 100644
index 000000000..9a32f0c15
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content_to_email.fr.md.twig
@@ -0,0 +1,20 @@
+{{ dest }},
+
+{{ notification.sender.label }} a créé une notification pour vous:
+
+> {{ notification.title }}
+>
+>
+{%- for line in notification.message|split("\n") %}
+> {{ line }}
+{%- if not loop.last %}
+>
+{%- endif %}
+{%- endfor %}
+
+Vous pouvez cliquer sur ce lien pour obtenir un accès permanent à la notification:
+
+{{ absolute_url(path('chill_main_notification_grant_access_by_access_key', {'_locale': 'fr', 'id': notification.id, 'accessKey': notification.accessKey, 'email': dest})) }}
+
+--
+Le logiciel Chill
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index 5a558b6a0..83a82f140 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -59,4 +59,10 @@
{{ chill_pagination(paginator) }}
-{% endblock %}
\ No newline at end of file
+
+
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_notification_include.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_notification_include.html.twig
index 558207818..efc7ddfb1 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_notification_include.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_notification_include.html.twig
@@ -2,7 +2,7 @@
{{ 'workflow_'|trans }}
-
+
{% include handler.template(entity_workflow) with handler.templateData(entity_workflow)|merge({
'description': true,
'breadcrumb': true,
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/delete.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/delete.html.twig
index 64da4ea76..d11165fc6 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/delete.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/delete.html.twig
@@ -3,6 +3,7 @@
{% block title 'workflow.Delete workflow ?'|trans %}
{% block display_content %}
+
{{ handler.entityTitle(entityWorkflow) }}
@@ -10,6 +11,7 @@
{% include handler.template(entityWorkflow) with handler.templateData(entityWorkflow)|merge({
'display_action': false
}) %}
+
{% endblock %}
{% block content %}
@@ -25,5 +27,5 @@
'form' : delete_form
} ) }}
-
+
{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index c11422a1b..f59e0aaff 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -36,33 +36,35 @@
{# Flash messages ! #}
{% if app.session.flashbag.keys()|length > 0 %}
-
+
+
+
+ {% for flashMessage in app.session.flashbag.get('success') %}
+
+ {{ flashMessage|raw }}
+
+ {% endfor %}
+
+ {% for flashMessage in app.session.flashbag.get('error') %}
+
+ {{ flashMessage|raw }}
+
+ {% endfor %}
+
+ {% for flashMessage in app.session.flashbag.get('notice') %}
+
+ {{ flashMessage|raw }}
+
+ {% endfor %}
- {% for flashMessage in app.session.flashbag.get('success') %}
-
- {{ flashMessage|raw }}
- {% endfor %}
-
- {% for flashMessage in app.session.flashbag.get('error') %}
-
- {{ flashMessage|raw }}
-
- {% endfor %}
-
- {% for flashMessage in app.session.flashbag.get('notice') %}
-
- {{ flashMessage|raw }}
-
- {% endfor %}
-
-
+
{% endif %}
{% block content %}
{{ 'Search'|trans }}
-
+
-
+
{# DISABLED {{ chill_widget('homepage', {} ) }} #}
-
+
{% include '@ChillMain/Homepage/index.html.twig' %}
-
+
{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
index 32c0a3b43..baace22c1 100644
--- a/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
+++ b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
@@ -45,15 +45,16 @@ class SearchUserApiProvider implements SearchApiInterface
$query
->setSelectKey('user')
->setSelectJsonbMetadata("jsonb_build_object('id', u.id)")
- ->setSelectPertinence('GREATEST(SIMILARITY(LOWER(UNACCENT(?)), u.label),
+ ->setSelectPertinence('3 + GREATEST(SIMILARITY(LOWER(UNACCENT(?)), u.label),
SIMILARITY(LOWER(UNACCENT(?)), u.usernamecanonical))', [$pattern, $pattern])
->setFromClause('users AS u')
->setWhereClauses('
+ u.enabled IS TRUE and (
SIMILARITY(LOWER(UNACCENT(?)), u.usernamecanonical) > 0.15
OR u.usernamecanonical LIKE \'%\' || LOWER(UNACCENT(?)) || \'%\'
OR SIMILARITY(LOWER(UNACCENT(?)), LOWER(UNACCENT(u.label))) > 0.15
OR u.label LIKE \'%\' || LOWER(UNACCENT(?)) || \'%\'
- ', [$pattern, $pattern, $pattern, $pattern]);
+ )', [$pattern, $pattern, $pattern, $pattern]);
return $query;
}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php
index fe0597e6b..82dfc7681 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php
@@ -59,7 +59,23 @@ class EntityWorkflowVoter extends Voter
return true;
}
- return $this->security->isGranted($entityAttribute, $handler->getRelatedEntity($subject));
+ $relatedEntity = $handler->getRelatedEntity($subject);
+
+ if (null === $relatedEntity) {
+ return true;
+ }
+
+ if ($this->security->isGranted($entityAttribute, $relatedEntity)) {
+ return true;
+ }
+
+ foreach ($subject->getSteps() as $step) {
+ if ($step->getAllDestUser()->contains($token->getUser())) {
+ return true;
+ }
+ }
+
+ return false;
case self::DELETE:
return $subject->getStep() === 'initial';
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
index ccb48c160..0809863f6 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
@@ -71,6 +71,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
'id' => $address->getPostCode()->getId(),
'name' => $address->getPostCode()->getName(),
'code' => $address->getPostCode()->getCode(),
+ 'center' => $address->getPostcode()->getCenter(),
],
'country' => [
'id' => $address->getPostCode()->getCountry()->getId(),
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
index 70958d5a9..d3161fd4a 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
@@ -44,14 +44,25 @@ class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInt
switch ($type) {
case DateTime::class:
- return DateTime::createFromFormat(DateTimeInterface::ISO8601, $data['datetime']);
+ $result = DateTime::createFromFormat(DateTimeInterface::ISO8601, $data['datetime']);
+
+ break;
case DateTimeInterface::class:
case DateTimeImmutable::class:
- return DateTimeImmutable::createFromFormat(DateTimeInterface::ISO8601, $data['datetime']);
+ $result = DateTimeImmutable::createFromFormat(DateTimeInterface::ISO8601, $data['datetime']);
+
+ break;
+
+ default:
+ throw new UnexpectedValueException();
}
- throw new UnexpectedValueException();
+ if (false === $result) {
+ return null;
+ }
+
+ return $result;
}
public function normalize($date, $format = null, array $context = [])
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
index 7eb323754..f76b1e5c8 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
@@ -32,7 +32,7 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
}
/**
- * @param mixed $data
+ * @param string|null $data
* @param mixed $type
* @param null|mixed $format
*
@@ -40,7 +40,7 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
*/
public function denormalize($data, $type, $format = null, array $context = [])
{
- if ('' === trim($data)) {
+ if ('' === trim((string) $data)) {
return null;
}
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
index 18a3f6c66..d7da05aa7 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
@@ -83,9 +83,9 @@ abstract class AbstractExportTest extends WebTestCase
$em = static::$kernel->getContainer()
->get('doctrine.orm.entity_manager');
- $centers = $em->getRepository('ChillMainBundle:Center')
+ $centers = $em->getRepository(\Chill\MainBundle\Entity\Center::class)
->findAll();
- $circles = $em->getRepository('ChillMainBundle:Scope')
+ $circles = $em->getRepository(\Chill\MainBundle\Entity\Scope::class)
->findAll();
if (count($centers) === 0) {
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
index 42f541d56..c7c916f8b 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
@@ -161,7 +161,7 @@ final class UserControllerTest extends WebTestCase
$user = self::$kernel->getContainer()
->get('doctrine.orm.entity_manager')
- ->getRepository('ChillMainBundle:User')
+ ->getRepository(\Chill\MainBundle\Entity\User::class)
->findOneBy(['username' => $username]);
$this->assertTrue($passwordEncoder->isPasswordValid($user, $password));
diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
index 8110fa11d..0575fa52a 100644
--- a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
@@ -88,6 +88,24 @@ final class NotificationTest extends KernelTestCase
$this->assertNotContains($user1, $notification->getUnreadBy()->toArray());
}
+ public function testAddressesEmail(): void
+ {
+ $notification = new Notification();
+
+ $notification->addAddressesEmail('test');
+ $notification->addAddressesEmail('other');
+
+ $this->assertContains('test', $notification->getAddressesEmails());
+ $this->assertContains('other', $notification->getAddressesEmails());
+ $this->assertContains('test', $notification->getAddressesEmailsAdded());
+ $this->assertContains('other', $notification->getAddressesEmailsAdded());
+
+ $notification->removeAddressesEmail('other');
+
+ $this->assertNotContains('other', $notification->getAddressesEmails());
+ $this->assertNotContains('other', $notification->getAddressesEmailsAdded());
+ }
+
/**
* @dataProvider generateNotificationData
*/
diff --git a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
index 82693b9c1..87508dfbf 100644
--- a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
@@ -672,7 +672,7 @@ final class ExportManagerTest extends KernelTestCase
$localUser = $user ?? self::$container->get(
'doctrine.orm.entity_manager'
)
- ->getRepository('ChillMainBundle:User')
+ ->getRepository(\Chill\MainBundle\Entity\User::class)
->findOneBy(['username' => 'center a_social']);
$token = new UsernamePasswordToken($localUser, 'password', 'provider');
$tokenStorage = new TokenStorage();
diff --git a/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php b/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php
new file mode 100644
index 000000000..4c1b5c304
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php
@@ -0,0 +1,47 @@
+prophesize(EntityManagerInterface::class);
+ $em->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1);
+ $em->flush()->shouldBeCalledTimes(1);
+ $event = $this->prophesize(TerminateEvent::class);
+ $event->isMasterRequest()->willReturn(true);
+
+ $eventSubscriber = new PersistNotificationOnTerminateEventSubscriber($em->reveal(), $persister);
+
+ $notification = new Notification();
+ $persister->persist($notification);
+
+ $eventSubscriber->onKernelTerminate($event->reveal());
+ }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php
new file mode 100644
index 000000000..1e0d4ef29
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php
@@ -0,0 +1,54 @@
+parse('+32486123465'), 'docgen', ['docgen:expects' => PhoneNumber::class], '0486 12 34 65'];
+
+ yield [null, 'docgen', ['docgen:expects' => PhoneNumber::class], ''];
+ }
+
+ /**
+ * @dataProvider dataProviderNormalizePhonenumber
+ *
+ * @param mixed $format
+ * @param mixed $context
+ * @param mixed $expected
+ */
+ public function testNormalize(?Phonenumber $phonenumber, $format, $context, $expected)
+ {
+ $parameterBag = $this->prophesize(ParameterBagInterface::class);
+ $parameterBag->get(Argument::exact('chill_main'))->willReturn(['phone_helper' => ['default_carrier_code' => 'BE']]);
+ $normalizer = new PhonenumberNormalizer($parameterBag->reveal());
+
+ $this->assertEquals($expected, $normalizer->normalize($phonenumber, $format, $context));
+ }
+}
diff --git a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
index 21a0f6b43..48e8e5130 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
@@ -62,7 +62,7 @@ class WorkflowTwigExtensionRuntime implements RuntimeExtensionInterface
}
/**
- * @param array{relatedEntityClass: string, relatedEntityId: int} $supplementaryRelated
+ * @param array
$supplementaryRelated
*
* @throws \Symfony\Component\Serializer\Exception\ExceptionInterface
* @throws \Twig\Error\LoaderError
diff --git a/src/Bundle/ChillMainBundle/config/services/notification.yaml b/src/Bundle/ChillMainBundle/config/services/notification.yaml
index b972dced7..bb0b6bb8c 100644
--- a/src/Bundle/ChillMainBundle/config/services/notification.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/notification.yaml
@@ -3,6 +3,11 @@ services:
autowire: true
autoconfigure: true
+ Chill\MainBundle\Notification\:
+ resource: ../../Notification/
+ autoconfigure: true
+ autowire: true
+
Chill\MainBundle\Notification\Mailer:
arguments:
$logger: '@Psr\Log\LoggerInterface'
@@ -17,12 +22,6 @@ services:
arguments:
$handlers: !tagged_iterator chill_main.notification_handler
- Chill\MainBundle\Notification\NotificationPresence: ~
-
- Chill\MainBundle\Notification\Templating\NotificationTwigExtension: ~
-
- Chill\MainBundle\Notification\Templating\NotificationTwigExtensionRuntime: ~
-
Chill\MainBundle\Notification\Counter\NotificationByUserCounter:
autoconfigure: true
autowire: true
@@ -61,6 +60,15 @@ services:
# set the 'lazy' option to TRUE to only instantiate listeners when they are used
lazy: true
method: 'postPersistNotification'
+
+ -
+ name: 'doctrine.orm.entity_listener'
+ event: 'postUpdate'
+ entity: 'Chill\MainBundle\Entity\Notification'
+ # set the 'lazy' option to TRUE to only instantiate listeners when they are used
+ lazy: true
+ method: 'postUpdateNotification'
+
-
name: 'doctrine.orm.entity_listener'
event: 'postPersist'
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220413154743.php b/src/Bundle/ChillMainBundle/migrations/Version20220413154743.php
new file mode 100644
index 000000000..174419cda
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220413154743.php
@@ -0,0 +1,46 @@
+addSql('ALTER TABLE chill_main_notification DROP adressesEmails');
+ $this->addSql('ALTER TABLE chill_main_notification DROP accessKey');
+ }
+
+ public function getDescription(): string
+ {
+ return 'add access keys and emails dest to notifications';
+ }
+
+ public function up(Schema $schema): void
+ {
+ $this->addSql('ALTER TABLE chill_main_notification ADD addressesEmails JSON NOT NULL DEFAULT \'[]\';');
+ $this->addSql('ALTER TABLE chill_main_notification ADD accessKey TEXT DEFAULT NULL');
+ $this->addSql('WITH randoms AS (select
+ n.id,
+ string_agg(substr(characters, (random() * length(characters) + 0.5)::integer, 1), \'\') as random_word
+ from (values(\'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\')) as symbols(characters)
+ -- length of word
+ join generate_series(1, 16) on 1 = 1
+ JOIN chill_main_notification n ON true
+ GROUP BY n.id)
+ UPDATE chill_main_notification SET accessKey = randoms.random_word FROM randoms WHERE chill_main_notification.id = randoms.id');
+ $this->addSql('ALTER TABLE chill_main_notification ALTER accessKey DROP DEFAULT');
+ $this->addSql('ALTER TABLE chill_main_notification ALTER accessKey SET NOT NULL');
+ }
+}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220413225830.php b/src/Bundle/ChillMainBundle/migrations/Version20220413225830.php
new file mode 100644
index 000000000..4fdb48de3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220413225830.php
@@ -0,0 +1,33 @@
+addSql('ALTER TABLE chill_main_address ALTER COLUMN postcode_id DROP NOT NULL');
+ }
+
+ public function getDescription(): string
+ {
+ return 'Set postal code in chill_main_address NOT NULL';
+ }
+
+ public function up(Schema $schema): void
+ {
+ $this->addSql('ALTER TABLE chill_main_address ALTER COLUMN postcode_id SET NOT NULL');
+ }
+}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220413230159.php b/src/Bundle/ChillMainBundle/migrations/Version20220413230159.php
new file mode 100644
index 000000000..52e4a4fff
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220413230159.php
@@ -0,0 +1,33 @@
+addSql('ALTER TABLE chill_main_address DROP CONSTRAINT chill_custom_validfrom_before_validto');
+ }
+
+ public function getDescription(): string
+ {
+ return 'in addresses, validfrom must be lower than validto';
+ }
+
+ public function up(Schema $schema): void
+ {
+ $this->addSql('ALTER TABLE chill_main_address ADD CONSTRAINT chill_custom_validfrom_before_validto CHECK (validfrom <= COALESCE(validto, \'infinity\'::date))');
+ }
+}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 685a0c373..452ad306c 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -450,4 +450,10 @@ notification:
subject: Objet
see_comments_thread: Voir le fil de commentaires associé
object_prefix: "[CHILL] notification - "
+ dest by email: Lien d'accès par email
+ Any email: Aucun email
+ Add an email: Ajouter un email
+ dest by email help: Les adresses email mentionnées ici recevront un lien d'accès. Un compte utilisateur sera toujours nécessaire.
+ Remove an email: Supprimer l'adresse email
+ Email with access link: Adresse email ayant reçu un lien d'accès
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php
index 3eff58dc7..04dfb25cc 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php
@@ -13,10 +13,10 @@ namespace Chill\PersonBundle\AccompanyingPeriod\Events;
use Chill\MainBundle\Entity\Address;
use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Notification\NotificationPersisterInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
use DateTimeImmutable;
-use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\Security\Core\Security;
use Symfony\Component\Templating\EngineInterface;
@@ -26,7 +26,7 @@ class PersonAddressMoveEventSubscriber implements EventSubscriberInterface
{
private EngineInterface $engine;
- private EntityManagerInterface $entityManager;
+ private NotificationPersisterInterface $notificationPersister;
private Security $security;
@@ -34,12 +34,12 @@ class PersonAddressMoveEventSubscriber implements EventSubscriberInterface
public function __construct(
EngineInterface $engine,
- EntityManagerInterface $entityManager,
+ NotificationPersisterInterface $notificationPersister,
Security $security,
TranslatorInterface $translator
) {
$this->engine = $engine;
- $this->entityManager = $entityManager;
+ $this->notificationPersister = $notificationPersister;
$this->security = $security;
$this->translator = $translator;
}
@@ -87,7 +87,7 @@ class PersonAddressMoveEventSubscriber implements EventSubscriberInterface
'period' => $period,
]));
- $this->entityManager->persist($notification);
+ $this->notificationPersister->persist($notification);
}
}
}
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
index ce52fe5e0..aacb283c3 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
@@ -13,8 +13,8 @@ namespace Chill\PersonBundle\AccompanyingPeriod\Events;
use Chill\MainBundle\Entity\Notification;
use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Notification\NotificationPersisterInterface;
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;
@@ -24,20 +24,20 @@ use Symfony\Contracts\Translation\TranslatorInterface;
class UserRefEventSubscriber implements EventSubscriberInterface
{
- private EntityManagerInterface $em;
-
private EngineInterface $engine;
+ private NotificationPersisterInterface $notificationPersister;
+
private Security $security;
private TranslatorInterface $translator;
- public function __construct(Security $security, TranslatorInterface $translator, EngineInterface $engine, EntityManagerInterface $em)
+ public function __construct(Security $security, TranslatorInterface $translator, EngineInterface $engine, NotificationPersisterInterface $notificationPersister)
{
$this->security = $security;
$this->translator = $translator;
$this->engine = $engine;
- $this->em = $em;
+ $this->notificationPersister = $notificationPersister;
}
public static function getSubscribedEvents()
@@ -58,16 +58,13 @@ class UserRefEventSubscriber implements EventSubscriberInterface
public function postUpdate(AccompanyingPeriod $period, LifecycleEventArgs $args): void
{
- if ($period->hasPreviousUser()
+ if ($period->isChangedUser()
&& $period->getUser() !== $this->security->getUser()
&& null !== $period->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)
@@ -89,7 +86,7 @@ class UserRefEventSubscriber implements EventSubscriberInterface
))
->addAddressee($period->getUser());
- $this->em->persist($notification);
+ $this->notificationPersister->persist($notification);
}
private function onPeriodConfirmed(AccompanyingPeriod $period)
diff --git a/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php b/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php
new file mode 100644
index 000000000..5d503007f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php
@@ -0,0 +1,64 @@
+logger = $logger;
+ $this->remover = $remover;
+ }
+
+ protected function configure(): void
+ {
+ $this
+ ->setDescription('Remove draft accompanying period which are still draft and unused')
+ ->addArgument('interval', InputArgument::OPTIONAL, 'The interval for unactive periods', 'P15D');
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output): int
+ {
+ $this->logger->info('[' . $this->getName() . '] started', [
+ 'interval' => $input->getArgument('interval'),
+ ]);
+
+ try {
+ $interval = new DateInterval($input->getArgument('interval'));
+ } catch (Exception $e) {
+ $this->logger->error('[' . $this->getName() . '] bad interval');
+
+ throw $e;
+ }
+
+ $this->remover->remove($interval);
+
+ $this->logger->info('[' . $this->getName() . '] end of command');
+
+ return 0;
+ }
+}
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
index f1306640b..21db6b00c 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
@@ -33,10 +33,10 @@ use DateInterval;
use DateTimeImmutable;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Component\Serializer\Exception\RuntimeException;
@@ -185,7 +185,7 @@ final class AccompanyingCourseApiController extends ApiController
->deserialize($request->getContent(), Person::class, $_format, []);
if (null === $person) {
- throw new BadRequestException('person id not found');
+ throw new BadRequestHttpException('person id not found');
}
// TODO add acl
@@ -204,7 +204,7 @@ final class AccompanyingCourseApiController extends ApiController
break;
default:
- throw new BadRequestException('This method is not supported');
+ throw new BadRequestHttpException('This method is not supported');
}
$errors = $this->validator->validate($accompanyingPeriod);
@@ -247,12 +247,12 @@ final class AccompanyingCourseApiController extends ApiController
}
if (null === $requestor) {
- throw new BadRequestException('Could not find any person or thirdparty', 0, null);
+ throw new BadRequestHttpException('Could not find any person or thirdparty', 0, null);
}
$accompanyingPeriod->setRequestor($requestor);
} else {
- throw new BadRequestException('method not supported');
+ throw new BadRequestHttpException('method not supported');
}
$errors = $this->validator->validate($accompanyingPeriod);
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php
index be6bcab07..09af4a3cf 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php
@@ -186,6 +186,24 @@ class AccompanyingCourseCommentController extends AbstractController
]);
}
+ /**
+ * @Route("/{_locale}/parcours/comment/{id}/unpin", name="chill_person_accompanying_period_comment_unpin")
+ */
+ public function unpinComment(AccompanyingPeriod\Comment $comment): Response
+ {
+ $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::EDIT, $comment->getAccompanyingPeriod());
+
+ $comment->getAccompanyingPeriod()->setPinnedComment(null);
+
+ $this->getDoctrine()->getManager()->flush();
+
+ $this->addFlash('success', $this->translator->trans('accompanying_course.comment is unpinned'));
+
+ return $this->redirectToRoute('chill_person_accompanying_period_comment_list', [
+ 'accompanying_period_id' => $comment->getAccompanyingPeriod()->getId(),
+ ]);
+ }
+
private function createCommentForm(AccompanyingPeriod\Comment $comment, string $step): FormInterface
{
return $this->formFactory->createNamed($step, AccompanyingCourseCommentType::class, $comment);
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
index b15f8adb9..4d78bb42b 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
@@ -21,9 +21,9 @@ use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Serializer\SerializerInterface;
use Symfony\Component\Validator\ConstraintViolationInterface;
@@ -255,7 +255,7 @@ class AccompanyingCourseController extends Controller
$personIds = $request->query->get('person_id');
if (false === is_array($personIds)) {
- throw new BadRequestException('person_id parameter should be an array');
+ throw new BadRequestHttpException('person_id parameter should be an array');
}
foreach ($personIds as $personId) {
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
index c34702ad1..2a9c43da7 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
@@ -451,7 +451,7 @@ class AccompanyingPeriodController extends AbstractController
private function _getPerson(int $id): Person
{
$person = $this->getDoctrine()->getManager()
- ->getRepository('ChillPersonBundle:Person')->find($id);
+ ->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($id);
if (null === $person) {
throw $this->createNotFoundException('Person not found');
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
index 470094507..f10c1229f 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
@@ -102,7 +102,6 @@ class HouseholdApiController extends ApiController
$event
->setPreviousAddress($household->getPreviousAddressOf($address))
->setNextAddress($address);
- dump($event);
$this->eventDispatcher->dispatch($event);
}
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
index 0a8b7eea1..503867a3e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
@@ -12,14 +12,17 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Controller;
use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Form\Type\AddressDateType;
use Chill\PersonBundle\Entity\Household\Household;
use Chill\PersonBundle\Form\HouseholdType;
use Chill\PersonBundle\Repository\Household\PositionRepository;
use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Security;
use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
@@ -186,6 +189,62 @@ class HouseholdController extends AbstractController
);
}
+ /**
+ * @Route(
+ * "/{household_id}/address/edit_valid_from",
+ * name="chill_person_household_address_valid_from_edit",
+ * methods={"GET", "HEAD", "POST"}
+ * )
+ * @ParamConverter("household", options={"id": "household_id"})
+ */
+ public function addressValidFromEdit(Request $request, Household $household)
+ {
+ $this->denyAccessUnlessGranted(HouseholdVoter::EDIT, $household);
+
+ if (!$request->query->has('address_id')) {
+ throw new BadRequestHttpException('parameter address_id is missing');
+ }
+
+ $address_id = $request->query->getInt('address_id');
+
+ // loop over adresses of the household, to be sure that the household is associated
+ // to the edited address
+ $address = null;
+
+ foreach ($household->getAddresses() as $householdAddress) {
+ if ($householdAddress->getId() === $address_id) {
+ $address = $householdAddress;
+ }
+ }
+
+ if (null === $address) {
+ throw new BadRequestHttpException('The edited address does not belongs to the household');
+ }
+
+ $form = $this->createForm(AddressDateType::class, $address, []);
+
+ $form->handleRequest($request);
+
+ if ($form->isSubmitted() && $form->isValid()) {
+ $household->makeAddressConsistent();
+
+ $this->getDoctrine()->getManager()->flush();
+
+ return $this->redirectToRoute('chill_person_household_addresses', [
+ 'household_id' => $household->getId(),
+ ]);
+ }
+
+ return $this->render(
+ '@ChillPerson/Household/address_valid_from_edit.html.twig',
+ [
+ 'household' => $household,
+ 'address' => $address,
+ 'form' => $form->createView(),
+ ]
+ );
+ }
+
/**
* @Route(
* "/{household_id}/members/metadata/edit",
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
index 2ec72a786..cacba0630 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
@@ -20,9 +20,9 @@ use Chill\PersonBundle\Form\HouseholdMemberType;
use Chill\PersonBundle\Household\MembersEditor;
use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Serializer\Exception;
@@ -105,7 +105,7 @@ class HouseholdMemberController extends ApiController
$ids = $request->query->get('persons', []);
if (0 === count($ids)) {
- throw new BadRequestException('parameters persons in query ' .
+ throw new BadRequestHttpException('parameters persons in query ' .
'is not an array or empty');
}
@@ -121,7 +121,8 @@ class HouseholdMemberController extends ApiController
}
}
- if ($householdId = $request->query->get('household', false)) {
+ if ($request->query->has('household')) {
+ $householdId = $request->query->get('household', false);
$household = $em->getRepository(Household::class)
->find($householdId);
$allowHouseholdCreate = false;
@@ -189,7 +190,7 @@ class HouseholdMemberController extends ApiController
['groups' => ['read']]
);
} catch (Exception\InvalidArgumentException|Exception\UnexpectedValueException $e) {
- throw new BadRequestException("Deserialization error: {$e->getMessage()}", 45896, $e);
+ throw new BadRequestHttpException("Deserialization error: {$e->getMessage()}", 45896, $e);
}
// TODO ACL
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
index 2d4a60c15..d4c5b334d 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
@@ -43,7 +43,7 @@ class PersonAddressController extends AbstractController
public function createAction($person_id, Request $request)
{
$person = $this->getDoctrine()->getManager()
- ->getRepository('ChillPersonBundle:Person')
+ ->getRepository(\Chill\PersonBundle\Entity\Person::class)
->find($person_id);
if (null === $person) {
@@ -98,7 +98,7 @@ class PersonAddressController extends AbstractController
public function editAction($person_id, $address_id)
{
$person = $this->getDoctrine()->getManager()
- ->getRepository('ChillPersonBundle:Person')
+ ->getRepository(\Chill\PersonBundle\Entity\Person::class)
->find($person_id);
if (null === $person) {
@@ -126,7 +126,7 @@ class PersonAddressController extends AbstractController
public function listAction($person_id)
{
$person = $this->getDoctrine()->getManager()
- ->getRepository('ChillPersonBundle:Person')
+ ->getRepository(\Chill\PersonBundle\Entity\Person::class)
->find($person_id);
if (null === $person) {
@@ -148,7 +148,7 @@ class PersonAddressController extends AbstractController
public function newAction($person_id)
{
$person = $this->getDoctrine()->getManager()
- ->getRepository('ChillPersonBundle:Person')
+ ->getRepository(\Chill\PersonBundle\Entity\Person::class)
->find($person_id);
if (null === $person) {
@@ -175,7 +175,7 @@ class PersonAddressController extends AbstractController
public function updateAction($person_id, $address_id, Request $request)
{
$person = $this->getDoctrine()->getManager()
- ->getRepository('ChillPersonBundle:Person')
+ ->getRepository(\Chill\PersonBundle\Entity\Person::class)
->find($person_id);
if (null === $person) {
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index 22d3d9388..a4a29216c 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -12,12 +12,15 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Controller;
use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Form\CreationPersonType;
use Chill\PersonBundle\Form\PersonType;
use Chill\PersonBundle\Privacy\PrivacyEvent;
use Chill\PersonBundle\Repository\PersonRepository;
use Chill\PersonBundle\Search\SimilarPersonMatcher;
+use DateTimeImmutable;
use Doctrine\ORM\EntityManagerInterface;
use Psr\Log\LoggerInterface;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
@@ -31,8 +34,8 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Security;
use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
use function count;
use function hash;
use function implode;
@@ -156,7 +159,7 @@ final class PersonController extends AbstractController
{
$cFGroup = null;
- $cFDefaultGroup = $this->em->getRepository('ChillCustomFieldsBundle:CustomFieldsDefaultGroup')
+ $cFDefaultGroup = $this->em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup::class)
->findOneByEntity('Chill\\PersonBundle\\Entity\\Person');
if ($cFDefaultGroup) {
@@ -248,6 +251,31 @@ final class PersonController extends AbstractController
$this->em->flush();
$this->lastPostDataReset();
+ $address = $form->get('address')->getData();
+ $addressForm = (bool) $form->get('addressForm')->getData();
+
+ if (null !== $address && $addressForm) {
+ $household = new Household();
+
+ $member = new HouseholdMember();
+ $member->setPerson($person);
+ $member->setStartDate(new DateTimeImmutable());
+
+ $household->addMember($member);
+ $household->setForceAddress($address);
+
+ $this->em->persist($member);
+ $this->em->persist($household);
+ $this->em->flush();
+
+ if ($form->get('createHousehold')->isClicked()) {
+ return $this->redirectToRoute('chill_person_household_members_editor', [
+ 'persons' => [$person->getId()],
+ 'household' => $household->getId(),
+ ]);
+ }
+ }
+
if ($form->get('createPeriod')->isClicked()) {
return $this->redirectToRoute('chill_person_accompanying_course_new', [
'person_id' => [$person->getId()],
diff --git a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
index 4abf5e93c..1fd54f14c 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
@@ -12,13 +12,18 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Controller;
use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
use Chill\MainBundle\Pagination\PaginatorFactory;
use Chill\MainBundle\Repository\UserRepository;
use Chill\MainBundle\Templating\Entity\UserRender;
use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
+use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Form\FormFactoryInterface;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
@@ -27,11 +32,18 @@ use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Component\Security\Core\Security;
use Symfony\Component\Templating\EngineInterface;
+use Symfony\Component\Validator\Constraints\NotIdenticalTo;
+use Symfony\Component\Validator\Constraints\NotNull;
+use function is_int;
class ReassignAccompanyingPeriodController extends AbstractController
{
private AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository;
+ private AccompanyingPeriodRepository $courseRepository;
+
+ private EntityManagerInterface $em;
+
private EngineInterface $engine;
private FormFactoryInterface $formFactory;
@@ -44,8 +56,17 @@ class ReassignAccompanyingPeriodController extends AbstractController
private UserRepository $userRepository;
- public function __construct(AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository, UserRepository $userRepository, EngineInterface $engine, FormFactoryInterface $formFactory, PaginatorFactory $paginatorFactory, Security $security, UserRender $userRender)
- {
+ public function __construct(
+ AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository,
+ UserRepository $userRepository,
+ AccompanyingPeriodRepository $courseRepository,
+ EngineInterface $engine,
+ FormFactoryInterface $formFactory,
+ PaginatorFactory $paginatorFactory,
+ Security $security,
+ UserRender $userRender,
+ EntityManagerInterface $em
+ ) {
$this->accompanyingPeriodACLAwareRepository = $accompanyingPeriodACLAwareRepository;
$this->engine = $engine;
$this->formFactory = $formFactory;
@@ -53,6 +74,8 @@ class ReassignAccompanyingPeriodController extends AbstractController
$this->security = $security;
$this->userRepository = $userRepository;
$this->userRender = $userRender;
+ $this->courseRepository = $courseRepository;
+ $this->em = $em;
}
/**
@@ -68,23 +91,55 @@ class ReassignAccompanyingPeriodController extends AbstractController
$form->handleRequest($request);
- $total = $this->accompanyingPeriodACLAwareRepository->countByUserOpenedAccompanyingPeriod(
- $form['user']->getData()
- );
+ $userFrom = $form['user']->getData();
+
+ $total = $this->accompanyingPeriodACLAwareRepository->countByUserOpenedAccompanyingPeriod($userFrom);
$paginator = $this->paginatorFactory->create($total);
$periods = $this->accompanyingPeriodACLAwareRepository
->findByUserOpenedAccompanyingPeriod(
- $form['user']->getData(),
+ $userFrom,
['openingDate' => 'ASC'],
$paginator->getItemsPerPage(),
$paginator->getCurrentPageFirstItemNumber()
);
+ $periodIds = [];
+
+ foreach ($periods as $period) {
+ $periodIds[] = $period->getId();
+ }
+
+ // Create an array of period id's to pass into assignForm hiddenfield
+ $assignForm = $this->buildReassignForm($periodIds, $userFrom);
+
+ $assignForm->handleRequest($request);
+
+ if ($assignForm->isSubmitted() && $assignForm->isValid()) {
+ $assignPeriodIds = json_decode($assignForm->get('periods')->getData(), true);
+ $userTo = $assignForm->get('userTo')->getData();
+ $userFrom = $assignForm->get('userFrom')->getData();
+
+ foreach ($assignPeriodIds as $periodId) {
+ $period = $this->courseRepository->find($periodId);
+
+ if ($period->getUser() === $userFrom) {
+ $period->setUser($userTo);
+ }
+ }
+
+ $this->em->flush();
+
+ // redirect to the first page
+ return $this->redirectToRoute('chill_course_list_reassign', $request->query->all());
+ }
+
return new Response(
$this->engine->render('@ChillPerson/AccompanyingPeriod/reassign_list.html.twig', [
+ 'assignForm' => $assignForm->createView(),
+ 'form' => $form->createView(),
'paginator' => $paginator,
'periods' => $periods,
- 'form' => $form->createView(),
+ 'userFrom' => $userFrom,
])
);
}
@@ -98,17 +153,63 @@ class ReassignAccompanyingPeriodController extends AbstractController
'method' => 'get', 'csrf_protection' => false, ]);
$builder
- ->add('user', EntityType::class, [
- 'class' => User::class,
- 'choices' => $this->userRepository->findByActive(['username' => 'ASC']),
- 'choice_label' => function (User $u) {
- return $this->userRender->renderString($u, []);
- },
+ ->add('user', PickUserDynamicType::class, [
'multiple' => false,
- 'label' => 'User',
+ 'label' => 'reassign.Current user',
'required' => false,
+ 'help' => 'reassign.Choose a user and click on "Filter" to apply',
]);
return $builder->getForm();
}
+
+ private function buildReassignForm(array $periodIds, ?User $userFrom): FormInterface
+ {
+ $defaultData = [
+ 'userFrom' => $userFrom,
+ 'periods' => json_encode($periodIds),
+ ];
+
+ $builder = $this->formFactory->createNamedBuilder('reassign', FormType::class, $defaultData);
+
+ if (null !== $userFrom) {
+ $constraints = [new NotIdenticalTo(['value' => $userFrom])];
+ } else {
+ $constraints = [];
+ }
+
+ $builder
+ ->add('periods', HiddenType::class)
+ ->add('userFrom', HiddenType::class)
+ ->add('userTo', PickUserDynamicType::class, [
+ 'multiple' => false,
+ 'label' => 'reassign.Next user',
+ 'required' => true,
+ 'help' => 'reassign.All periods on this list will be reassigned to this user, excepted the one you manually reassigned before',
+ 'constraints' => [new NotNull()],
+ ]);
+
+ $builder->get('userFrom')->addModelTransformer(new CallbackTransformer(
+ static function (?User $user) {
+ if (null === $user) {
+ return '';
+ }
+
+ return $user->getId();
+ },
+ function (?string $id) {
+ if (null === $id) {
+ return null;
+ }
+
+ if (!is_int((int) $id)) {
+ throw new TransformationFailedException('the user id is not a numeric');
+ }
+
+ return $this->userRepository->find((int) $id);
+ }
+ ));
+
+ return $builder->getForm();
+ }
}
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php
index e2bb469bc..c7ce18091 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php
@@ -21,23 +21,13 @@ class LoadRelations extends Fixture implements FixtureGroupInterface
public const RELATION_KEY = 'relations';
public const RELATIONS = [
- ['title' => ['fr' => 'Mère'], 'reverseTitle' => ['fr' => 'Fille']],
- ['title' => ['fr' => 'Mère'], 'reverseTitle' => ['fr' => 'Fils']],
- ['title' => ['fr' => 'Père'], 'reverseTitle' => ['fr' => 'Fille']],
- ['title' => ['fr' => 'Père'], 'reverseTitle' => ['fr' => 'Fils']],
-
- ['title' => ['fr' => 'Frère'], 'reverseTitle' => ['fr' => 'Frère']],
- ['title' => ['fr' => 'Soeur'], 'reverseTitle' => ['fr' => 'Soeur']],
- ['title' => ['fr' => 'Frère'], 'reverseTitle' => ['fr' => 'Soeur']],
-
- ['title' => ['fr' => 'Demi-frère'], 'reverseTitle' => ['fr' => 'Demi-frère']],
- ['title' => ['fr' => 'Demi-soeur'], 'reverseTitle' => ['fr' => 'Demi-soeur']],
- ['title' => ['fr' => 'Demi-frère'], 'reverseTitle' => ['fr' => 'Demi-soeur']],
-
- ['title' => ['fr' => 'Oncle'], 'reverseTitle' => ['fr' => 'Neveu']],
- ['title' => ['fr' => 'Oncle'], 'reverseTitle' => ['fr' => 'Nièce']],
- ['title' => ['fr' => 'Tante'], 'reverseTitle' => ['fr' => 'Neveu']],
- ['title' => ['fr' => 'Tante'], 'reverseTitle' => ['fr' => 'Nièce']],
+ ['title' => ['fr' => 'Parent'], 'reverseTitle' => ['fr' => 'Enfant']],
+ ['title' => ['fr' => 'En couple'], 'reverseTitle' => ['fr' => 'En couple']],
+ ['title' => ['fr' => 'Beau parent'], 'reverseTitle' => ['fr' => 'Belle-fille·beau-fils']],
+ ['title' => ['fr' => 'Frère·Sœur'], 'reverseTitle' => ['fr' => 'Frère·Sœur']],
+ ['title' => ['fr' => 'Demi-frère·sœur'], 'reverseTitle' => ['fr' => 'Demi-frère·sœur']],
+ ['title' => ['fr' => 'Grand-parent'], 'reverseTitle' => ['fr' => 'Petit-enfant']],
+ ['title' => ['fr' => 'Oncle·Tante'], 'reverseTitle' => ['fr' => 'Neveu·Nièce']],
];
public static function getGroups(): array
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
index 4fa9802f8..18b2788f6 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
@@ -21,6 +21,7 @@ use Doctrine\Common\DataFixtures\DependentFixtureInterface;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\Persistence\ObjectManager;
+use function array_key_exists;
use function count;
class LoadRelationships extends Fixture implements DependentFixtureInterface
@@ -34,7 +35,7 @@ class LoadRelationships extends Fixture implements DependentFixtureInterface
$this->em = $em;
}
- public function getDependencies()
+ public function getDependencies(): array
{
return [
LoadPeople::class,
@@ -42,9 +43,11 @@ class LoadRelationships extends Fixture implements DependentFixtureInterface
];
}
- public function load(ObjectManager $manager)
+ public function load(ObjectManager $manager): void
{
- for ($i = 0; 15 > $i; ++$i) {
+ $existing = [];
+
+ for ($i = 0; 20 > $i; ++$i) {
$user = $this->getRandomUser();
$date = new DateTimeImmutable();
$relationship = (new Relationship())
@@ -57,6 +60,17 @@ class LoadRelationships extends Fixture implements DependentFixtureInterface
->setUpdatedBy($user)
->setCreatedAt($date)
->setUpdatedAt($date);
+
+ // remove the potential duplicates
+ $set = $relationship->getFromPerson()->getId() < $relationship->getToPerson()->getId() ?
+ [$relationship->getFromPerson()->getId(), $relationship->getToPerson()->getId()] :
+ [$relationship->getToPerson()->getId(), $relationship->getFromPerson()->getId()];
+
+ if (array_key_exists($set[0], $existing) && array_key_exists($set[1], $existing[$set[0]])) {
+ continue;
+ }
+
+ $existing[$set[0]][$existing[$set[1]]] = 1;
$manager->persist($relationship);
}
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 6d2bf6d18..99c408ff1 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -555,6 +555,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
'methods' => [
Request::METHOD_GET => true,
Request::METHOD_HEAD => true,
+ Request::METHOD_POST => true,
],
],
'suggestHouseholdByAccompanyingPeriodParticipation' => [
@@ -873,6 +874,12 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
AccompanyingPeriodVoter::EDIT,
AccompanyingPeriodVoter::DELETE,
],
+ AccompanyingPeriodVoter::REASSIGN_BULK => [
+ AccompanyingPeriodVoter::CONFIDENTIAL_CRUD,
+ ],
+ AccompanyingPeriodVoter::TOGGLE_CONFIDENTIAL => [
+ AccompanyingPeriodVoter::CONFIDENTIAL_CRUD,
+ ],
],
]);
}
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index bd3211c5d..e8108bcce 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -361,6 +361,8 @@ class AccompanyingPeriod implements
*/
private Collection $userHistories;
+ private bool $userIsChanged = false;
+
/**
* Temporary field, which is filled when the user is changed.
*
@@ -551,8 +553,6 @@ class AccompanyingPeriod implements
* 'now'.
*
* @param mixed $person
- *
- * @return void
*/
public function closeParticipationFor($person): ?AccompanyingPeriodParticipation
{
@@ -978,6 +978,11 @@ class AccompanyingPeriod implements
return null !== $this->userPrevious;
}
+ public function isChangedUser(): bool
+ {
+ return $this->userIsChanged && $this->user !== $this->userPrevious;
+ }
+
/**
* Returns true if the closing date is after the opening date.
*/
@@ -1103,6 +1108,14 @@ class AccompanyingPeriod implements
$this->setStep(AccompanyingPeriod::STEP_CONFIRMED);
}
+ public function resetPreviousUser(): self
+ {
+ $this->userPrevious = null;
+ $this->userIsChanged = false;
+
+ return $this;
+ }
+
/**
* @Groups({"write"})
*/
@@ -1243,10 +1256,6 @@ class AccompanyingPeriod implements
*/
public function setPinnedComment(?Comment $comment = null): self
{
- if (null !== $this->pinnedComment) {
- $this->removeComment($this->pinnedComment);
- }
-
if (null !== $this->pinnedComment) {
$this->addComment($this->pinnedComment);
}
@@ -1329,6 +1338,7 @@ class AccompanyingPeriod implements
{
if ($this->user !== $user) {
$this->userPrevious = $this->user;
+ $this->userIsChanged = true;
foreach ($this->userHistories as $history) {
if (null === $history->getEndDate()) {
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index 95ec008d9..055507162 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -57,6 +57,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
* orphanRemoval=true
* )
* @Serializer\Groups({"read", "docgen:read"})
+ * @ORM\OrderBy({"startDate": "DESC", "id": "DESC"})
*
* @internal /!\ the serialization for write evaluations is handled in `AccompanyingPeriodWorkDenormalizer`
*/
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
index ed3200370..615c33825 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
@@ -77,6 +77,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
* cascade={"remove", "persist"},
* orphanRemoval=true
* )
+ * @ORM\OrderBy({"createdAt": "DESC", "id": "DESC"})
* @Serializer\Groups({"read"})
*/
private Collection $documents;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
index b31225df1..5e412a82c 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
@@ -13,13 +13,12 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
use Chill\DocStoreBundle\Entity\StoredObject;
-use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use Chill\MainBundle\Entity\User;
-use DateTimeInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
use Doctrine\ORM\Mapping as ORM;
use RuntimeException;
use Symfony\Component\Serializer\Annotation as Serializer;
+use Symfony\Component\Validator\Constraints as Assert;
/**
* @ORM\Entity
@@ -30,6 +29,10 @@ use Symfony\Component\Serializer\Annotation as Serializer;
*/
class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doctrine\Model\TrackCreationInterface, \Chill\MainBundle\Doctrine\Model\TrackUpdateInterface
{
+ use TrackCreationTrait;
+
+ use TrackUpdateTrait;
+
/**
* @ORM\ManyToOne(
* targetEntity=AccompanyingPeriodWorkEvaluation::class,
@@ -38,22 +41,6 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
*/
private ?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation = null;
- /**
- * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
- * @Serializer\Groups({"read"})
- * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
- */
- private ?\DateTimeImmutable $createdAt = null;
-
- /**
- * @ORM\ManyToOne(
- * targetEntity=User::class
- * )
- * @Serializer\Groups({"read"})
- * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
- */
- private ?User $createdBy = null;
-
/**
* @ORM\Id
* @ORM\GeneratedValue
@@ -88,6 +75,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
* @Serializer\Groups({"read"})
* @Serializer\Groups({"write"})
* @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+ * @Assert\Valid
*/
private ?StoredObject $storedObject = null;
@@ -108,40 +96,11 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
*/
private ?string $title = '';
- /**
- * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
- * @Serializer\Groups({"read"})
- * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
- */
- private ?\DateTimeImmutable $updatedAt = null;
-
- /**
- * @ORM\ManyToOne(
- * targetEntity=User::class
- * )
- * @Serializer\Groups({"read"})
- * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
- */
- private ?User $updatedBy = null;
-
public function getAccompanyingPeriodWorkEvaluation(): ?AccompanyingPeriodWorkEvaluation
{
return $this->accompanyingPeriodWorkEvaluation;
}
- /**
- * @return \DateTimeImmutable|null
- */
- public function getCreatedAt(): ?DateTimeInterface
- {
- return $this->createdAt;
- }
-
- public function getCreatedBy(): ?User
- {
- return $this->createdBy;
- }
-
public function getId(): ?int
{
return $this->id;
@@ -170,19 +129,6 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
return $this->title;
}
- /**
- * @return DateTimeImmutable|null
- */
- public function getUpdatedAt(): ?DateTimeInterface
- {
- return $this->updatedAt;
- }
-
- public function getUpdatedBy(): ?User
- {
- return $this->updatedBy;
- }
-
public function setAccompanyingPeriodWorkEvaluation(?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation): AccompanyingPeriodWorkEvaluationDocument
{
// if an evaluation is already associated, we cannot change the association (removing the association,
@@ -200,20 +146,6 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
return $this;
}
- public function setCreatedAt(DateTimeInterface $datetime): TrackCreationInterface
- {
- $this->createdAt = $datetime;
-
- return $this;
- }
-
- public function setCreatedBy(User $user): TrackCreationInterface
- {
- $this->createdBy = $user;
-
- return $this;
- }
-
/**
* @param mixed $key
*
@@ -246,18 +178,4 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
return $this;
}
-
- public function setUpdatedAt(DateTimeInterface $datetime): TrackUpdateInterface
- {
- $this->updatedAt = $datetime;
-
- return $this;
- }
-
- public function setUpdatedBy(User $user): TrackUpdateInterface
- {
- $this->updatedBy = $user;
-
- return $this;
- }
}
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
index 105633e43..1fe398290 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
@@ -19,6 +19,7 @@ use DateTimeInterface;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Validator\Constraints as Assert;
/**
* @ORM\Entity
@@ -40,6 +41,8 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
/**
* @ORM\Column(type="text")
* @Groups({"read", "write"})
+ * @Assert\NotBlank
+ * @Assert\NotNull
*/
private $content;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
index 2620ed19a..19bda3785 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
@@ -151,6 +151,9 @@ class Household
return $this->addresses;
}
+ /**
+ * @return array|Address[]
+ */
public function getAddressesOrdered(): array
{
$addresses = $this->getAddresses()->toArray();
@@ -514,6 +517,8 @@ class Household
if ($iterator->valid()) {
$current->setValidTo($iterator->current()->getValidFrom());
+ } else {
+ $current->setValidTo(null);
}
}
}
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
index 22c33f85f..2de526ee6 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
@@ -35,7 +35,7 @@ class HouseholdMember
/**
* @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
* @Serializer\Groups({"read", "docgen:read"})
- * @Assert\GreaterThan(
+ * @Assert\GreaterThanOrEqual(
* propertyPath="startDate",
* message="household_membership.The end date must be after start date",
* groups={"household_memberships"}
@@ -82,14 +82,13 @@ class HouseholdMember
/**
* @ORM\ManyToOne(targetEntity=Position::class)
* @Serializer\Groups({"read", "docgen:read"})
- * @Assert\NotNull(groups={"household_memberships_created"})
*/
private ?Position $position = null;
/**
* @ORM\Column(type="boolean", name="sharedhousehold")
*/
- private bool $shareHousehold = false;
+ private bool $shareHousehold = true;
/**
* @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
@@ -201,15 +200,18 @@ class HouseholdMember
return $this;
}
- public function setPosition(Position $position): self
+ public function setPosition(?Position $position): self
{
- if ($this->position instanceof Position) {
+ if ($this->position instanceof Position && $this->position !== $position) {
throw new LogicException('The position is already set. You cannot change ' .
'a position of a membership');
}
$this->position = $position;
- $this->shareHousehold = $position->getShareHousehold();
+
+ if (null !== $position) {
+ $this->shareHousehold = $position->getShareHousehold();
+ }
return $this;
}
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 880c2bd11..7da08d740 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -240,6 +240,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
*/
private array $currentHouseholdAt = [];
+ /**
+ * Cache for the computation of current household participation.
+ */
+ private array $currentHouseholdParticipationAt = [];
+
/**
* The current person address.
*
@@ -276,25 +281,21 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
/**
* The person's first name.
*
- * @var string
- *
* @ORM\Column(type="string", length=255)
* @Assert\NotBlank(message="The firstname cannot be empty")
* @Assert\Length(
* max=255,
* )
*/
- private $firstName;
+ private string $firstName = '';
/**
* fullname canonical. Read-only field, which is calculated by
* the database.
*
- * @var string
- *
* @ORM\Column(type="text", nullable=true)
*/
- private $fullnameCanonical;
+ private string $fullnameCanonical = '';
/**
* The person's gender.
@@ -328,6 +329,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
* targetEntity=HouseholdMember::class,
* mappedBy="person"
* )
+ *
+ * @var Collection|HouseholdMember[]
*/
private Collection $householdParticipations;
@@ -343,15 +346,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
/**
* The person's last name.
*
- * @var string
- *
* @ORM\Column(type="string", length=255)
* @Assert\NotBlank(message="The lastname cannot be empty")
* @Assert\Length(
* max=255,
* )
*/
- private $lastName;
+ private string $lastName = '';
/**
* The marital status of the person.
@@ -879,7 +880,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
}
/**
- * @return Collection|BudgetCharges[]
+ * @return Collection|Charge[]
*/
public function getBudgetCharges(): Collection
{
@@ -887,7 +888,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
}
/**
- * @return Collection|BudgetResources[]
+ * @return Collection|\Chill\BudgetBundle\Entity\Resource[]
*/
public function getBudgetResources(): Collection
{
@@ -1117,6 +1118,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
return $this->householdAddresses;
}
+ /**
+ * @return Collection|HouseholdMember[]
+ */
public function getHouseholdParticipations(): Collection
{
return $this->householdParticipations;
@@ -1126,6 +1130,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
* Get participation where the person does not share the household.
*
* Order by startDate, desc
+ *
+ * @return HouseholdMember[]
*/
public function getHouseholdParticipationsNotShareHousehold(): Collection
{
@@ -1146,6 +1152,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
* Get participation where the person does share the household.
*
* Order by startDate, desc
+ *
+ * @return Collection|HouseholdMember[]
*/
public function getHouseholdParticipationsShareHousehold(): Collection
{
@@ -1565,18 +1573,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
public function setEmail(?string $email): self
{
- if (null === $email) {
- $email = '';
- }
-
- $this->email = $email;
+ $this->email = trim((string) $email);
return $this;
}
- public function setFirstName(string $firstName): self
+ public function setFirstName(?string $firstName): self
{
- $this->firstName = $firstName;
+ $this->firstName = (string) $firstName;
return $this;
}
@@ -1602,9 +1606,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
return $this;
}
- public function setLastName(string $lastName): self
+ public function setLastName(?string $lastName): self
{
- $this->lastName = $lastName;
+ $this->lastName = (string) $lastName;
return $this;
}
diff --git a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
index d51881bb2..62fbb63a9 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
use Chill\MainBundle\Entity\User;
use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicate;
use DateTimeImmutable;
use DateTimeInterface;
use Doctrine\ORM\Mapping as ORM;
@@ -31,6 +32,7 @@ use Symfony\Component\Validator\Constraints as Assert;
* @DiscriminatorMap(typeProperty="type", mapping={
* "relationship": Relationship::class
* })
+ * @RelationshipNoDuplicate
*/
class Relationship implements TrackCreationInterface, TrackUpdateInterface
{
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
index ec5e5a8e5..904950489 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
@@ -128,6 +128,44 @@ class SocialAction
return $this;
}
+ /**
+ * In a SocialIssues's collection, find the elements which are an ancestor of
+ * other elements.
+ *
+ * The difference of the given list (thus, the elements which are **not** kept
+ * in the returned collection) are the most-grand-child elements of the list.
+ *
+ * Removing those elements of the Collection (which is not done by this method)
+ * will ensure that only the most descendent elements are present in the collection,
+ * (any ancestor of another element are present).
+ *
+ * @param Collection|SocialAction[] $socialActions
+ *
+ * @return Collection|SocialAction[] a list with the elements of the given list which are parent of other elements in the given list
+ */
+ public static function findAncestorSocialActions(Collection $socialActions): Collection
+ {
+ $ancestors = new ArrayCollection();
+
+ foreach ($socialActions as $candidateChild) {
+ if ($ancestors->contains($candidateChild)) {
+ continue;
+ }
+
+ foreach ($socialActions as $candidateParent) {
+ if ($ancestors->contains($candidateParent)) {
+ continue;
+ }
+
+ if ($candidateChild->isDescendantOf($candidateParent)) {
+ $ancestors->add($candidateParent);
+ }
+ }
+ }
+
+ return $ancestors;
+ }
+
/**
* @return Collection|self[]
*/
@@ -169,7 +207,7 @@ class SocialAction
}
/**
- * @return Collection|self[] All the descendants with the current entity (this)
+ * @return Collection|self[] All the descendants including the current entity (this)
*/
public function getDescendantsWithThis(): Collection
{
@@ -233,6 +271,23 @@ class SocialAction
return $this->getParent() instanceof self;
}
+ /**
+ * Recursive method which return true if the current $action
+ * is a descendant of the $action given in parameter.
+ */
+ public function isDescendantOf(SocialAction $action): bool
+ {
+ if (!$this->hasParent()) {
+ return false;
+ }
+
+ if ($this->getParent() === $action) {
+ return true;
+ }
+
+ return $this->getParent()->isDescendantOf($action);
+ }
+
public function removeChild(self $child): self
{
if ($this->children->removeElement($child)) {
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
index c735c0132..fb277f56c 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
@@ -202,7 +202,7 @@ class SocialIssue
}
/**
- * @return Collection|self[] All the descendants with the current entity (this)
+ * @return Collection|self[] All the descendants including the current entity (this)
*/
public function getDescendantsWithThis(): Collection
{
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
index 9f9c90da0..50b0f3d72 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
@@ -173,7 +173,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface
case 'countryOfBirth':
case 'nationality':
$countryRepository = $this->entityManager
- ->getRepository('ChillMainBundle:Country');
+ ->getRepository(\Chill\MainBundle\Entity\Country::class);
// load all countries in a single query
$countryRepository->findBy(['countryCode' => $values]);
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index 2aed9df97..124db26eb 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -11,10 +11,13 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Form;
+use Chill\MainBundle\Entity\Address;
use Chill\MainBundle\Form\Event\CustomizeFormEvent;
use Chill\MainBundle\Form\Type\ChillDateType;
use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
+use Chill\MainBundle\Form\Type\PickAddressType;
use Chill\MainBundle\Form\Type\PickCenterType;
+use Chill\MainBundle\Form\Type\PickCivilityType;
use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Form\Type\GenderType;
@@ -24,9 +27,12 @@ use libphonenumber\PhoneNumberType;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\EmailType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Callback;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
final class CreationPersonType extends AbstractType
{
@@ -55,6 +61,11 @@ final class CreationPersonType extends AbstractType
$builder
->add('firstName')
->add('lastName')
+ ->add('civility', PickCivilityType::class, [
+ 'required' => false,
+ 'label' => 'Civility',
+ 'placeholder' => 'choose civility',
+ ])
->add('gender', GenderType::class, [
'required' => true, 'placeholder' => null,
])
@@ -71,6 +82,17 @@ final class CreationPersonType extends AbstractType
])
->add('email', EmailType::class, [
'required' => false,
+ ])
+ ->add('addressForm', CheckboxType::class, [
+ 'label' => 'Create a household and add an address',
+ 'required' => false,
+ 'mapped' => false,
+ 'help' => 'A new household will be created. The person will be member of this household.',
+ ])
+ ->add('address', PickAddressType::class, [
+ 'required' => false,
+ 'mapped' => false,
+ 'label' => false,
]);
if ($this->askCenters) {
@@ -97,6 +119,9 @@ final class CreationPersonType extends AbstractType
{
$resolver->setDefaults([
'data_class' => Person::class,
+ 'constraints' => [
+ new Callback([$this, 'validateCheckedAddress']),
+ ],
]);
}
@@ -107,4 +132,18 @@ final class CreationPersonType extends AbstractType
{
return self::NAME;
}
+
+ public function validateCheckedAddress($data, ExecutionContextInterface $context, $payload): void
+ {
+ /** @var bool $addressFrom */
+ $addressFrom = $context->getObject()->get('addressForm')->getData();
+ /** @var ?Address $address */
+ $address = $context->getObject()->get('address')->getData();
+
+ if ($addressFrom && null === $address) {
+ $context->buildViolation('person_creation.If you want to create an household, an address is required')
+ ->atPath('addressForm')
+ ->addViolation();
+ }
+ }
}
diff --git a/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php b/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php
index 5e7ed4043..1db70bce5 100644
--- a/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php
+++ b/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php
@@ -44,7 +44,7 @@ class PersonToIdTransformer implements DataTransformerInterface
}
$issue = $this->om
- ->getRepository('ChillPersonBundle:Person')
+ ->getRepository(\Chill\PersonBundle\Entity\Person::class)
->findOneBy(['id' => $id]);
if (null === $issue) {
diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
index 99c698c91..192142043 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
@@ -26,12 +26,15 @@ class HouseholdMemberType extends AbstractType
'input' => 'datetime_immutable',
]);
- if (!$options['data']->getPosition()->getShareHousehold()) {
- $builder->add('endDate', ChillDateType::class, [
- 'label' => 'household.End date',
- 'input' => 'datetime_immutable',
- ]);
+ if (null !== $options['data']->getPosition()) {
+ if (!$options['data']->getPosition()->getShareHousehold()) {
+ $builder->add('endDate', ChillDateType::class, [
+ 'label' => 'household.End date',
+ 'input' => 'datetime_immutable',
+ ]);
+ }
}
+
$builder
->add('comment', ChillTextareaType::class, [
'label' => 'household.Comment',
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
index aeab09fea..31af0a649 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
@@ -29,8 +29,12 @@ use Symfony\Contracts\Translation\TranslatorInterface;
final class PersonResourceType extends AbstractType
{
+ private PersonRenderInterface $personRender;
+
private ResourceKindRender $resourceKindRender;
+ private ThirdPartyRender $thirdPartyRender;
+
private TranslatorInterface $translator;
public function __construct(ResourceKindRender $resourceKindRender, PersonRenderInterface $personRender, ThirdPartyRender $thirdPartyRender, TranslatorInterface $translator)
diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
index e327efbab..8ae41a98b 100644
--- a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
+++ b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
@@ -55,14 +55,12 @@ class MembersEditor
$this->eventDispatcher = $eventDispatcher;
}
- public function addMovement(DateTimeImmutable $date, Person $person, Position $position, ?bool $holder = false, ?string $comment = null): self
+ public function addMovement(DateTimeImmutable $date, Person $person, ?Position $position, ?bool $holder = false, ?string $comment = null): self
{
if (null === $this->household) {
throw new LogicException('You must define a household first');
}
- $event = new PersonAddressMoveEvent($person);
-
$membership = (new HouseholdMember())
->setStartDate($date)
->setPerson($person)
@@ -70,39 +68,77 @@ class MembersEditor
->setHolder($holder)
->setComment($comment);
$this->household->addMember($membership);
- $event->setNextMembership($membership);
- if ($position->getShareHousehold()) {
- foreach ($person->getHouseholdParticipationsShareHousehold() as $participation) {
- if ($participation === $membership) {
- continue;
+ if (null !== $position) {
+ if ($position->getShareHousehold()) {
+ // launch event only if moving to a "share household" position,
+ // and if the destination household is different than the previous one
+ $event = new PersonAddressMoveEvent($person);
+ $event->setNextMembership($membership);
+
+ $counter = 0;
+
+ foreach ($person->getHouseholdParticipationsShareHousehold() as $participation) {
+ if ($participation === $membership) {
+ continue;
+ }
+
+ if ($participation->getStartDate() > $membership->getStartDate()) {
+ continue;
+ }
+
+ ++$counter;
+
+ if ($participation->getEndDate() === null || $participation->getEndDate() > $date) {
+ $participation->setEndDate($date);
+ $this->membershipsAffected[] = $participation;
+ $this->oldMembershipsHashes[] = spl_object_hash($participation);
+
+ if ($participation->getHousehold() !== $this->household) {
+ $event->setPreviousMembership($participation);
+ $this->events[] = $event;
+ }
+ }
}
- if ($participation->getStartDate() > $membership->getStartDate()) {
- continue;
+ // send also the event if there was no participation before
+ if (0 === $counter) {
+ $this->events[] = $event;
}
- if ($participation->getEndDate() === null || $participation->getEndDate() > $date) {
- $event->setPreviousMembership($participation);
- $participation->setEndDate($date);
- $this->membershipsAffected[] = $participation;
- $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());
+ }
+ }
+ } else {
+ // if a members is moved to the same household than the one he belongs to,
+ // we should make it leave the household
+ if ($person->getCurrentHousehold($date) === $this->household) {
+ $this->leaveMovement($date, $person);
}
- }
- 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());
+ // if there are multiple belongings not sharing household, close the others
+ foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) {
+ if ($participation === $membership) {
+ continue;
+ }
+
+ if ($participation->getHousehold() === $this->household
+ && ($participation->getEndDate() === null || $participation->getEndDate() > $membership->getStartDate())
+ && $participation->getStartDate() <= $membership->getStartDate()
+ ) {
+ $participation->setEndDate($membership->getStartDate());
+ }
}
}
}
$this->membershipsAffected[] = $membership;
$this->persistables[] = $membership;
- $this->events[] = $event;
return $this;
}
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index 80da956c4..103fd2b88 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -88,7 +88,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
->setExtras([
'order' => 99999,
]);
-
+ /*
$menu->addChild($this->translator->trans('Person duplicate'), [
'route' => 'chill_person_duplicate_view',
'routeParameters' => [
@@ -98,7 +98,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
->setExtras([
'order' => 99999,
]);
-
+ */
if (
'visible' === $this->showAccompanyingPeriod
&& $this->security->isGranted(AccompanyingPeriodVoter::SEE, $parameters['person'])
diff --git a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
index c95c5caf5..722598ef7 100644
--- a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Menu;
use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
use Chill\PersonBundle\Security\Authorization\PersonVoter;
use Knp\Menu\MenuItem;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
@@ -64,13 +65,15 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
]);
}
- $menu->addChild($this->translator->trans('Accompanying courses of users'), [
- 'route' => 'chill_course_list_reassign',
- ])
- ->setExtras([
- 'order' => 12,
- 'icons' => ['task'],
- ]);
+ if ($this->authorizationChecker->isGranted(AccompanyingPeriodVoter::REASSIGN_BULK, null)) {
+ $menu->addChild($this->translator->trans('reassign.Bulk reassign'), [
+ 'route' => 'chill_course_list_reassign',
+ ])
+ ->setExtras([
+ 'order' => 40,
+ 'icons' => [],
+ ]);
+ }
}
public static function getMenuIds(): array
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
index 78745af1d..d5dc3cd7d 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -133,11 +133,14 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
$pertinence = [];
$pertinenceArgs = [];
- $orWhereSearchClause = [];
- $orWhereSearchClauseArgs = [];
+ $andWhereSearchClause = [];
+ $andWhereSearchClauseArgs = [];
- if ('' !== $default) {
+ if ('' !== trim($default)) {
foreach (explode(' ', $default) as $str) {
+ if ('' === trim($str)) {
+ continue;
+ }
$pertinence[] =
'STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), person.fullnamecanonical) + ' .
"(person.fullnamecanonical LIKE '%' || LOWER(UNACCENT(?)) || '%')::int + " .
@@ -145,15 +148,15 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
'(starts_with(LOWER(UNACCENT(lastname)), UNACCENT(LOWER(?))))::int';
array_push($pertinenceArgs, $str, $str, $str, $str);
- $orWhereSearchClause[] =
+ $andWhereSearchClause[] =
'(LOWER(UNACCENT(?)) <<% person.fullnamecanonical OR ' .
"person.fullnamecanonical LIKE '%' || LOWER(UNACCENT(?)) || '%' )";
- array_push($orWhereSearchClauseArgs, $str, $str);
+ array_push($andWhereSearchClauseArgs, $str, $str);
}
$query->andWhereClause(
- implode(' OR ', $orWhereSearchClause),
- $orWhereSearchClauseArgs
+ implode(' AND ', $andWhereSearchClause),
+ $andWhereSearchClauseArgs
);
} else {
$pertinence = ['1'];
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss
index 2383e43b1..30cac9c85 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss
@@ -30,6 +30,7 @@ div.list-with-period {
// override wrap-list
div.wrap-list.periods-list {
+ padding-right: 1rem;
div.wl-row {
flex-wrap: nowrap;
div.wl-col {
@@ -63,6 +64,7 @@ div.list-with-period {
}
div.periods-list {
+ padding-right: 1rem;
div.title {
text-align: right;
div.date {}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person/create-person.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person/create-person.js
new file mode 100644
index 000000000..7e29c4530
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person/create-person.js
@@ -0,0 +1,18 @@
+import { ShowHide } from 'ShowHide';
+
+const addressForm = document.getElementById("addressForm");
+const address = document.getElementById("address");
+
+new ShowHide({
+ froms: [addressForm],
+ container: [address],
+ test: function(froms) {
+ for (let f of froms.values()) {
+ for (let input of f.querySelectorAll('input').values()) {
+ return input.checked;
+ }
+ }
+ return false;
+ },
+ event_name: 'change'
+});
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index 1a1a7e26e..ff8aef961 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -123,6 +123,7 @@ export default {
body.email = payload.data.email;
body.altNames = payload.data.altNames;
body.gender = payload.data.gender;
+ body.civility = payload.data.civility;
makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
.then(response => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
index e9b9695ab..7287437a3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
@@ -10,7 +10,7 @@
{{ $tc('resources.counter', counter) }}
-
+
{
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue
index 349581452..b6a55ef39 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue
@@ -5,9 +5,8 @@
-
{{ $t('startdate.date') }}
-
@@ -17,30 +16,54 @@
\ No newline at end of file
+
+
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index f1e2de958..44238b0c7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -59,8 +59,8 @@ const appMessages = {
ok: "Oui, l'usager quitte le parcours",
show_household_number: "Voir le ménage (n° {id})",
show_household: "Voir le ménage",
- person_without_household_warning: "Certaines usagers n'appartiennent actuellement à aucun ménage. Renseignez leur appartenance dès que possible.",
- update_household: "Renseigner l'appartenance",
+ person_without_household_warning: "Certaines usagers n'appartiennent actuellement à aucun ménage. Veuillez les associer à un ménage dès que possible.",
+ update_household: "Associer à un ménage",
participation_not_valid: "Sélectionnez ou créez au minimum 1 usager",
},
requestor: {
@@ -153,7 +153,7 @@ const appMessages = {
},
startdate: {
change: "Date d'ouverture",
- date: "Date d'ouverture",
+ // update: "La nouvelle date d'ouverture a été enregistrée"
},
// catch errors
'Error while updating AccompanyingPeriod Course.': "Erreur du serveur lors de la mise à jour du parcours d'accompagnement.",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 06a3606ab..57415565b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -322,7 +322,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
}
},
updateStartDate(state, date) {
- console.log('new state date', date)
state.accompanyingCourse.openingDate = date;
}
},
@@ -814,11 +813,9 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
})
},
updateStartDate({commit}, payload) {
- console.log('payload', payload)
- const date = ISOToDate(payload);
const url = `/api/1.0/person/accompanying-course/${id}.json`;
- const body = { type: "accompanying_period", openingDate: { datetime: datetimeToISO(date) }};
- console.log('body', body)
+ const date = payload === null || payload === '' ? null : { datetime: datetimeToISO(ISOToDate(payload)) }
+ const body = { type: "accompanying_period", openingDate: date};
return makeFetch('PATCH', url, body)
.then((response) => {
commit('updateStartDate', response.openingDate);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
index 503a00c59..758cd7e5e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
@@ -227,19 +227,18 @@ export default {
},
startDate: {
get() {
- let d = this.$store.state.startDate;
- return dateToISO(d);
+ return this.$store.state.startDate;
},
set(value) {
- this.$store.commit('setStartDate', ISOToDate(value));
+ this.$store.commit('setStartDate', value);
}
},
endDate: {
get() {
- return dateToISO(this.$store.state.endDate);
+ return this.$store.state.endDate;
},
set(value) {
- this.$store.commit('setEndDate', ISOToDate(value));
+ this.$store.commit('setEndDate', value);
}
},
setSocialIssue: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js
index 408115257..3c2e034d7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js
@@ -1,6 +1,6 @@
import { createStore } from 'vuex';
-import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
+import { datetimeToISO, dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
// import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
@@ -20,7 +20,7 @@ const store = createStore({
.map(p => p.person),
personsReachables: window.accompanyingCourse.participations.filter(p => p.endDate == null)
.map(p => p.person),
- startDate: new Date(),
+ startDate: dateToISO(new Date()),
endDate: null,
isLoadingSocialActions: false,
isPostingWork: false,
@@ -47,7 +47,7 @@ const store = createStore({
id: state.socialActionPicked.id
},
startDate: {
- datetime: datetimeToISO(state.startDate)
+ datetime: datetimeToISO(ISOToDate(state.startDate))
},
persons: []
};
@@ -61,7 +61,7 @@ const store = createStore({
if (null !== state.endDate) {
payload.endDate = {
- datetime: datetimeToISO(state.endDate)
+ datetime: datetimeToISO(ISOToDate(state.endDate))
};
}
@@ -111,6 +111,7 @@ const store = createStore({
state.startDate = date;
},
setEndDate(state, date) {
+ console.log(date)
state.endDate = date;
},
setPersonsPickedIds(state, ids) {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index bcfa53e45..bab64018a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -439,18 +439,18 @@ export default {
]),
startDate: {
get() {
- return dateToISO(this.$store.state.startDate);
+ return this.$store.state.startDate;
},
set(v) {
- this.$store.commit('setStartDate', ISOToDate(v));
+ this.$store.commit('setStartDate', v);
}
},
endDate: {
get() {
- return dateToISO(this.$store.state.endDate);
+ return this.$store.state.endDate;
},
set(v) {
- this.$store.commit('setEndDate', ISOToDate(v));
+ this.$store.commit('setEndDate', v);
}
},
note: {
@@ -521,12 +521,12 @@ export default {
this.$store.commit('removeReferrer', u);
},
goToGenerateWorkflow({link}) {
- console.log('save before leave to generate workflow')
- const callback = (data) => {
- window.location.assign(link);
- };
+ // console.log('save before leave to generate workflow')
+ const callback = (data) => {
+ window.location.assign(link);
+ };
- return this.$store.dispatch('submit', callback)
+ return this.$store.dispatch('submit', callback)
.catch(e => { console.log(e); throw e; });
},
submit() {
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 eff62bbbb..b1e657554 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -67,14 +67,17 @@
-
@@ -138,12 +141,12 @@
@go-to-generate-document="submitBeforeGenerate"
>
- {{ $t('evaluation_generate_a_document') }}
+ {{ $t('evaluation_generate_a_document') }}
-
{{ $t('document_upload') }}
-
+ {{ $t('document_upload') }}
+
{
- let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id;
+ const callback = (data) => {
+ let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id;
- window.location.assign(buildLink(template, evaluationId, 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation'));
- };
+ window.location.assign(buildLink(template, evaluationId, 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation'));
+ };
- return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; });
+ return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; });
},
onInputDocumentTitle(event) {
const id = Number(event.target.id);
@@ -392,27 +396,30 @@ export default {
},
removeDocument(document) {
if (window.confirm("Êtes-vous sûr·e de vouloir supprimer le document qui a pour titre \"" + document.title +"\" ?")) {
- this.$store.commit('removeDocument', {key: this.evaluation.key, document: document});
+ this.$store.commit('removeDocument', {key: this.evaluation.key, document: document});
}
},
goToGenerateWorkflowEvaluationDocument({event, link, workflowName, payload}) {
- const callback = (data) => {
- let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
- let updatedDocument = evaluation.documents.find(d => d.key === payload.doc.key);
- window.location.assign(buildLinkCreate(workflowName,
- 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', updatedDocument.id));
- };
+ const callback = (data) => {
+ let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
+ let updatedDocument = evaluation.documents.find(d => d.key === payload.doc.key);
+ window.location.assign(buildLinkCreate(workflowName,
+ 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', updatedDocument.id));
+ };
- return this.$store.dispatch('submit', callback)
- .catch(e => { console.log(e); throw e; });
- },
+ return this.$store.dispatch('submit', callback)
+ .catch(e => { console.log(e); throw e; });
+ },
},
}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 4ce0b8ebe..d5437b0a7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -1,5 +1,5 @@
import { createStore } from 'vuex';
-import { datetimeToISO, ISOToDatetime, intervalDaysToISO, intervalISOToDays } from 'ChillMainAssets/chill/js/date.js';
+import { dateToISO, ISOToDate, datetimeToISO, ISOToDatetime, intervalDaysToISO, intervalISOToDays } from 'ChillMainAssets/chill/js/date.js';
import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
import { fetchResults, makeFetch } from 'ChillMainAssets/lib/api/apiMethods.js';
@@ -13,9 +13,9 @@ const store = createStore({
state: {
work: window.accompanyingCourseWork,
startDate: window.accompanyingCourseWork.startDate !== null ?
- ISOToDatetime(window.accompanyingCourseWork.startDate.datetime) : null,
+ dateToISO(new Date(window.accompanyingCourseWork.startDate.datetime)) : null,
endDate: window.accompanyingCourseWork.endDate !== null ?
- ISOToDatetime(window.accompanyingCourseWork.endDate.datetime) : null,
+ dateToISO(new Date(window.accompanyingCourseWork.endDate.datetime)) : null,
note: window.accompanyingCourseWork.note,
goalsPicked: window.accompanyingCourseWork.goals,
goalsForAction: [],
@@ -72,11 +72,11 @@ const store = createStore({
return {
type: 'accompanying_period_work',
id: state.work.id,
- startDate: state.startDate === null ? null : {
- datetime: datetimeToISO(state.startDate)
+ startDate: state.startDate === null || state.startDate === '' ? null : {
+ datetime: datetimeToISO(ISOToDate(state.startDate))
},
- endDate: state.endDate === null ? null : {
- datetime: datetimeToISO(state.endDate)
+ endDate: state.endDate === null || state.endDate === '' ? null : {
+ datetime: datetimeToISO(ISOToDate(state.endDate))
},
note: state.note,
persons: state.personsPicked.map(p => ({id: p.id, type: p.type})),
@@ -110,9 +110,9 @@ const store = createStore({
id: e.evaluation.id,
type: e.evaluation.type
},
- startDate: e.startDate !== null ? { datetime: datetimeToISO(e.startDate) } : null,
- endDate: e.endDate !== null ? { datetime: datetimeToISO(e.endDate) } : null,
- maxDate: e.maxDate !== null ? { datetime: datetimeToISO(e.maxDate) } : null,
+ startDate: e.startDate === null || e.startDate === '' ? null : { datetime: datetimeToISO(ISOToDate(e.startDate)) },
+ endDate: e.endDate === null || e.endDate === '' ? null : { datetime: datetimeToISO(ISOToDate(e.endDate)) },
+ maxDate: e.maxDate === null || e.maxDate === '' ? null : { datetime: datetimeToISO(ISOToDate(e.maxDate)) },
warningInterval: intervalDaysToISO(e.warningInterval),
comment: e.comment,
documents: e.documents
@@ -132,9 +132,9 @@ const store = createStore({
var k = Object.assign(e, {
key: index,
editEvaluation: false,
- startDate: e.startDate !== null ? ISOToDatetime(e.startDate.datetime) : null,
- endDate: e.endDate !== null ? ISOToDatetime(e.endDate.datetime) : null,
- maxDate: e.maxDate !== null ? ISOToDatetime(e.maxDate.datetime) : null,
+ startDate: e.startDate !== null ? dateToISO(new Date(e.startDate.datetime)) : null,
+ endDate: e.endDate !== null ? dateToISO(new Date(e.endDate.datetime)) : null,
+ maxDate: e.maxDate !== null ? dateToISO(new Date(e.maxDate.datetime)) : null,
warningInterval: e.warningInterval !== null ? intervalISOToDays(e.warningInterval) : null,
documents: e.documents.map((d, docIndex) => {
return Object.assign(d, {
@@ -244,7 +244,7 @@ const store = createStore({
type: "accompanying_period_work_evaluation",
key: state.evaluationsPicked.length + 1,
evaluation: evaluation,
- startDate: new Date(),
+ startDate: dateToISO(new Date()),
endDate: null,
maxDate: null,
warningInterval: null,
@@ -264,6 +264,7 @@ const store = createStore({
.startDate = date;
},
setEvaluationEndDate(state, {key, date}) {
+ console.log('commit date', date)
state.evaluationsPicked.find(e => e.key === key)
.endDate = date;
},
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 94c1a146a..03feb0329 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue
@@ -53,7 +53,7 @@ export default {
return null;
},
set(value) {
- this.$store.commit('setHouseholdCompositionType', value);
+ this.$store.dispatch('setHouseholdCompositionType', value);
},
},
numberOfChildren: {
@@ -66,18 +66,19 @@ export default {
},
startDate: {
get() {
- return [
- this.$store.state.startDate.getFullYear(),
- (this.$store.state.startDate.getMonth() + 1).toString().padStart(2, '0'),
- this.$store.state.startDate.getDate().toString().padStart(2, '0')
- ].join('-');
+ return this.$store.state.startDate;
+ // return [
+ // this.$store.state.startDate.getFullYear(),
+ // (this.$store.state.startDate.getMonth() + 1).toString().padStart(2, '0'),
+ // this.$store.state.startDate.getDate().toString().padStart(2, '0')
+ // ].join('-');
},
set(value) {
- let
- [year, month, day] = value.split('-'),
- dValue = new Date(year, month-1, day);
+ // let
+ // [year, month, day] = value.split('-'),
+ // dValue = new Date(year, month-1, day);
- this.$store.dispatch('setStartDate', dValue);
+ this.$store.dispatch('setStartDate', value);
}
}
}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
index cc5ab497c..f3801576d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -2,7 +2,7 @@ import { createStore } from 'vuex';
import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod, fetchAddressSuggestionByPerson} from './../api.js';
import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods.js'
import { fetchHouseholdByAddressReference } from 'ChillPersonAssets/lib/household.js';
-import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
+import { datetimeToISO, dateToISO, ISOToDate } from 'ChillMainAssets/chill/js/date.js';
const debug = process.env.NODE_ENV !== 'production';
@@ -30,7 +30,7 @@ const store = createStore({
}
return 0;
}),
- startDate: new Date(),
+ startDate: dateToISO(new Date()),
/**
* Indicates if the destination is:
*
@@ -278,7 +278,7 @@ const store = createStore({
type: conc.person.type
},
start_date: {
- datetime: datetimeToISO(state.startDate)
+ datetime: state.startDate === null || state.startDate === '' ? null : datetimeToISO(ISOToDate(state.startDate))
}
};
@@ -302,7 +302,7 @@ const store = createStore({
},
number_of_children: state.numberOfChildren,
start_date: {
- datetime: datetimeToISO(state.startDate),
+ datetime: datetimeToISO(ISOToDate(state.startDate)),
},
};
}
@@ -430,7 +430,7 @@ const store = createStore({
state.householdCompositionTypes = types;
},
setHouseholdCompositionType(state, id) {
- state.householdCompositionType = state.householdCompositionTypes.find(t => t.id = id);
+ state.householdCompositionType = state.householdCompositionTypes.find(t => t.id === id);
},
setNumberOfChildren(state, number) {
state.numberOfChildren = Number.parseInt(number);
@@ -495,6 +495,12 @@ const store = createStore({
setComment({ commit }, payload) {
commit('setComment', payload);
},
+ setHouseholdCompositionTypes({ commit }, payload) {
+ commit('setHouseholdCompositionTypes', payload);
+ },
+ setHouseholdCompositionType({ commit }, payload) {
+ commit('setHouseholdCompositionType', payload);
+ },
fetchHouseholdSuggestionForConcerned({ commit, state }, person) {
fetchHouseholdSuggestionByAccompanyingPeriod(person.id)
.then(households => {
@@ -597,7 +603,7 @@ if (concerned.length > 0) {
}
fetchResults(`/api/1.0/person/houehold/composition/type.json`).then(types => {
- store.commit('setHouseholdCompositionTypes', types);
+ store.dispatch('setHouseholdCompositionTypes', types);
})
export { store };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
index f5db187b9..f86c68576 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
@@ -472,15 +472,25 @@ export default {
case 'create':
return postRelationship(this.modal.data)
- .then(relationship => new Promise(resolve => {
- //console.log('post relationship response', relationship)
- this.$store.dispatch('addLinkFromRelationship', relationship)
- this.modal.showModal = false
- this.resetForm()
- this.forceUpdateComponent()
- resolve()
- }))
- .catch()
+ .then(relationship => new Promise(resolve => {
+ //console.log('post relationship response', relationship)
+ this.$store.dispatch('addLinkFromRelationship', relationship)
+ this.modal.showModal = false
+ this.resetForm()
+ this.forceUpdateComponent()
+ resolve()
+ }))
+ .catch( error => {
+ if (error.name === 'ValidationException') {
+ for (let v of error.violations) {
+ this.$toast.open({message: v });
+ console.log(v)
+ }
+ } else {
+ this.$toast.open({message: 'An error occurred'});
+ }
+ }
+ )
case 'edit':
return patchRelationship(this.modal.data)
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/api.js
index 448ff6633..01c335436 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/api.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/api.js
@@ -1,50 +1,5 @@
-import { splitId } from './vis-network'
-
-/**
- * @function makeFetch
- * @param method
- * @param url
- * @param body
- * @returns {Promise}
- */
-const makeFetch = (method, url, body) => {
- return fetch(url, {
- method: method,
- headers: {
- 'Content-Type': 'application/json;charset=utf-8'
- },
- body: (body !== null) ? JSON.stringify(body) : null
- })
- .then(response => {
-
- if (response.ok) {
- return response.json();
- }
-
- if (response.status === 422) {
- return response.json().then(violations => {
- throw ValidationException(violations)
- });
- }
-
- throw {
- msg: 'Error while updating AccompanyingPeriod Course.',
- sta: response.status,
- txt: response.statusText,
- err: new Error(),
- body: response.body
- };
- });
-}
-
-/**
- * @param violations
- * @constructor
- */
-const ValidationException = (violations) => {
- this.violations = violations
- this.name = 'ValidationException'
-}
+import { splitId } from './vis-network';
+import {makeFetch} from 'ChillMainAssets/lib/api/apiMethods.js';
/**
* @function getFetch
@@ -136,7 +91,7 @@ const getRelationsList = () => {
* @returns {Promise}
*/
const postRelationship = (relationship) => {
- //console.log(relationship)
+ //console.log(relationship);
return postFetch(
`/api/1.0/relations/relationship.json`,
{
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/index.js
index 5e8989e49..a64afd4a1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/index.js
@@ -3,8 +3,10 @@ import { store } from "./store.js"
import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
import { visMessages } from './i18n'
import App from './App.vue'
+import VueToast from 'vue-toast-notification';
+import 'vue-toast-notification/dist/theme-sugar.css';
-import './vis-network'
+import './vis-network';
const i18n = _createI18n(visMessages)
const container = document.getElementById('relationship-graph')
@@ -25,5 +27,11 @@ const app = createApp({
})
.use(store)
.use(i18n)
+.use(VueToast, {
+ position: "bottom-right",
+ type: "error",
+ duration: 5000,
+ dismissible: true
+ })
.component('app', App)
.mount('#relationship-graph')
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js
index d72a42b15..453c2674a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js
@@ -45,7 +45,7 @@ const searchPersons = ({ query, options }, signal) => {
const searchEntities = ({ query, options }, signal) => {
let queryStr = parametersToString({ query, options });
let url = `/api/1.0/search.json?${queryStr}`;
- return fetch(url)
+ return fetch(url, { signal })
.then(response => {
if (response.ok) { return response.json(); }
throw Error('Error with request resource response');
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
index 20ed1c8da..338094122 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
@@ -14,8 +14,13 @@ const getPersonAltNames = () =>
fetch('/api/1.0/person/config/alt_names.json').then(response => {
if (response.ok) { return response.json(); }
throw Error('Error with request resource response');
- });;
+ });
+const getCivilities = () =>
+ fetch('/api/1.0/main/civility.json').then(response => {
+ if (response.ok) { return response.json(); }
+ throw Error('Error with request resource response');
+ });
/*
* POST a new person
@@ -56,6 +61,7 @@ const patchPerson = (id, body) => {
export {
getPerson,
getPersonAltNames,
+ getCivilities,
postPerson,
patchPerson
};
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 37707155d..f84fc2e1d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -199,15 +199,26 @@ export default {
return;
}
if (query === this.search.query) {
- if (this.currentSearchQueryController !== undefined) {
- this.currentSearchQueryController.abort()
+ if (this.search.currentSearchQueryController !== null) {
+ this.search.currentSearchQueryController.abort();
}
- this.currentSearchQueryController = new AbortController();
- searchEntities({ query, options: this.options }, this.currentSearchQueryController)
- .then(suggested => new Promise((resolve, reject) => {
- this.loadSuggestions(suggested.results);
- resolve();
- }));
+ this.search.currentSearchQueryController = new AbortController();
+ searchEntities({ query, options: this.options }, this.search.currentSearchQueryController.signal)
+ .then(suggested => new Promise((resolve, reject) => {
+ this.loadSuggestions(suggested.results);
+ resolve();
+ }))
+ .catch(error => {
+ if (error instanceof DOMException) {
+ if (error.name === 'AbortError') {
+ console.log('request aborted due to user continue typing');
+ return;
+ }
+ }
+
+ throw error;
+ })
+ ;
}
}.bind(this), query.length > 3 ? 300 : 700);
},
@@ -266,12 +277,79 @@ export default {
}
},
saveFormOnTheFly({ type, data }) {
- // console.log('saveFormOnTheFly from addPersons, type', type, ', data', data);
+ console.log('saveFormOnTheFly from addPersons, type', type, ', data', data);
if (type === 'person') {
+
makeFetch('POST', '/api/1.0/person/person.json', data)
- .then(response => {
- this.newPriorSuggestion(response);
+ .then(responsePerson => {
+
+ this.newPriorSuggestion(responsePerson);
this.$refs.onTheFly.closeModal();
+
+ if (null !== data.addressId) {
+ const household = {
+ 'type': 'household'
+ };
+ const address = {
+ 'id': data.addressId
+ };
+ makeFetch('POST', '/api/1.0/person/household.json', household)
+ .then(responseHousehold => {
+ const member = {
+ 'concerned': [
+ {
+ 'person': {
+ 'type': 'person',
+ 'id': responsePerson.id
+ },
+ 'start_date': {
+ // TODO: use date.js methods (low priority)
+ 'datetime': `${new Date().toISOString().split('T')[0]}T00:00:00+02:00`
+ },
+ 'holder': false,
+ 'comment': null
+ }
+ ],
+ 'destination': {
+ 'type': 'household',
+ 'id': responseHousehold.id
+ },
+ 'composition': null
+ };
+ return makeFetch('POST', '/api/1.0/person/household/members/move.json', member)
+ .then(_response => {
+ makeFetch('POST', `/api/1.0/person/household/${responseHousehold.id}/address.json`, address)
+ .then(_response => {})
+ .catch((error) => {
+ if (error.name === 'ValidationException') {
+ for (let v of error.violations) {
+ this.$toast.open({message: v });
+ }
+ } else {
+ this.$toast.open({message: 'An error occurred'});
+ }
+ });
+ })
+ .catch((error) => {
+ if (error.name === 'ValidationException') {
+ for (let v of error.violations) {
+ this.$toast.open({message: v });
+ }
+ } else {
+ this.$toast.open({message: 'An error occurred'});
+ }
+ });
+ })
+ .catch((error) => {
+ if (error.name === 'ValidationException') {
+ for (let v of error.violations) {
+ this.$toast.open({message: v });
+ }
+ } else {
+ this.$toast.open({message: 'An error occurred'});
+ }
+ });
+ }
})
.catch((error) => {
if (error.name === 'ValidationException') {
@@ -281,7 +359,8 @@ export default {
} else {
this.$toast.open({message: 'An error occurred'});
}
- })
+ });
+
}
else if (type === 'thirdparty') {
makeFetch('POST', '/api/1.0/thirdparty/thirdparty.json', data)
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index e6fa85902..5a8708cc3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -87,6 +87,20 @@
{{ $t('person.gender.title') }}
+
+
+ {{ $t('person.civility.placeholder') }}
+
+ {{ c.name.fr }}
+
+
+ {{ $t('person.civility.title') }}
+
+
+
+ {{ $t('person.address.show_address_form') }}
+
+
+
+
{{ e }}
@@ -134,24 +166,43 @@