diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js b/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js
index 48bbf20fa..1ece0c0ad 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js
@@ -1,13 +1,18 @@
import {createApp} from "vue";
import NotificationReadToggle from "ChillMainAssets/vuejs/_components/Notification/NotificationReadToggle.vue";
+import { _createI18n } from "ChillMainAssets/vuejs/_js/i18n";
+
+const i18n = _createI18n({});
window.addEventListener('DOMContentLoaded', function (e) {
document.querySelectorAll('.notification_toggle_read_status')
.forEach(function (el) {
- console.log('app', el);
- const App = {
+ createApp({
template: ' ',
@@ -17,6 +22,9 @@ window.addEventListener('DOMContentLoaded', function (e) {
data() {
return {
notificationId: +el.dataset.notificationId,
+ buttonClass: el.dataset.buttonClass,
+ buttonNoText: 'true' === el.dataset.buttonNoText,
+ showUrl: el.dataset.showUrl,
isRead: 1 === +el.dataset.notificationCurrentIsRead,
}
},
@@ -28,8 +36,8 @@ window.addEventListener('DOMContentLoaded', function (e) {
this.isRead = true;
},
}
- }
-
- createApp(App).mount(el);
+ })
+ .use(i18n)
+ .mount(el);
});
})
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
index 26cbff735..21cc672b7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
@@ -1,13 +1,13 @@
-import {createApp} from 'vue';
+import { createApp } from 'vue';
import PickEntity from 'ChillMainAssets/vuejs/PickEntity/PickEntity.vue';
import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
-import {activityMessages} from "../../../../../ChillActivityBundle/Resources/public/vuejs/Activity/i18n";
window.addEventListener('DOMContentLoaded', function(e) {
- let
- apps = document.querySelectorAll('[data-module="pick-dynamic"]');
+
+ let apps = document.querySelectorAll('[data-module="pick-dynamic"]');
apps.forEach(function(el) {
+
const
isMultiple = parseInt(el.dataset.multiple) === 1,
input = document.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'),
@@ -15,7 +15,13 @@ window.addEventListener('DOMContentLoaded', function(e) {
i18n = _createI18n({});
createApp({
- template: ' ',
+ template: ' ',
components: {
PickEntity,
},
@@ -54,6 +60,8 @@ window.addEventListener('DOMContentLoaded', function(e) {
input.value = JSON.stringify(this.picked);
},
}
- }).use(i18n).mount(el);
+ })
+ .use(i18n)
+ .mount(el);
});
});
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 32dad3c36..eb4ca96ba 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -91,7 +91,3 @@ export default {
},
}
-
-
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 730ba2881..976046db7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue
@@ -1,10 +1,42 @@
- Marquer non-lu
- Marquer lu
+
+
+
+
+
+ {{ $t('markAsUnread') }}
+
+
+
+
+
+
+ {{ $t('markAsRead') }}
+
+
+
+
+
+
+
-
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 b57aab322..f36a2d147 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,25 +1,43 @@
-
+
+
+
{{ 'notification.Sent'|trans }}
+
+ {# TODO pagination or limit #}
{% for notification in notifications %}
-
+
+
{% if not notification.isSystem %}
{% if notification.sender == app.user %}
-
You sent notification to: {% for a in notification.addressees %}{{ a|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
+
+
+
+ {{ notification.date|format_datetime('short','short') }}
+
+
+
+ {% 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 %}
-
+
+
{% endfor %}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 7efda04d1..f0e906058 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -353,7 +353,7 @@ Created for: Créé pour
Created by: Créé par
notification:
- Notify: Notifier
+ Notify: Envoyer une notification
Notification created: Notification envoyée
Any notification received: Aucune notification reçue
Any notification sent: Aucune notification envoyée
@@ -365,4 +365,9 @@ notification:
is_unread: Non-lue
is_system: Notification automatique
list: Notifications
+ Sent: Envoyé
+ sentto: Envoyé à
+ you were notified by %sender%: Vous avez été notifié par %sender%
+ you were notified by system: Vous avez été notifié automatiquement
+ to: À
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 8dac50f82..564ffc854 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -26,9 +26,6 @@
{% block content %}
-
- {{ chill_list_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) }}
-
{% if 'DRAFT' == accompanyingCourse.step %}
@@ -134,10 +131,6 @@
{% endif %}
-
-
{% if accompanyingCourse.requestorPerson is not null or accompanyingCourse.requestorThirdParty is not null %}
@@ -189,3 +182,17 @@
{% endblock %}
+
+{% block block_post_menu %}
+
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index df1e45fce..bbb8ff52f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -3,7 +3,7 @@
{% block title 'household.Household summary'|trans %}
{% block block_post_menu %}
-
+
{% endblock %}
{% block content %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig
index 350b73679..f04f9d702 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig
@@ -1,5 +1,5 @@
{#
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS,
+ * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS,
/
*
* This program is free software: you can redistribute it and/or modify
@@ -38,7 +38,7 @@
}) }}
{% block block_post_menu %}
-