Changes for page Calendar Macro

Last modified by admin on 2025/07/01 00:06

From version 2.1
edited by Benjamin Fischer
on 2025/02/11 10:47
Change comment: Install extension [org.xwiki.contrib:application-mocca-calendar-ui/2.9.7]
To version 1.1
edited by Benjamin Fischer
on 2024/11/05 16:22
Change comment: Install extension [org.xwiki.contrib:application-mocca-calendar-ui/2.9.6]

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,4 +1,5 @@
1 1  {{velocity output="false"}}
2 +$services.localization.use('document', 'Calendar.Translations')
2 2  #if('#dateTimePicker_import()' == "#dateTimePicker_import()")
3 3   #set($picker_macro = false)
4 4   ## A simple date picker widget.
... ... @@ -72,10 +72,6 @@
72 72  #if("$!dateFormat" == "")
73 73   #set($dateFormat = "dd.MM.yyyy HH:mm:ss")
74 74  #end
75 -#set ($eventLimit = $xcontext.macro.params.eventLimit)
76 -#if (!$eventLimit)
77 - #set ($eventLimit = false)
78 -#end
79 79  
80 80  ##
81 81  ## some hardwired values that you can feel free to customize
... ... @@ -90,34 +90,8 @@
90 90  #set($right = "agendaDay,agendaWeek,month,plainList")
91 91  
92 92  #set($canCreateEvents = $xwiki.hasAccessLevel("edit", $xcontext.getUser(), $calendarDoc))
93 -#set ($calendarsFilter = $request.parameterMap['calendarsFiltler'])
94 -{{/velocity}}
95 95  
96 -{{velocity}}
97 -#if ($xcontext.action == 'view' && $filter != 'page')
98 - #set ($statement = "select doc.fullName, calendar.color from Document doc, doc.object(MoccaCalendar.MoccaCalendarClass) calendar where doc.name <> 'MoccaCalendarTemplate'")
99 - #set ($results = $services.query.xwql($statement).execute())
100 - #if ($results.size() > 1)
101 - === $services.localization.render('MoccaCalendar.calendarevent.filterEvents') ===
102 - {{html clean="false"}}
103 - <form action="" method="get">
104 - #foreach ($result in $results)
105 - #set ($docFullName = $result[0])
106 - #set ($backgroundColor = $result[1])
107 - #set ($checked = $calendarsFilter.contains($docFullName))
108 - #set ($title = $xwiki.getDocument($docFullName).displayTitle)
109 - <div>
110 - <input type="checkbox" id="$docFullName" name="calendarsFiltler" value="$docFullName" #if ($checked) checked #end style="accent-color:$backgroundColor"/>
111 - <label for="$docFullName">$title</label>
112 - </div>
113 - #end
114 - <input type="submit" class="btn btn-primary" value="$services.localization.render('MoccaCalendar.calendarevent.filterEvents.submit')" />
115 - </form>
116 - {{/html}}
117 - #end
118 -#end
119 -#if ($xcontext.action=='view' || $xcontext.action=='export')
120 -{{html clean="false" wiki="false"}}
91 +{{/velocity}}{{velocity}}#if($xcontext.action=='view'){{html clean="false" wiki="false"}}
121 121  #if($canCreateEvents)
122 122  ## create event link
123 123  <div class="calendar-buttons">
... ... @@ -143,7 +143,6 @@
143 143   outputSyntax: 'plain',
144 144   calendarDoc: "$!escapetool.javascript($calendarDoc)",
145 145   filter: "$!escapetool.javascript($filter)",
146 - calendarsFilter: "$!escapetool.javascript($stringtool.join($calendarsFilter, ','))",
147 147   classname: "MoccaCalendar.MoccaCalendarEventClass",
148 148   startfield: "startDate",
149 149   endfield: "endDate",
... ... @@ -152,7 +152,6 @@
152 152  
153 153   // page is now ready, initialize the calendar...
154 154   var calendar = jQuery('#calendar${calcounter}').fullCalendar({
155 - eventLimit: $escapetool.javascript($eventLimit),
156 156   events: {
157 157   url : "$!escapetool.javascript($jsonUrl)",
158 158   type: 'GET',
XWiki.WikiMacroParameterClass[9]
Parameter default value
... ... @@ -1,1 +1,0 @@
1 -false
Parameter description
... ... @@ -1,1 +1,0 @@
1 -Sets a limit on daily event display. Extra events appear in a popover. If false (default) shows all events, else (true) restricts them to the day cell’s height.
Parameter mandatory
... ... @@ -1,1 +1,0 @@
1 -No
Parameter name
... ... @@ -1,1 +1,0 @@
1 -eventLimit