diff --git a/search/web/inc/da.jsp b/search/web/inc/da.jsp index 5141dccbda..305be7170b 100644 --- a/search/web/inc/da.jsp +++ b/search/web/inc/da.jsp @@ -56,7 +56,8 @@  Do -dateaxis.use" >a + dateaxis.use" >a +
diff --git a/search/web/inc/dac.jsp b/search/web/inc/dac.jsp index 9edccfe9b5..e1c74f3299 100644 --- a/search/web/inc/dac.jsp +++ b/search/web/inc/dac.jsp @@ -50,12 +50,19 @@ }
- Od + Od +
display:none; /> ">  Do -dateaxis.use" >a +
+ dateaxis.use" >a +
+
+ checked="checked" /> +
diff --git a/search/web/inc/searchParams-core.jsp b/search/web/inc/searchParams-core.jsp index 437fe16165..1c67d17e55 100644 --- a/search/web/inc/searchParams-core.jsp +++ b/search/web/inc/searchParams-core.jsp @@ -65,13 +65,27 @@ <%-- datum --%> - (rok:[${searchParams.yearFrom} TO ${searchParams.yearUntil}]) OR (datum_begin:[1 TO ${searchParams.yearUntil}] AND datum_end:[${searchParams.yearFrom} TO 3000]) - - - ${da} OR (datum:"${searchParams.dateFromFormatted}") - - - + + + datum_str:"${param.da_od}" + + + ${fn:substring(param.da_od, 1, -1)} + + ${fn:replace(daNoZeroes, '.0', '.')} + ${da} OR datum_str:"${daNoZeroes}" + + + + (rok:[${searchParams.yearFrom} TO ${searchParams.yearUntil}]) OR (datum_begin:[1 TO ${searchParams.yearUntil}] AND datum_end:[${searchParams.yearFrom} TO 3000]) + + + ${da} OR (datum:"${searchParams.dateFromFormatted}") + + + + + diff --git a/search/web/inc/usedFilters.jsp b/search/web/inc/usedFilters.jsp index f534ce2e0c..40f0e7172a 100644 --- a/search/web/inc/usedFilters.jsp +++ b/search/web/inc/usedFilters.jsp @@ -30,8 +30,16 @@ <%-- datum --%>
  • - " class="mainNav" href="javascript:removeDateAxisFilter();"> - : - + + + " class="mainNav" href="javascript:removeDateAxisFilter();"> + : + + + " class="mainNav" href="javascript:removeDateAxisFilter();"> + : - + +
  • diff --git a/search/web/js/dateAxisV.js b/search/web/js/dateAxisV.js index c39fea60ff..79efccf4f2 100644 --- a/search/web/js/dateAxisV.js +++ b/search/web/js/dateAxisV.js @@ -209,6 +209,8 @@ function doFilter(){ page.setValue("da_od", decodeDate($("#" + fromField).val())); page.setValue("da_do", decodeDate($("#" + toField).val())); + + page.setValue("exactDay", $("#exactDay").is(':checked')); var newurl = "r.jsp?" + page.toString() + dateAxisAdditionalParams; document.location.href = newurl;