Merge branch 'develop' of https://forge.laclic.fr/Laclic/SovBundle into develop

Controller/Dashboard/DashboardAdminController.php

@@ -37,12 +37,13 @@ class DashboardAdminController extends AbstractDashboardController
     {
         $assets = parent::configureAssets();
 
-        $assets->addWebpackEncoreEntry('adminlte-common');
+        $assets->addWebpackEncoreEntry('adminlte-plugins');
         $assets->addWebpackEncoreEntry('adminlte-index');
         $assets->addWebpackEncoreEntry('adminlte-form');
         $assets->addWebpackEncoreEntry('adminlte-sort');
         $assets->addWebpackEncoreEntry('adminlte-field-collection');
         $assets->addWebpackEncoreEntry('adminlte-field-filemanager');
+        $assets->addWebpackEncoreEntry('adminlte-main');
         $assets->addWebpackEncoreEntry('sov-reminder');
 
         return $assets;

Controller/Newsletter/NewsletterAdminController.php

@@ -12,11 +12,8 @@ use Lc\SovBundle\Field\StatusField;
 
 abstract class NewsletterAdminController extends AbstractAdminController
 {
-
     public function configureFields(string $pageName): iterable
     {
-        $panel = parent::configureFields($pageName);
-
         return array_merge(
                 [
                         FormField::addPanel('general'),
@@ -27,7 +24,8 @@ abstract class NewsletterAdminController extends AbstractAdminController
                             ->hideOnIndex(),
                         StatusField::new('status'),
                 ],
-                $panel
+                $this->getSeoPanel(),
+                $this->getConfPanel()
         );
     }
 

Repository/AbstractStore.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Lc\SovBundle\Repository;
+
+abstract class AbstractStore
+{
+    public function getRepositoryQuery()
+    {
+        return $this->query;
+    }
+}

Repository/File/FileStore.php

@@ -2,7 +2,9 @@
 
 namespace Lc\SovBundle\Repository\File;
 
-class FileStore implements FileStoreInterface
+use Lc\SovBundle\Repository\AbstractStore;
+
+class FileStore extends AbstractStore implements FileStoreInterface
 {
     protected FileRepositoryQueryInterface $query;
 

Repository/Newsletter/NewsletterStore.php

@@ -2,7 +2,9 @@
 
 namespace Lc\SovBundle\Repository\Newsletter;
 
-class NewsletterStore implements NewsletterStoreInterface
+use Lc\SovBundle\Repository\AbstractStore;
+
+class NewsletterStore extends AbstractStore implements NewsletterStoreInterface
 {
     protected NewsletterRepositoryQueryInterface $query;
 

Repository/Reminder/ReminderStore.php

@@ -2,7 +2,9 @@
 
 namespace Lc\SovBundle\Repository\Reminder;
 
-class ReminderStore implements ReminderStoreInterface
+use Lc\SovBundle\Repository\AbstractStore;
+
+class ReminderStore extends AbstractStore implements ReminderStoreInterface
 {
     protected ReminderRepositoryQueryInterface $query;
 

Repository/Setting/SiteSettingStore.php

@@ -2,7 +2,9 @@
 
 namespace Lc\SovBundle\Repository\Setting;
 
-class SiteSettingStore implements SiteSettingStoreInterface
+use Lc\SovBundle\Repository\AbstractStore;
+
+class SiteSettingStore extends AbstractStore implements SiteSettingStoreInterface
 {
     protected SiteSettingRepositoryQueryInterface $query;
 

Repository/Site/NewsStore.php

@@ -2,7 +2,9 @@
 
 namespace Lc\SovBundle\Repository\Site;
 
-class NewsStore implements NewsStoreInterface
+use Lc\SovBundle\Repository\AbstractStore;
+
+class NewsStore extends AbstractStore implements NewsStoreInterface
 {
     protected NewsRepositoryQueryInterface $query;
 

Repository/Site/PageStore.php

@@ -2,7 +2,9 @@
 
 namespace Lc\SovBundle\Repository\Site;
 
-class PageStore implements PageStoreInterface
+use Lc\SovBundle\Repository\AbstractStore;
+
+class PageStore extends AbstractStore implements PageStoreInterface
 {
     protected PageRepositoryQueryInterface $query;
 

Repository/Site/SiteStore.php

@@ -2,7 +2,9 @@
 
 namespace Lc\SovBundle\Repository\Site;
 
-class SiteStore implements SiteStoreInterface
+use Lc\SovBundle\Repository\AbstractStore;
+
+class SiteStore extends AbstractStore implements SiteStoreInterface
 {
     protected SiteRepositoryQueryInterface $query;
 

Repository/Ticket/TicketMessageStore.php

@@ -2,7 +2,9 @@
 
 namespace Lc\SovBundle\Repository\Ticket;
 
-class TicketMessageStore implements TicketMessageStoreInterface
+use Lc\SovBundle\Repository\AbstractStore;
+
+class TicketMessageStore extends AbstractStore implements TicketMessageStoreInterface
 {
     protected TicketMessageRepositoryQueryInterface $query;
 

Repository/Ticket/TicketStore.php

@@ -2,7 +2,9 @@
 
 namespace Lc\SovBundle\Repository\Ticket;
 
-class TicketStore implements TicketStoreInterface
+use Lc\SovBundle\Repository\AbstractStore;
+
+class TicketStore extends AbstractStore implements TicketStoreInterface
 {
     protected TicketRepositoryQueryInterface $query;
 

Repository/User/GroupUserStore.php

@@ -2,7 +2,9 @@
 
 namespace Lc\SovBundle\Repository\User;
 
-class GroupUserStore implements GroupUserStoreInterface
+use Lc\SovBundle\Repository\AbstractStore;
+
+class GroupUserStore extends AbstractStore implements GroupUserStoreInterface
 {
     protected GroupUserRepositoryQueryInterface $query;
 

Repository/User/UserStore.php

@@ -2,7 +2,9 @@
 
 namespace Lc\SovBundle\Repository\User;
 
-class UserStore implements UserStoreInterface
+use Lc\SovBundle\Repository\AbstractStore;
+
+class UserStore extends AbstractStore implements UserStoreInterface
 {
     protected UserRepositoryQueryInterface $query;
 

Resources/assets/app/admin/reminder/reminder.js

@@ -25,7 +25,7 @@ function initReminder() {
             id: $(this).data('id'),
             done: $(this).is(':checked')
         }, function(data) {
-            Notification.add('success', 'Pense-bête mis à jour');
+            SovNotification.add('success', 'Pense-bête mis à jour');
         }, 'json');
     }) ;
 }

Resources/assets/app/admin/ticket/ticket.js

@@ -7,9 +7,9 @@ jQuery(document).ready(function () {
             dataType: "json",
             success: function (data) {
                 if (data.success) {
-                    Notification.add('success', 'Le status a bien été mise à jour.');
+                    SovNotification.add('success', 'Le status a bien été mise à jour.');
                 } else {
-                    Notification.add('danger', 'Une erreur est survenue.');
+                    SovNotification.add('danger', 'Une erreur est survenue.');
                 }
             }
         });

Resources/assets/app/adminlte/common/common.js

@@ -1,155 +0,0 @@
-
-/* Notifications */
-//Notification.init() ;
-
-
-setDateRange();
-
-setAutoCompleteField();
-
-
-/* Tooltip */
-$('[data-toggle="tooltip"]').tooltip();
-
-/* Select2 */
-if ($('.select2, select.form-control').length) {
-
-    $('form .form-widget>select.form-control, .select2').each(function (i, elm) {
-        if (!$(this).hasClass('disable-select2')) {
-            setSelect2($(elm));
-        }
-    });
-
-    $('form select.form-control').each(function (i, elm) {
-        if (!$(this).hasClass('disable-select2')) {
-            setSelect2($(elm));
-        }
-    });
-}
-
-function setSelect2($select) {
-    if (typeof $select.data('select2-id') === 'undefined') {
-
-        $select.data('init', 'set')
-        var options = {
-            width: "100%",
-            theme: "bootstrap4",
-            dropdownAutoWidth: false,
-            allowClear: true,
-            minimumResultsForSearch: 8
-        };
-
-        if ($select.data('allow-clear') == 'false') {
-            options.allowClear = false;
-        }
-        if ($select.data('width')) {
-            options.width = 'auto'
-        }
-        if ($select.find('option[value=""]')) {
-            options.placeholder = $select.find('option[value=""]').html()
-        }
-        /*if($select.is(':required') == false) {
-            options.allowclear = true
-        }*/
-        var myselect = $select.select2(options);
-
-        myselect.on('select2:select', function (e) {
-            var event = new Event('change');
-            e.target.dispatchEvent(event);
-        });
-        myselect.on('select2:unselect', function (e) {
-            var event = new Event('change');
-            e.target.dispatchEvent(event);
-        });
-
-        return myselect;
-    }
-}
-
-
-$('.action-delete').on('click', function (e) {
-    e.preventDefault();
-    const formAction = $(this).attr('formaction');
-
-    $('#modal-delete').modal({backdrop: true, keyboard: true})
-        .off('click', '#modal-delete-button')
-        .on('click', '#modal-delete-button', function () {
-            let deleteForm = $('#delete-form');
-            deleteForm.attr('action', formAction);
-            deleteForm.submit();
-        });
-});
-
-
-function setDateRange(){
-
-
-    $('.date-time-range, .date-range').each(function (i, picker) {
-        options = {
-            autoUpdateInput: false,
-            locale: {
-                "format": "DD/MM/YY",
-                "separator": " - ",
-                "applyLabel": "Appliquer",
-                "cancelLabel": "Annuler",
-                "fromLabel": "Du",
-                "toLabel": "au",
-                "customRangeLabel": "Custom",
-                "daysOfWeek": ["Di", "Lu", "Ma", "Me", "Je", "Ve", "Sa"],
-                "monthNames": ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"],
-                "firstDay": 1
-            }
-        };
-        if ($(picker).hasClass('date-time-range')){
-            options = Object.assign(options, {
-                timePicker: true,
-                timePickerIncrement: 30,
-                timePicker24Hour: true,
-                locale: {
-                    "format": "DD/MM/YYYY HH:mm",
-                }
-            });
-        }
-        if ($(picker).nextAll('.date-time-range-fields').find('.date-start').val()) {
-            options.startDate = new Date($(picker).nextAll('.date-time-range-fields').find('.date-start').val());
-            options.autoUpdateInput = true;
-        }
-        if ($(picker).nextAll('.date-time-range-fields').find('.date-end').val()) {
-            options.endDate = new Date($(picker).nextAll('.date-time-range-fields').find('.date-end').val());
-            options.autoUpdateInput = true;
-        }
-        $(picker).daterangepicker(options);
-        $(picker).on('apply.daterangepicker', function (ev, pickerElm) {
-            if ($(picker).hasClass('date-time-range')) {
-                $(this).val(pickerElm.startDate.format('DD/MM/YY HH:mm') + ' - ' + pickerElm.endDate.format(options.locale.format));
-            }else{
-                $(this).val(pickerElm.startDate.format('DD/MM/YY') + ' - ' + pickerElm.endDate.format(options.locale.format));
-            }
-            if ($(picker).hasClass('date-time-range')) {
-                $(picker).nextAll('.date-time-range-fields').find('.date-start').val(pickerElm.startDate.format('YYYY-MM-DD HH:mm'));
-                $(picker).nextAll('.date-time-range-fields').find('.date-end').val(pickerElm.endDate.format('YYYY-MM-DD HH:mm'));
-            }else{
-                $(picker).nextAll('.date-time-range-fields').find('.date-start').val(pickerElm.startDate.format('YYYY-MM-DD'));
-                $(picker).nextAll('.date-time-range-fields').find('.date-end').val(pickerElm.endDate.format('YYYY-MM-DD'));
-            }
-        });
-    });
-
-}
-
-
-function setAutoCompleteField() {
-    var autocompleteFields = $('[data-lc-autocomplete-url]');
-
-    autocompleteFields.each(function () {
-        var $this = $(this),
-            url = $this.data('lc-autocomplete-url');
-
-        $this.autoComplete({
-            noResultsText: 'Aucun résultat n\'a été trouvé.',
-            resolverSettings: {
-                url: url
-            }
-        });
-    });
-}

Resources/assets/app/adminlte/common/utils/log.js

@@ -1,7 +0,0 @@
-function log(name) {
-    try {
-        return console.log(name);
-    } catch (e) {
-        return null;
-    }
-}

Resources/assets/app/adminlte/index/index.js

@@ -18,14 +18,14 @@ function lcCrudIndexToggle() {
             let toggleRequest = $.ajax({type: "POST", url: toggleUrl, data: {}, dataType: 'json'});
 
             toggleRequest.done(function (response) {
-                Notification.add('success', 'La propriété a bien été mise à jour.');
+                SovNotification.add('success', 'La propriété a bien été mise à jour.');
             });
 
             toggleRequest.fail(function () {
                 toggle.checked = oldValue;
                 toggle.disabled = true;
                 toggle.closest('.checkbox-switch').classList.add('disabled');
-                Notification.add('error', 'Une erreur est survenue.');
+                SovNotification.add('error', 'Une erreur est survenue.');
             });
         });
     }

Resources/assets/app/adminlte/main/app.main.js

@@ -0,0 +1,3 @@
+
+import './init.js';
+import './common.scss';

Resources/assets/app/adminlte/main/init.js

@@ -0,0 +1,37 @@
+
+SovNotification.init() ;
+
+SovWidgets.setDateRange();
+SovWidgets.setAutoCompleteField();
+
+/* Tooltip */
+$('[data-toggle="tooltip"]').tooltip();
+
+/* Select2 */
+if ($('.select2, select.form-control').length) {
+
+    $('form .form-widget>select.form-control, .select2').each(function (i, elm) {
+        if (!$(this).hasClass('disable-select2')) {
+            SovWidgets.setSelect2($(elm));
+        }
+    });
+
+    $('form select.form-control').each(function (i, elm) {
+        if (!$(this).hasClass('disable-select2')) {
+            SovWidgets.setSelect2($(elm));
+        }
+    });
+}
+
+$('.action-delete').on('click', function (e) {
+    e.preventDefault();
+    const formAction = $(this).attr('formaction');
+
+    $('#modal-delete').modal({backdrop: true, keyboard: true})
+        .off('click', '#modal-delete-button')
+        .on('click', '#modal-delete-button', function () {
+            let deleteForm = $('#delete-form');
+            deleteForm.attr('action', formAction);
+            deleteForm.submit();
+        });
+});

Resources/assets/app/adminlte/common/app.common.js → Resources/assets/app/adminlte/plugins/app.plugins.js

@@ -23,23 +23,22 @@ import toastr from 'toastr/toastr.js' ;
 import 'toastr/toastr.scss' ;
 global.toastr = toastr ;
 
-
 // DaterangePicker
 import 'moment' ;
 import 'daterangepicker/daterangepicker.js' ;
 import 'daterangepicker/daterangepicker.css' ;
 
 // Tools
-import { Tools } from '../../../tools/tools.js';
-global.Tools = Tools;
+import { SovTools } from '../../../functions/tools.js';
+global.SovTools = SovTools;
+
+// Widgets
+import { SovWidgets } from '../../../functions/widgets.js';
+global.SovWidgets = SovWidgets;
 
-import { Notification } from './js/notification.js';
-global.Notification = Notification;
-Notification.init() ;
+import { SovNotification } from '../../../functions/notification.js';
+global.SovNotification = SovNotification;
 
-// Common
-import './common.scss';
-import './common.js' ;
 
 
 

Resources/assets/app/adminlte/common/js/notification.js → Resources/assets/functions/notification.js

@@ -1,5 +1,5 @@
 
-export class Notification {
+export class SovNotification {
 
     static init() {
         toastr.options.timeOut = 3000;

Resources/assets/tools/tools.js → Resources/assets/functions/tools.js

@@ -1,5 +1,5 @@
 
-export class Tools {
+export class SovTools {
 
         static log(value) {
                 try {

Resources/assets/functions/widgets.js

@@ -0,0 +1,111 @@
+
+export class SovWidgets {
+
+        static setSelect2($select) {
+                if (typeof $select.data('select2-id') === 'undefined') {
+
+                        $select.data('init', 'set')
+                        var options = {
+                                width: "100%",
+                                theme: "bootstrap4",
+                                dropdownAutoWidth: false,
+                                allowClear: true,
+                                minimumResultsForSearch: 8
+                        };
+
+                        if ($select.data('allow-clear') == 'false') {
+                                options.allowClear = false;
+                        }
+                        if ($select.data('width')) {
+                                options.width = 'auto'
+                        }
+                        if ($select.find('option[value=""]')) {
+                                options.placeholder = $select.find('option[value=""]').html()
+                        }
+                        /*if($select.is(':required') == false) {
+                            options.allowclear = true
+                        }*/
+                        var myselect = $select.select2(options);
+
+                        myselect.on('select2:select', function (e) {
+                                var event = new Event('change');
+                                e.target.dispatchEvent(event);
+                        });
+                        myselect.on('select2:unselect', function (e) {
+                                var event = new Event('change');
+                                e.target.dispatchEvent(event);
+                        });
+
+                        return myselect;
+                }
+        }
+
+        static setDateRange() {
+                $('.date-time-range, .date-range').each(function (i, picker) {
+                        options = {
+                                autoUpdateInput: false,
+                                locale: {
+                                        "format": "DD/MM/YY",
+                                        "separator": " - ",
+                                        "applyLabel": "Appliquer",
+                                        "cancelLabel": "Annuler",
+                                        "fromLabel": "Du",
+                                        "toLabel": "au",
+                                        "customRangeLabel": "Custom",
+                                        "daysOfWeek": ["Di", "Lu", "Ma", "Me", "Je", "Ve", "Sa"],
+                                        "monthNames": ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"],
+                                        "firstDay": 1
+                                }
+                        };
+                        if ($(picker).hasClass('date-time-range')) {
+                                options = Object.assign(options, {
+                                        timePicker: true,
+                                        timePickerIncrement: 30,
+                                        timePicker24Hour: true,
+                                        locale: {
+                                                "format": "DD/MM/YYYY HH:mm",
+                                        }
+                                });
+                        }
+                        if ($(picker).nextAll('.date-time-range-fields').find('.date-start').val()) {
+                                options.startDate = new Date($(picker).nextAll('.date-time-range-fields').find('.date-start').val());
+                                options.autoUpdateInput = true;
+                        }
+                        if ($(picker).nextAll('.date-time-range-fields').find('.date-end').val()) {
+                                options.endDate = new Date($(picker).nextAll('.date-time-range-fields').find('.date-end').val());
+                                options.autoUpdateInput = true;
+                        }
+                        $(picker).daterangepicker(options);
+                        $(picker).on('apply.daterangepicker', function (ev, pickerElm) {
+                                if ($(picker).hasClass('date-time-range')) {
+                                        $(this).val(pickerElm.startDate.format('DD/MM/YY HH:mm') + ' - ' + pickerElm.endDate.format(options.locale.format));
+                                } else {
+                                        $(this).val(pickerElm.startDate.format('DD/MM/YY') + ' - ' + pickerElm.endDate.format(options.locale.format));
+                                }
+                                if ($(picker).hasClass('date-time-range')) {
+                                        $(picker).nextAll('.date-time-range-fields').find('.date-start').val(pickerElm.startDate.format('YYYY-MM-DD HH:mm'));
+                                        $(picker).nextAll('.date-time-range-fields').find('.date-end').val(pickerElm.endDate.format('YYYY-MM-DD HH:mm'));
+                                } else {
+                                        $(picker).nextAll('.date-time-range-fields').find('.date-start').val(pickerElm.startDate.format('YYYY-MM-DD'));
+                                        $(picker).nextAll('.date-time-range-fields').find('.date-end').val(pickerElm.endDate.format('YYYY-MM-DD'));
+                                }
+                        });
+                });
+        }
+
+        static setAutoCompleteField() {
+                var autocompleteFields = $('[data-lc-autocomplete-url]');
+
+                autocompleteFields.each(function () {
+                        var $this = $(this),
+                            url = $this.data('lc-autocomplete-url');
+
+                        $this.autoComplete({
+                                noResultsText: 'Aucun résultat n\'a été trouvé.',
+                                resolverSettings: {
+                                        url: url
+                                }
+                        });
+                });
+        }
+}

Resources/views/adminlte/crud/field/toggle.html.twig

@@ -6,5 +6,5 @@
      data-url="{{ ea_url({crudAction: 'edit', entityId: item.id, fieldName: property_name }) }}">
     <input type="checkbox" class="custom-control-input" id="{{ id_toggle }}" {{ field.value ? 'checked' }}>
     <label class="custom-control-label" for="{{ id_toggle }}">
-        {{ field.getCustomOption('toggle_label') ?? field.label }}</label>
+        {{ field.getCustomOption('toggle_label') ? field.label : field.property|sov_trans_admin_field(entity.instance) }}</label>
 </div>

Resources/views/adminlte/crud/form_theme.html.twig

@@ -283,12 +283,15 @@
             {{ widget|raw }}
             <span class="checkmark"></span>
 
-            {# {% if translation_domain == 'lcshop' %}
-                  {{ name|lc_trad(easyadmin['entity']['name'], 'field') }}
-              {% else %} #}
-            {{- label is not same as(false) ? (translation_domain is same as(false) ? label : label|trans(label_translation_parameters, translation_domain))|raw -}}
+            {# {{- label is not same as(false) ? (translation_domain is same as(false) ? label : label|trans(label_translation_parameters, translation_domain))|raw -}}  #}
+
+            {% set entityNameOrObject = form.parent.vars.data %}
+            {% if not entityNameOrObject and form.parent.vars.errors.form.config.dataClass is defined %}
+                {% set entityNameOrObject = form.parent.vars.errors.form.config.dataClass %}
+            {% endif %}
+
+            {{- (label is not empty and '.' in label) ? label|trans({}, 'admin') : name|sov_trans_admin_field(entityNameOrObject) -}}
 
-            {# {% endif %} #}
             {{- form_errors(form) -}}
         </label>
     {%- endif -%}
@@ -312,7 +315,6 @@
                     {% block class %}{{ loop.first ? 'active' }}{% endblock %}
                     {% block id %}{{ panel_name }}{% endblock %}
                     {% block content %}
-                        {{ dump() }}
                         {% for field in form|filter(field => 'hidden' not in field.vars.block_prefixes and field.vars.ea_crud_form.form_panel == panel_name) %}
                             {% if not field.vars.ea_crud_form.form_tab or field.vars.ea_crud_form.form_tab == tab_name %}
                                 {{ form_row(field) }}

Resources/views/adminlte/layout.html.twig

@@ -206,7 +206,7 @@
                 $(document).ready(function () {
                     {% for label, messages in flash_messages %}
                     {% for message in messages %}
-                    Notification.add("{{ label }}", "{{ message|trans|raw|replace({'"': '\"'}) }}");
+                    SovNotification.add("{{ label }}", "{{ message|trans|raw|replace({'"': '\"'}) }}");
                     {% endfor %}
                     {% endfor %}
                 });