Bug #13137: for calendar list views, allowing to set day header forma…

…t for left and right zones.
Silverpeas · Jun 28, 2022 · eb41483 · eb41483
1 parent 8447e8a
commit eb41483
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/...iguration/src/main/config/properties/org/silverpeas/calendar/settings/calendar.properties b/...iguration/src/main/config/properties/org/silverpeas/calendar/settings/calendar.properties
@@ -74,4 +74,15 @@ calendar.nextEvents.time.windows=6, 12
 calendar.views.day.endHour=true
 calendar.views.week.endHour=true
 calendar.views.month.endHour=true
-calendar.views.year.endHour=true
+calendar.views.year.endHour=true
+
+# Day header formatting for list views.
+# Two zones can be filled in such views, the left one and the right one.
+# For both of them, format patterns are those of MomentJS API:
+# https://momentjscom.readthedocs.io/en/stable/moment/04-displaying/01-format/
+# For left, by default it is a Localized format with month name, day of month and year.
+# If no value, no label is displayed.
+calendar.views.list.dayHeader.format.left = LL
+# For right, by default it is day of week in letters.
+# If no value, no label is displayed.
+calendar.views.list.dayHeader.format.right = dddd
diff --git a/core-war/src/main/webapp/util/javaScript/silverpeas-calendar.js b/core-war/src/main/webapp/util/javaScript/silverpeas-calendar.js
@@ -714,16 +714,21 @@
       slotLabelFormat : 'HH:mm',
       weekNumbers : true,
       weekNumberTitle : $window.CalendarBundle.get("c.w").substring(0, 1),
-      listDayFormat : 'LL',
+      listDayFormat : $window.CalendarSettings.get('c.v.l.d.l'),
+      listDayAltFormat : $window.CalendarSettings.get('c.v.l.d.r'),
       noEventsMessage : $window.CalendarBundle.get("c.e.n"),
       views : {
         year : {
           displayEventEnd : $window.CalendarSettings.get('c.v.y.e')
-        }, month : {
+        },
+        month : {
           displayEventEnd : $window.CalendarSettings.get('c.v.m.e')
-        }, week : {
-          columnFormat : 'ddd DD', displayEventEnd : $window.CalendarSettings.get('c.v.w.e')
-        }, day : {
+        },
+        week : {
+          columnFormat : 'ddd DD',
+          displayEventEnd : $window.CalendarSettings.get('c.v.w.e')
+        },
+        day : {
           displayEventEnd : $window.CalendarSettings.get('c.v.d.e')
         }
       },

diff --git a/.../main/java/org/silverpeas/core/web/util/viewgenerator/html/JavascriptPluginInclusion.java b/.../main/java/org/silverpeas/core/web/util/viewgenerator/html/JavascriptPluginInclusion.java
@@ -66,6 +66,7 @@
 import static org.silverpeas.core.notification.user.client.NotificationManagerSettings.*;
 import static org.silverpeas.core.reminder.ReminderSettings.getDefaultReminder;
 import static org.silverpeas.core.reminder.ReminderSettings.getPossibleReminders;
+import static org.silverpeas.core.util.StringUtil.EMPTY;
 import static org.silverpeas.core.util.URLUtil.getApplicationURL;
 import static org.silverpeas.core.web.util.viewgenerator.html.JavascriptBundleProducer.bundleVariableName;
 import static org.silverpeas.core.web.util.viewgenerator.html.JavascriptSettingProducer.settingVariableName;
@@ -706,6 +707,8 @@ static ElementContainer includeCalendar(final ElementContainer xhtml, final Stri
 
     xhtml.addElement(scriptContent(settingVariableName("CalendarSettings")
         .add("c.c", stream(calendarSettings.getString("calendar.ui.colors").split(",")), true)
+        .add("c.v.l.d.l", calendarSettings.getString("calendar.views.list.dayHeader.format.left", EMPTY))
+        .add("c.v.l.d.r", calendarSettings.getString("calendar.views.list.dayHeader.format.right", EMPTY))
         .add("c.v.d.e", calendarSettings.getBoolean("calendar.views.day.endHour", true))
         .add("c.v.w.e", calendarSettings.getBoolean("calendar.views.week.endHour", true))
         .add("c.v.m.e", calendarSettings.getBoolean("calendar.views.month.endHour", true))