-
+
- {{ p.text }} @@ -79,11 +79,15 @@ 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/_components/BadgeEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue index 5dd770328..4e99b7fd3 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue @@ -24,6 +24,11 @@ {{ $t('user')}} + + {{ $t('household')}} + + +
+
+
+
+ ![]()
+
+ {{ this.title }}
+
+
+
+ {{ $t('save_and_quit') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('invalid_title') }}
+ + +{{ $t('invalid_message') }}
+
+
+
- {% if user is not empty %}
- {{ 'Last updated by'| trans }}
-
- {{ user|chill_entity_render_box(options['user']) }}
-
- {% endif %}
{% if comment.date is not empty %}
- {% if user is empty %}
- {{ 'Last updated on'|trans ~ ' ' }}
- {% else %}
- {{ 'on'|trans ~ ' ' }}
- {% endif %}
+ {{ 'Last updated on'|trans ~ ' ' }}
{{ comment.date|format_datetime("medium", "short") }}
{% endif %}
+ {% if user is not empty %}
+ {% if comment.date is empty %}
+ {{ 'Last updated by'| trans }}
+ {% else %}
+ {{ 'by_user'|trans ~ ' ' }}
+ {% endif %}
+
+ {{ user|chill_entity_render_box(options['user']) }}
+
+ {% endif %}
{% endif %}
-{{ closing_box|raw }}
+{{ closing_box|raw }}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
index ea8f18fc0..cccebabf5 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -59,7 +59,7 @@
must be shown in such list
#}
{%- if render == 'list' -%}
-
+
{% if options['has_no_address'] == true and address.isNoAddress == true %}
{% if address.postCode is not empty %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index 25f1363c3..8bb09623f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -216,7 +216,7 @@
{% endif %}
{% endblock %}
-{% block pick_user_dynamic_widget %}
+{% block pick_entity_dynamic_widget %}
{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Homepage/fast_actions.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Homepage/fast_actions.html.twig
new file mode 100644
index 000000000..9138212e2
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Homepage/fast_actions.html.twig
@@ -0,0 +1,3 @@
+{{ entity.email }}
{% if entity.address is not null %}
- {{ entity.address.street}}, {{ entity.address.streetnumber }}
+ {{ entity.address| chill_entity_render_box }}
{% endif %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig
index 5402d5e89..22cb6de44 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig
@@ -8,6 +8,7 @@
{{ 'Title'|trans }}
{{ 'Available for users'|trans }}
+ {{ 'Editable by users'|trans }}
{{ 'Address required'|trans }}
{{ 'Contact data'|trans }}
{{ 'Active'|trans }}
@@ -25,6 +26,13 @@
{%- endif -%}
+
+ {%- if entity.editableByUsers -%}
+
+ {%- else -%}
+
+ {%- endif -%}
+
{{ entity.addressRequired|trans }}
{{ entity.contactData|trans }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
index 56b2f31ee..51be6c2c3 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
@@ -21,13 +21,13 @@
layout ../layoutWithVerticalMenu.html.twig.
#}
-
+ {# Override this file to add fast actions buttons #}
+
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
new file mode 100644
index 000000000..aec38f3c3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
@@ -0,0 +1,15 @@
+
+
+ {# vue component #}
+
+
+ {% include '@ChillMain/Homepage/fast_actions.html.twig' %}
+
+
+{% block css %}
+ {{ encore_entry_link_tags('page_homepage_widget') }}
+{% endblock %}
+
+{% block js %}
+ {{ encore_entry_script_tags('page_homepage_widget') }}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
index cc35be33a..bc39a9275 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
@@ -23,7 +23,7 @@
-
-
-
++ {% block v_menu_title %}{% endblock %} - + {% for menu in menus %} -diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/_item_comments.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/_item_comments.html.twig new file mode 100644 index 000000000..b741abf4a --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/_item_comments.html.twig @@ -0,0 +1,77 @@ +{% import '@ChillPerson/AccompanyingCourse/Comment/macro_showItem.html.twig' as m %} + +{% macro recordAction(comment) %} + {% if is_granted('CHILL_MAIN_NOTIFICATION_COMMENT_EDIT', comment) %} +
- - {{ menu.label|trans }} -
+ + {{ menu.label|upper }} + {% endfor %} - + - + + + {% endif %} +{% endmacro %} + +
- {{ 'notification.from'|trans }} : - {% if not notification.isSystem %} + {% if not c.notification.isSystem %} - {{ notification.sender|chill_entity_render_string }} - + {{ c.notification.sender|chill_entity_render_string }} + {% else %} {{ 'notification.is_system'|trans }} {% endif %} {% endif %} - {% if notification.addressees|length > 0 %} + {% if c.notification.addressees|length > 0 %}
- {{ 'notification.to'|trans }} : - {% for a in notification.addressees %} + {% for a in c.notification.addressees %} {{ a|chill_entity_render_string }} @@ -42,47 +44,102 @@ {% endif %}
- - {# Vue component #} - - - {% if is_granted('CHILL_MAIN_NOTIFICATION_UPDATE', notification) %} -
- - - +
- + + + {% endif %} + {% if is_granted('CHILL_MAIN_NOTIFICATION_SEE', c.notification) %} +
- + + {% if not c.notification.isSystem() %} + + {% else %} + {{ 'Read more'|trans }} + {% endif %} + + + {% endif %} + +
- - - - {% endif %} -{% endmacro %} - {% block content %}
- - - {{ 'cancel'|trans }} - - -
- - - -
- - - -
- @@ -114,6 +44,7 @@
- Date de début : 25/11/2021 +
- Date de fin : 10/03/2022 +
- Résultat : Arrêt à l'initiative du ménage pour déménagement +
- Orientation vers une MASP +
- + + +
- + {% set x = random(1) %} + + +
- + + +
- + + +
- {{ u|chill_entity_render_box }} + {%- endfor %} +
- {{ u|chill_entity_render_box }} + {% endfor %} +
- + + {{ 'Show'|trans }} + + +
- + {{ 'By'|trans ~ ' : ' }} + {{ step.previous.transitionBy|chill_entity_render_box }} + +
- + {{ 'Le'|trans ~ ' : ' }} + {{ step.previous.transitionAt|format_datetime('short', 'short') }} + + {% else %} +
- + {{ 'workflow.Created by'|trans ~ ' : ' }} + {{ step.entityWorkflow.createdBy|chill_entity_render_box }} + +
- + {{ 'Le'|trans ~ ' : ' }} + {{ step.entityWorkflow.createdAt|format_datetime('short', 'short') }} + + {% endif %} +
-
-
-
+ + + + - -
-
+
+
+{% macro title(c) %}
-
+{% endmacro %}
+{% macro header(c) %}
+
-
+{% endmacro %}
-
+{% macro content(c) %}
-
- {% if step is not defined or step == 'inbox' %}
+ {% if c.step is not defined or c.step == 'inbox' %}
- {{ notification.date|format_datetime('long', 'short') }}
+ {{ c.notification.date|format_datetime('long', 'short') }}
+
-
- {% include data.template with data.template_data %}
+ {% if c.data is defined %}
+
+
+ {% include c.data.template with c.data.template_data %}
+
+ {% endif %}
+
+
-
+ {% if c.full_content is defined and c.full_content == true %}
+ {{ c.notification.message|chill_markdown_to_html }}
+ {% else %}
+ {{ c.notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }}
+
+ {% endif %}
-
- {% if action_button is not defined or action_button != 'false' %}
+ {% if c.action_button is not defined or c.action_button != false %}
-
- - {{ notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }} --
-
{% endif %}
+{% endmacro %}
+
+-
-
+
+ {% if c.notification.comments|length > 0 %}
+
+
+
+ {{ 'notification.counter comments'|trans({'nb': c.notification.comments|length }) }}
+
+
{% endif %}
- {% if is_granted('CHILL_MAIN_NOTIFICATION_SEE', notification) %}
+
+
+
+ {% if is_granted('CHILL_MAIN_NOTIFICATION_UPDATE', c.notification) %}
+
+
+ {% if fold_item is defined and fold_item != false %}
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig
index 8797c276a..f15380083 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig
@@ -20,7 +20,7 @@
{{ form_row(form.title, { 'label': 'notification.subject'|trans }) }}
{{ form_row(form.addressees, { 'label': 'notification.sent_to'|trans }) }}
-
+
{% include handler.template(notification) with handler.templateData(notification) %}
+
+ {{ _self.header(_context) }}
+
+
+
+
+ {{ _self.content(_context) }}
+
+
+ {% else %}
+ {{ _self.title(_context) }}
+ {{ _self.header(_context) }}
+ {{ _self.content(_context) }}
+ {% endif %}
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_counter_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_counter_notifications_for.html.twig
new file mode 100644
index 000000000..d92e4230e
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_counter_notifications_for.html.twig
@@ -0,0 +1,12 @@
+
+ {% if counter.total > 0 %}
+
+ {{ 'notification.counter total notifications'|trans({'total': counter.total }) }}
+
+ {% endif %}
+ {% if counter.unread > 0 %}
+
+ {{ 'notification.counter unread notifications'|trans({'unread': counter.unread }) }}
+
+ {% endif %}
+
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig
index 31267e135..748142ab8 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig
@@ -1,45 +1,12 @@
-
-
-
- {# TODO pagination or limit #}
+{{ 'notification.Sent'|trans }}
-{{ 'notification.Notifications'|trans }}
+ +
{% for notification in notifications %}
-
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig
index cd0cc5b67..b2f6169ee 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig
@@ -46,10 +46,12 @@
-
- {% if not notification.isSystem %}
- {% if notification.sender == app.user %}
-
-
+ {% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
+ 'full_content': true,
+ 'fold_item': true,
+ 'action_button': true,
+ } %}{#
+ #}
{% endfor %}
- - {{ notification.date|format_datetime('short','short') }} - - {# Vue component #} - -
- - {% if notification.addressees|length > 0 %} - {{ 'notification.to'|trans }}: - {% endif %} - - {% for a in notification.addressees %} - - {{ a|chill_entity_render_string }} - - {% endfor %} - - {% else %} -{{ 'notification.you were notified by %sender%'|trans({'%sender%': notification.sender|chill_entity_render_string }) }}
- {% endif %}
- {% else %}
- {{ 'notification.you were notified by system'|trans }}
- {% endif %}
-
- {{ 'notification.Any notification sent'|trans }}
{% endif %} {% else %} -
+
@@ -94,6 +95,7 @@
{{ encore_entry_script_tags('mod_ckeditor5') }}
{{ encore_entry_script_tags('mod_blur') }}
{{ encore_entry_script_tags('chill') }}
+ {{ encore_entry_script_tags('vue_onthefly') }}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
index 2af2d2d21..8440e50d5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
@@ -13,7 +13,7 @@ const root = window.vueRootComponent;
* Load all App component, for AccompanyingCourse edition page
*/
if (root === 'app') {
- initPromise.then(store => {
+ initPromise(root).then(store => {
const i18n = _createI18n(appMessages);
@@ -37,7 +37,7 @@ if (root === 'app') {
* Load only Banner sub-component, for all others AccompanyingCourse page
*/
if (root === 'banner') {
- initPromise.then(store => {
+ initPromise(root).then(store => {
const i18n = _createI18n(appMessages);
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 04bbef9ef..87f6d8d09 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -102,7 +102,7 @@ const appMessages = {
no_address: "Il n'y a pas d'adresse associée au parcours"
},
scopes: {
- title: "Services",
+ title: "Services concernés",
add_at_least_one: "Indiquez au moins un service",
},
referrer: {
@@ -134,11 +134,26 @@ const appMessages = {
location_not_valid: "indiquez au minimum une localisation temporaire du parcours",
origin_not_valid: "Indiquez une origine à la demande",
adminLocation_not_valid: "Indiquez une localisation administrative à la demande",
+ job_not_valid: "Indiquez un métier du référent",
set_a_scope: "indiquez au moins un service",
sure: "Êtes-vous sûr ?",
sure_description: "Une fois le changement confirmé, il ne sera plus possible de le remettre à l'état de brouillon !",
ok: "Confirmer le parcours",
- delete: "Supprimer le parcours"
+ delete: "Supprimer le parcours",
+ no_suggested_referrer: "Il n'y a aucun référent qui puisse être désigné pour ce parcours. Vérifiez la localisation du parcours, les métiers et service indiqués. Si le problème persiste, contactez l'administrateur du logiciel.",
+ one_suggested_referrer: "Un unique référent peut être suggéré pour ce parcours",
+ choose_suggested_referrer: "Voulez-vous le désigner directement ?",
+ choose_button: "Désigner",
+ do_not_choose_button: "Ne pas désigner"
+ },
+ job: {
+ label: "Métier",
+ placeholder: "Choisir un métier",
+ not_valid: "Sélectionnez un métier du référent"
+ },
+ startdate: {
+ change: "Date d'ouverture",
+ date: "Date d'ouverture",
},
// 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 bf2bd0938..4f8b3e00f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -8,15 +8,20 @@ import { getAccompanyingCourse,
import { patchPerson } from "ChillPersonAssets/vuejs/_api/OnTheFly";
import { patchThirdparty } from "ChillThirdPartyAssets/vuejs/_api/OnTheFly";
import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
+import { datetimeToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
const debug = process.env.NODE_ENV !== 'production';
const id = window.accompanyingCourseId;
-let scopesPromise = fetchScopes();
+let getScopesPromise = (root) => {
+ if (root === 'app') {
+ return fetchScopes();
+ }
+}
let accompanyingCoursePromise = getAccompanyingCourse(id);
-let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
+let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCoursePromise])
.then(([scopes, accompanyingCourse]) => new Promise((resolve, reject) => {
const store = createStore({
@@ -35,6 +40,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
scopesAtBackend: accompanyingCourse.scopes.map(scope => scope),
// the users which are available for referrer
referrersSuggested: [],
+ filteredReferrersSuggested: [],
// all the users available
users: [],
permissions: {}
@@ -55,6 +61,9 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
isLocationValid(state) {
return state.accompanyingCourse.location !== null;
},
+ isJobValid(state) {
+ return state.accompanyingCourse.job !== null;
+ },
isScopeValid(state) {
//console.log('is scope valid', state.accompanyingCourse.scopes.length > 0);
return state.accompanyingCourse.scopes.length > 0;
@@ -63,6 +72,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
let keys = [];
if (!getters.isParticipationValid) { keys.push('participation'); }
if (!getters.isLocationValid) { keys.push('location'); }
+ if (!getters.isJobValid) { keys.push('job'); }
if (!getters.isSocialIssueValid) { keys.push('socialIssue'); }
if (!getters.isOriginValid) { keys.push('origin'); }
if (!getters.isAdminLocationValid) { keys.push('adminLocation'); }
@@ -193,6 +203,9 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
//console.log('value', value);
state.accompanyingCourse.user = value;
},
+ updateJob(state, value) {
+ state.accompanyingCourse.job = value;
+ },
setReferrersSuggested(state, users) {
state.referrersSuggested = users.map(u => {
if (state.accompanyingCourse.user !== null) {
@@ -203,6 +216,22 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
return u;
});
},
+ setFilteredReferrersSuggested(state) {
+ state.filteredReferrersSuggested = state.referrersSuggested.filter(u => {
+ if (u.user_job && state.accompanyingCourse.job && state.accompanyingCourse.user) {
+ return u.user_job.id === state.accompanyingCourse.job.id && state.accompanyingCourse.user.id !== u.id
+ } else {
+ if (null === state.accompanyingCourse.user) {
+ if (u.user_job && state.accompanyingCourse.job) {
+ return u.user_job.id === state.accompanyingCourse.job.id
+ } else {
+ return true;
+ }
+ }
+ return state.accompanyingCourse.user.id !== u.id;
+ }
+ })
+ },
confirmAccompanyingCourse(state, response) {
//console.log('### mutation: confirmAccompanyingCourse: response', response);
state.accompanyingCourse.step = response.step;
@@ -254,6 +283,10 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
if (scopeIds.includes(scope.id)) {
state.scopesAtBackend = state.scopesAtBackend.filter(s => s.id !== scope.id);
}
+ },
+ updateStartDate(state, date) {
+ console.log('new state date', date)
+ state.accompanyingCourse.openingDate = date;
}
},
actions: {
@@ -262,6 +295,12 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
commit('removeParticipation', payload);
// fetch DELETE request...
},
+ addPerson({ commit }, payload) {
+ commit('updatePerson', { target: payload.target, person: payload.body });
+ },
+ addThirdparty({ commit }, payload) {
+ commit('updateThirdparty', { target: payload.target, thirdparty: payload.body });
+ },
/**
* Add/close participation
*/
@@ -624,8 +663,8 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
})
},
updateOrigin({ commit }, payload) {
- const url = `/api/1.0/person/accompanying-course/${id}.json`
- const body = { type: "accompanying_period", origin: { id: payload.id, type: payload.type }}
+ const url = `/api/1.0/person/accompanying-course/${id}.json`;
+ const body = { type: "accompanying_period", origin: { id: payload.id, type: payload.type }};
return makeFetch('PATCH', url, body)
.then((response) => {
@@ -637,8 +676,8 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
})
},
updateAdminLocation({ commit }, payload) {
- const url = `/api/1.0/person/accompanying-course/${id}.json`
- const body = { type: "accompanying_period", administrativeLocation: { id: payload.id, type: payload.type }}
+ const url = `/api/1.0/person/accompanying-course/${id}.json`;
+ const body = { type: "accompanying_period", administrativeLocation: { id: payload.id, type: payload.type }};
return makeFetch('PATCH', url, body)
.then((response) => {
@@ -650,12 +689,42 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
})
},
updateReferrer({ commit }, payload) {
- const url = `/api/1.0/person/accompanying-course/${id}.json`
- const body = { type: "accompanying_period", user: { id: payload.id, type: payload.type }}
+ const url = `/api/1.0/person/accompanying-course/${id}.json`;
+ const body = { type: "accompanying_period", user: { id: payload.id, type: payload.type }};
return makeFetch('PATCH', url, body)
.then((response) => {
commit('updateReferrer', response.user);
+ commit('setFilteredReferrersSuggested');
+ })
+ .catch((error) => {
+ commit('catchError', error);
+ throw error;
+ })
+ },
+ updateJob({ commit }, payload) {
+ const url = `/api/1.0/person/accompanying-course/${id}.json`;
+ const body = { type: "accompanying_period", job: { id: payload.id, type: payload.type }};
+
+ return makeFetch('PATCH', url, body)
+ .then((response) => {
+ commit('updateJob', response.job);
+ commit('setFilteredReferrersSuggested');
+ })
+ .catch((error) => {
+ commit('catchError', error);
+ throw error;
+ })
+ },
+ 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)
+ return makeFetch('PATCH', url, body)
+ .then((response) => {
+ commit('updateStartDate', response.openingDate);
})
.catch((error) => {
commit('catchError', error);
@@ -665,11 +734,12 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
async fetchReferrersSuggested({ state, commit}) {
let users = await getReferrersSuggested(state.accompanyingCourse);
commit('setReferrersSuggested', users);
+ commit('setFilteredReferrersSuggested');
if (
- null === state.accompanyingCourse.user
- && !state.accompanyingCourse.confidential
- && !state.accompanyingCourse.step === 'DRAFT'
- && users.length === 1
+ null === state.accompanyingCourse.user
+ && !state.accompanyingCourse.confidential
+ && !state.accompanyingCourse.step === 'DRAFT'
+ && users.length === 1
) {
// set the user if unique
commit('updateReferrer', users[0]);
@@ -750,8 +820,11 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
}
});
- store.dispatch('fetchReferrersSuggested');
- store.dispatch('fetchUsers');
+ if (root === 'app') {
+ store.dispatch('fetchReferrersSuggested');
+ store.dispatch('fetchUsers');
+ }
+
resolve(store);
}));
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
index 74ed0467c..503a00c59 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
@@ -5,7 +5,7 @@
{% for data in datas %}
{% set notification = data.notification %}
- {% include 'ChillMainBundle:Notification:_list_item.html.twig' %}
+ {% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
+ 'fold_item': true
+ } %}
{% endfor %}
{% endif %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
index 2d3b27728..cce7ebd64 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
@@ -14,21 +14,6 @@
{{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
{% endblock %}
-{% import '@ChillPerson/AccompanyingCourse/Comment/macro_showItem.html.twig' as m %}
-
-{% macro recordAction(comment) %}
- {% if is_granted('CHILL_MAIN_NOTIFICATION_COMMENT_EDIT', comment) %}
-
@@ -40,68 +25,13 @@
'template': handler.getTemplate(notification),
'template_data': handler.getTemplateData(notification)
},
- 'action_button': 'false'
+ 'action_button': false,
+ 'full_content': true,
+ 'fold_item': false
} %}
-
-
+ {% include 'ChillMainBundle:Notification:_item_comments.html.twig' %}
{{ 'notification.comments_list'|trans }}
- - {% if notification.comments|length > 0 %} -
- {% for comment in notification.comments %}
-
- {% if editedCommentForm is null or editedCommentId != comment.id %}
- {{ m.show_comment(comment, {
- 'recordAction': _self.recordAction(comment)
- }) }}
- {% else %}
-
- {% endif %}
-
-
-
- {% endif %}
-
- {% endfor %}
-
-
-
- {{ form_start(editedCommentForm) }}
- {{ form_errors(editedCommentForm) }}
- {{ form_widget(editedCommentForm.content) }}
-
-
- -
-
-
- {{ 'Write a new comment'|trans }}
- - {{ form_start(appendCommentForm) }} - {{ form_errors(appendCommentForm) }} - {{ form_widget(appendCommentForm.content) }} - --
-
{{ 'Document'|trans ~ 'target'|trans }}
+ +
+
+
+{% else %}
+
+ {# For an action #}
+
+
+
+
+
+ Imprimé unique, parcours n°14635
+ Document PDF (6.2 Mo) ++ Description du document. Sed euismod nisi porta lorem mollis aliquam. Non curabitur gravida arcu ac tortor. +
+{{ 'Accompanying Course Action'|trans ~ 'target'|trans }}
+ +
+ {# dynamic insertion
+ ::: TODO delete all static insertion, remove condition and pass work object in inclusion
+ #}{% if dynamic is defined %}
+
+ {% set work = '' %}
+ {% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with { 'w': work } %}
+
+ {% else %}
+
+ {# BEGIN static insertion #}
+
+
+{% endif %}
+
+
+
+ {# END static insertion #}
+
+ {% endif %}
+
+
+
+ Exercer un AEB > Conclure l'AEB
+
+
+
+
+ Exercer un AEB > Conclure l'AEB
+
+
+
+
+
+
+
+
+
+
+
+
+ Référent
Fred
+
+
+ Usagers du parcours
+ Vernon SUBUTEX
+ Juan RAMON
+
+
+
+
+ Problématique sociale
+
+ + AD - PREVENTION, ACCES AUX DROITS, BUDGET >SOUTIEN EQUILIBRE BUDGET +
+
+
+
+
+
+ Objectif - motif - dispositif |
+ Résultats - orientations |
+
|---|---|
|
+ Aucun objectif - motif - dispositif + |
+
+
|
+
+
+
+ Dernière mise à jour par
+ Fred(Responsable tous les territoires)(ASE),
+ le 3 décembre 2021 à 15:19 +
+ + le 3 décembre 2021 à 15:19 +
-
+
{{ 'Join a comment'|trans }}
+ +{{ form_start(comment_form) }} + +{{ form_widget(comment_form.comment) }} + +-
+
{{ 'Decision'|trans }}
+ +{% if transition_form is not null %} + {{ form_start(transition_form) }} + + {% set step = entity_workflow.currentStepChained %} + {% set labels = workflow_metadata(entity_workflow, 'label', step.currentStep) %} + {% set label = labels is null ? step.currentStep : labels|localize_translatable_string %} + +
+
+
+
+
+
+
+
+ {% if step.previous is not null %}
+ {% if step.previous.comment is not empty %}
+
+ {{ 'workflow.Current step'|trans }} :
+ {{ label }}
+
+
+
+ {% endif %}
+
+
+ + {{ step.previous.comment|chill_markdown_to_html }} ++
+
+ {% else %}
+
+ {{ 'By'|trans }}
+ {{ step.previous.transitionBy|chill_entity_render_box }},
+ {{ step.previous.transitionAt|format_datetime('short', 'short') }}
+
+
+
+ {{ 'workflow.Created by'|trans }}
+ {{ step.entityWorkflow.createdBy|chill_entity_render_box }}
+
+
+ {% endif %}
+ {{ 'Le'|trans }}
+ {{ step.entityWorkflow.createdAt|format_datetime('short', 'short') }}
+
+ {% if transition_form.transitionFilter is defined %}
+ {{ form_row(transition_form.transitionFilter) }}
+ {% endif %}
+
+
+
+ {{ form_row(transition_form.transition) }}
+
+
+ {% if transition_form.freezeAfter is defined %}
+ {{ form_row(transition_form.freezeAfter) }}
+ {% endif %}
+
+
+ {{ form_row(transition_form.future_dest_users) }}
+
+
+ {{ form_label(transition_form.comment) }}
+ + {{ form_widget(transition_form.comment) }} + +-
+
+
+ {% if entity_workflow.currentStep.isFinal %}
+
+
+{% endif %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_extension_list_workflow_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_extension_list_workflow_for.html.twig
new file mode 100644
index 000000000..96c33e207
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_extension_list_workflow_for.html.twig
@@ -0,0 +1,13 @@
+{% set acl = "0" %}
+{% if is_granted('CHILL_MAIN_WORKFLOW_CREATE', blank_workflow) %}
+ {% set acl = "1" %}
+{% endif %}
+
+{# vue component #}
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_follow.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_follow.html.twig
new file mode 100644
index 000000000..7a14e83fe
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_follow.html.twig
@@ -0,0 +1,8 @@
+{{ 'workflow.This workflow is finalized'|trans }}
+ {% else %} +{{ 'workflow.You are not allowed to apply a transition on this workflow'|trans }}
+{{ 'workflow.Only those users are allowed'|trans }}:
+ +-
+ {% for u in entity_workflow.currentStep.destUser -%}
+
{{ 'Follow workflow'|trans }}
+ +{# vue component #} + diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig new file mode 100644 index 000000000..e40e82dab --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig @@ -0,0 +1,88 @@ +{{ 'Workflow history'|trans }}
+ +
+ {% for step in entity_workflow.stepsChained %}
+ {% set place_labels = workflow_metadata(entity_workflow, 'label', step.currentStep) %}
+ {% set place_label = place_labels is null ? step.currentStep : place_labels|localize_translatable_string %}
+
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_notification_include.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_notification_include.html.twig
new file mode 100644
index 000000000..221ddf4b4
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_notification_include.html.twig
@@ -0,0 +1,12 @@
+
+
+
+ {% endfor %}
+
+
+
+ {% if loop.first and step.next is null %}
+
+ {% if step.next is not null %}
+ {% set transition = chill_workflow_transition_by_string(step.entityWorkflow, step.transitionAfter) %}
+ {% set transition_labels = workflow_metadata(step.entityWorkflow, 'label', transition) %}
+ {% set transition_label = transition_labels is null ? step.transitionAfter : transition_labels|localize_translatable_string %}
+ {% set forward = workflow_metadata(step.entityWorkflow, 'isForward', transition) %}
+
+ {{ 'workflow.No transitions'|trans }}
+
+ {% else %}
+
+
+ {% if step.previous is not null and step.previous.freezeAfter == true %}
+
+ {% endif %}
+
+
+
+ {% endif %}
+
+
+ {{ place_label }}
+
+ {#
+
+
+ Refusé
+
+ #}
+
+
+ {% endif %}
+ {% if step.comment is not empty %}
+
+ {% if step.transitionBy is not null %}
+
+
+ {{ step.transitionBy|chill_entity_render_box }}
+
+ {% endif %}
+
+ {{ step.transitionAt|format_datetime('long', 'medium') }}
+
+
+
+
+
+ {% if forward %}
+
+ {% else %}
+
+ {% endif %}
+ {{ transition_label }}
+
+
+
+ {% endif %}
+ {% if loop.last and step.destUser|length > 0 %}
+ + {{ step.comment|chill_markdown_to_html }} ++
+
+ {% endif %}
+
+
+ {{ 'workflow.Users allowed to apply transition'|trans }} :
+-
+ {% for u in step.destUser %}
+
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig
new file mode 100644
index 000000000..588e2de0b
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig
@@ -0,0 +1,56 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% block title %}
+ {{ 'Workflow'|trans }}
+{% endblock %}
+
+{% block js %}
+ {{ parent() }}
+
+ {{ encore_entry_script_tags('mod_async_upload') }}
+ {{ encore_entry_script_tags('mod_pickentity_type') }}
+ {{ encore_entry_script_tags('mod_entity_workflow_subscribe') }}
+ {{ encore_entry_script_tags('page_workflow_show') }}
+ {{ encore_entry_script_tags('mod_wopi_link') }}
+{% endblock %}
+
+{% block css %}
+ {{ parent() }}
+ {{ encore_entry_link_tags('mod_pickentity_type') }}
+ {{ encore_entry_link_tags('mod_entity_workflow_subscribe') }}
+ {{ encore_entry_link_tags('page_workflow_show') }}
+ {{ encore_entry_link_tags('mod_wopi_link') }}
+{% endblock %}
+
+{% block content %}
++ {{ 'workflow_'|trans }} +
+ {% include handler.templateTitle(entity_workflow) with handler.templateTitleData(entity_workflow)|merge({ + 'description': true, + 'breadcrumb': true, + 'add_classes': 'ms-3 h3' + }) %} + + +
+
+
+
+ {% include '@ChillMain/Workflow/_follow.html.twig' %}
+ {% include '@ChillMain/Workflow/_decision.html.twig' %} {#
+ {% include '@ChillMain/Workflow/_comment.html.twig' %} #}
+ {% include '@ChillMain/Workflow/_history.html.twig' %}
+
+ {# useful ?
+
+ #}
+
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig
new file mode 100644
index 000000000..6da68e390
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig
@@ -0,0 +1,97 @@
+{% extends 'ChillMainBundle::layout.html.twig' %}
+
+{% import '@ChillMain/Workflow/macro_breadcrumb.html.twig' as macro %}
+
+{% block title %}
+ {{ 'workflow.My workflows'|trans }}
+{% endblock %}
+
+{% block content %}
+{{ block('title') }}
+ + {# handler_template: + - src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig + - src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig + - src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig + #} +
+ {% include handler_template_title with handler_template_data|merge({'breadcrumb': true }) %}
+
+ {% include handler_template with handler_template_data|merge({'display_action': true }) %}
+
+
+
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig
new file mode 100644
index 000000000..6fb3fe2ff
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig
@@ -0,0 +1,66 @@
+{% macro popoverContent(step) %}
+ {{ block('title') }}
+ + + + {% if workflows|length == 0 %} +{{ 'workflow.No workflow'|trans }}
+ {% else %} +
+ {% for l in workflows %}
+
+ {% endif %}
+
+
+ {% endfor %}
+
+
+ {{ macro.breadcrumb(l) }}
+
+
+
+
+
+
+ {% include l.handler.template(l.entity_workflow) with l.handler.templateData(l.entity_workflow)|merge({
+ 'display_action': false
+ }) %}
+
+
+
+
+
+
+ + {% if l.entity_workflow.isUserSubscribedToStep(app.user) %} + + {{ 'workflow.you subscribed to all steps'|trans }} + {% endif %} +
++ {% if l.entity_workflow.isUserSubscribedToFinal(app.user) %} + + {{ 'workflow.you subscribed to final step'|trans }} + {% endif %} +
+
+
+ -
+
-
+ {% if step.previous is not null %}
+
+ {% for step in _ctx.entity_workflow.stepsChained %}
+ {% set labels = workflow_metadata(_ctx.entity_workflow, 'label', step.currentStep) %}
+ {% set label = labels is null ? step.currentStep : labels|localize_translatable_string %}
+ {% set popTitle = _self.popoverTitle(step) %}
+ {% set popContent = _self.popoverContent(step) %}
+
+ {% if step.currentStep == 'initial' %}
+
+ {% endif %}
+ {% if step.previous is not null and step.previous.freezeAfter == true %}
+
+ {% endif %}
+ {{ label }}
+
+ {% if not loop.last %}
+ →
+ {% endif %}
+ {% endfor %}
+
+{% endmacro %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_content.fr.txt.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_content.fr.txt.twig
new file mode 100644
index 000000000..1e8469968
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_content.fr.txt.twig
@@ -0,0 +1,13 @@
+{{ dest.label }},
+
+Un suivi "{{ workflow.text }}" a atteint une nouvelle étape: {{ workflow.text }}
+{%- if is_dest %}
+
+Vous êtes invités à valider cette étape au plus tôt.
+{% endif %}
+
+Vous pouvez visualiser le workflow sur cette page:
+
+{{ absolute_url(path('chill_main_workflow_show', {'id': entity_workflow.id})) }}
+
+Cordialement,
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_title.fr.txt.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_title.fr.txt.twig
new file mode 100644
index 000000000..4960b6138
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_title.fr.txt.twig
@@ -0,0 +1,5 @@
+{%- if is_dest -%}
+Un suivi {{ workflow.text }} demande votre attention
+{%- else -%}
+Un suivi {{ workflow.text }} a atteint une nouvelle étape: {{ place.text }}
+{%- endif -%}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index a123ce405..c11422a1b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -13,6 +13,7 @@
{{ encore_entry_link_tags('mod_ckeditor5') }}
{{ encore_entry_link_tags('chill') }}
{{ encore_entry_link_tags('mod_blur') }}
+ {{ encore_entry_link_tags('vue_onthefly') }}
{% block css %}{% endblock %}
@@ -59,26 +60,26 @@
{% endif %}
{% block content %}
-
-
-
-
- {{ chill_widget('homepage', {} ) }}
+ {{ 'Search'|trans }}
- - -
+
+
+ {# DISABLED {{ chill_widget('homepage', {} ) }} #}
+
+ {% include '@ChillMain/Homepage/index.html.twig' %}
+
{% endblock %}
{{ 'Search'|trans }}
+ + +
-
+
-
{{ $t('pick_social_issue_linked_with_action') }}
{{ si.text }}
@@ -33,7 +33,7 @@
+
-
{{ $t('pick_an_action') }}
+
- {{ $t('persons_involved') }}
+
+
+
@@ -233,18 +235,6 @@
-
-
+
+
-
+
+
+
+
-
+
+
+
+
+ {{ $t('form_has_errors') }}
@@ -111,7 +128,7 @@ import { mapState, mapActions, mapGetters } from 'vuex'; import VueMultiselect from 'vue-multiselect'; import { dateToISO, ISOToDate } from 'ChillMainAssets/chill/js/date.js'; -import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue'; +import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue'; const i18n = { messages: { @@ -133,7 +150,7 @@ export default { name: 'App', components: { VueMultiselect, - PersonRenderBox, + PersonText, }, methods: { submit() { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue index 97bda5fc5..f9d1a747c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue @@ -141,10 +141,12 @@
-
-
-
-
-
{{ $t('Generate doc') }}
- -{{ $t('fix_these_errors') }}
-
@@ -253,7 +243,17 @@
-
+
-
+
{{ 'notification.comments_list'|trans }}
+ + {% if notification.comments|length > 0 %} ++-
+
+ {{ 'cancel'|trans }}
+
+
+ -
+
+
+
+ {{ form_end(editedCommentForm) }} + +{{ 'Write a new comment'|trans }}
+ + {{ form_start(appendCommentForm) }} + {{ form_errors(appendCommentForm) }} + {{ form_widget(appendCommentForm.content) }} + ++-
+
+
+
+ {{ form_end(appendCommentForm) }} + +