configure first day of week for calendar and date-picker (#1952)

templates/base.html.twig

@@ -203,6 +203,7 @@
                 {
                     login: '{{ path('fos_user_security_login') }}',
                     locale: '{{ app.request.locale }}',
+                    first_dow_iso: {{ iso_day_by_name(app.user.firstDayOfWeek) }},
                     twentyFourHours: {{ 'true'|hour24('false') }},
                     autoReloadDatatable: {% if theme_config('auto_reload_datatable') %}true{% else %}false{% endif %},
                     autoComplete: {{ theme_config('autocomplete_chars') }}

templates/calendar/user.html.twig

@@ -57,12 +57,45 @@
         };
 
         document.addEventListener('kimai.initialized', function(event) {
-            var API = event.detail.kimai.getPlugin('api');
+            var kimai = event.detail.kimai;
+            var API = kimai.getPlugin('api');
             $('#timesheet_calendar').fullCalendar({
                 defaultView: '{{ app.user.getPreferenceValue('calendar.initial_view') }}',
                 {% if not google.apiKey is null %}
                 googleCalendarApiKey: '{{ google.apiKey }}',
                 {% endif %}
+                header    : {
+                    left  : 'prev,next today',
+                    center: 'title',
+                    right : 'month,agendaWeek,agendaDay'
+                },
+                eventLimit: {{ config.dayLimit }},
+                weekNumbers: {% if config.showWeekNumbers %}true{% else %}false{% endif %},
+                allDaySlot: false,
+                navLinks: true,
+                locale: kimai.getConfiguration().get('locale').replace('_', '-').toLowerCase(),
+                firstDay: kimai.getConfiguration().get('first_dow_iso'),
+                /*
+                // TODO calculate height properly instead of relying on the default aspectRatio
+                height: function() {
+                    return 'parent';
+                },
+                */
+                height: 'auto',
+                nowIndicator: true,
+                now: '{{ now|date_format('c') }}',
+                timezone: '{{ app.user.preferenceValue("timezone") }}',
+                weekends: {% if config.showWeekends %}true{% else %}false{% endif %},
+                businessHours: {
+                    dow: [{{ config.businessDays|join(',') }}],
+                    start: '{{ config.businessTimeBegin }}',
+                    end: '{{ config.businessTimeEnd }}'
+                },
+                slotDuration: '{{ config.slotDuration }}',
+                slotLabelInterval: '{{ config.slotDuration }}',
+                minTime: '{{ config.timeframeBegin }}',
+                maxTime: '{{ config.timeframeEnd }}',
+                defaultTimedEventDuration: '00:30',
                 eventSources: [
                     {
                         events: function(start, end, timezone, callback) {
@@ -107,32 +140,6 @@
                     }
                     {% endfor %}
                 ],
-                header    : {
-                    left  : 'prev,next today',
-                    center: 'title',
-                    right : 'month,agendaWeek,agendaDay'
-                },
-                eventLimit: {{ config.dayLimit }},
-                weekNumbers: {% if config.showWeekNumbers %}true{% else %}false{% endif %},
-                allDaySlot: false,
-                navLinks: true,
-                locale: '{{ app.request.locale|replace({'_': '-'})|lower }}',
-                /*
-                // TODO calculate height properly instead of relying on the default aspectRatio
-                height: function() {
-                    return 'parent';
-                },
-                */
-                height: 'auto',
-                nowIndicator: true,
-                now: '{{ now|date_format('c') }}',
-                timezone: '{{ app.user.preferenceValue("timezone") }}',
-                weekends: {% if config.showWeekends %}true{% else %}false{% endif %},
-                businessHours: {
-                    dow: [{{ config.businessDays|join(',') }}],
-                    start: '{{ config.businessTimeBegin }}',
-                    end: '{{ config.businessTimeEnd }}'
-                },
                 eventRender: function(eventObj, $el) {
                     // don't show popover for google calendar
                     if (eventObj.source.ajaxSettings !== undefined) {
@@ -214,11 +221,6 @@
                 eventResize: changeHandler,
                 {% endif %}
             {% endif %}
-                slotDuration: '{{ config.slotDuration }}',
-                slotLabelInterval: '{{ config.slotDuration }}',
-                minTime: '{{ config.timeframeBegin }}',
-                maxTime: '{{ config.timeframeEnd }}',
-                defaultTimedEventDuration: '00:30'
             })
         });
     </script>

templates/user/form.html.twig

@@ -2,18 +2,15 @@
 
 {% block main %}
     {{ form_start(form) }}
-    {% for section, entries in sections %}
+    {% for section in sections %}
         {% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
             {% block box_body %}
-                {% for pref in form.children.preferences %}
-                    {% if pref.vars.data.name in entries %}
-                        {{ form_row(pref) }}
-                    {% endif %}
+                {% for pref in form.children.preferences|filter(pref => pref.vars.data.section == section)|sort((a, b) => a.vars.data.order <=> b.vars.data.order) %}
+                    {{ form_row(pref) }}
                 {% endfor %}
             {% endblock %}
         {% endembed %}
     {% endfor %}
-    {{ form_widget(form) }}
     <input type="submit" value="{{ 'action.save'|trans }}" class="btn btn-primary" />
     {{ form_end(form) }}