Skip to Content

Changes for page SolrDateFacet

Last modified by Administrator on 2024/02/03 10:14
From version 1.1
edited by Administrator
on 2018/07/24 00:25
Change comment: Install extension [org.xwiki.platform:xwiki-platform-search-solr-ui/9.11.7]
To version 3.1
edited by Administrator
on 2020/12/29 00:17
Change comment: Install extension [org.xwiki.platform:xwiki-platform-search-solr-ui/12.10.2]

Summary

Details

Page properties
Content
... ... @@ -121,14 +121,6 @@
121 121  #end
122 122  
123 123  #macro (displaySearchFacetValue_customDateInterval)
124 - ## A simple date picker widget.
125 - #set ($discard = $xwiki.ssfx.use('uicomponents/widgets/datepicker/calendarDateSelect.css', true))
126 - #set ($discard = $xwiki.jsfx.use('uicomponents/widgets/datepicker/calendarDateSelect.js', true))
127 - ## Used to parse and serialize the selected date using the specified date format.
128 - #set ($discard = $xwiki.jsfx.use('uicomponents/widgets/datepicker/simpleDateFormat.js', true))
129 - ## A wrapper over the CalendarDateSelect widget that uses the SimpleDateFormat to parse/serialize the dates.
130 - #set ($discard = $xwiki.ssfx.use('uicomponents/widgets/datepicker/dateTimePicker.css', true))
131 - #set ($discard = $xwiki.jsfx.use('uicomponents/widgets/datepicker/dateTimePicker.js'))
132 132   #set ($dateFormat = $xwiki.getXWikiPreference('dateformat', $defaultDateFormat))
133 133   <label>
134 134   <input type="checkbox" class="hidden" />
... ... @@ -157,9 +157,13 @@
157 157   </label>
158 158   </dt>
159 159   <dd>
160 - <input type="text" id="$escapetool.xml($facetRequestParameter)_startDate" name="startDate"
161 - value="$escapetool.xml($services.localization.render('solr.facet.date.start'))"
162 - class="datetime withTip" title="$escapetool.xml($dateFormat)" />
152 + #set ($startDatePickerParams = {
153 + 'id': "${facetRequestParameter}_startDate",
154 + 'name': 'startDate',
155 + 'data-format': $dateFormat,
156 + 'placeholder': $services.localization.render('solr.facet.date.start')
157 + })
158 + #dateTimePicker($startDatePickerParams)
163 163   </dd>
164 164   <dt class="hidden">
165 165   <label for="$escapetool.xml($facetRequestParameter)_endDate">
... ... @@ -167,9 +167,13 @@
167 167   </label>
168 168   </dt>
169 169   <dd>
170 - <input type="text" id="$escapetool.xml($facetRequestParameter)_endDate" name="endDate"
171 - value="$escapetool.xml($services.localization.render('solr.facet.date.end'))"
172 - class="datetime withTip" title="$escapetool.xml($dateFormat)" />
166 + #set ($endDatePickerParams = {
167 + 'id': "${facetRequestParameter}_endDate",
168 + 'name': 'endDate',
169 + 'data-format': $dateFormat,
170 + 'placeholder': $services.localization.render('solr.facet.date.end')
171 + })
172 + #dateTimePicker($endDatePickerParams)
173 173   </dt>
174 174   </dl>
175 175   <div>
... ... @@ -186,7 +186,7 @@
186 186   $escapetool.xml($facetValue.label)
187 187   #elseif ($facetValue.start || $facetValue.end)
188 188   ## Compute the client timezone.
189 - #set ($timezoneOffsetInMinutes = $mathtool.toInteger($request.timezoneOffset))
189 + #set ($timezoneOffsetInMinutes = $numbertool.toNumber($request.timezoneOffset).intValue())
190 190   #set ($offsetHours = $timezoneOffsetInMinutes / 60)
191 191   #set ($offsetMinutes = $mathtool.abs($timezoneOffsetInMinutes) % 60)
192 192   #set ($clientTimezone = $xwiki.jodatime.getTimezone($offsetHours, $offsetMinutes))
... ... @@ -224,7 +224,7 @@
224 224  
225 225  #macro (handleCustomDateInterval)
226 226   ## Compute the client timezone.
227 - #set ($timezoneOffsetInMinutes = $mathtool.toInteger($request.timezoneOffset))
227 + #set ($timezoneOffsetInMinutes = $numbertool.toNumber($request.timezoneOffset).intValue())
228 228   #set ($offsetHours = $timezoneOffsetInMinutes / 60)
229 229   #set ($offsetMinutes = $mathtool.abs($timezoneOffsetInMinutes) % 60)
230 230   #set ($clientTimezone = $xwiki.jodatime.getTimezone($offsetHours, $offsetMinutes))