Skip to content

Commit c1081fa

Browse files
authored
Merge pull request #470 from ImagingDataCommons/sprint-16-gw
fix to slider adjustments
2 parents f6e13bc + 706472b commit c1081fa

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

idc/templatetags/custom_tags.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,11 @@ def ceiling(item):
123123
return math.ceil(item)
124124

125125

126+
@register.filter
127+
def floor(item):
128+
return math.floor(item)
129+
130+
126131

127132

128133
@register.filter

static/js/image_search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2866,7 +2866,7 @@ require([
28662866
}
28672867
else{
28682868
min = Math.floor(curmin);
2869-
max = Math.floor(curmax);
2869+
max = Math.ceil(curmax);
28702870
lower=min;
28712871
upper=max;
28722872
//$(this).attr('data-curminrng', lower);

templates/idc/explore_data_core.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,9 @@ <h4 class="panel-title">Search Configuration
178178
<div id="{{ attr.name }}" data-filter-attr-id="{{ attr.id }}" class="collapse list-group-item__body"
179179

180180
{% if attr.min_max %}
181-
data-min="{{ attr.min_max.min }}" data-max="{{ attr.min_max.max }}"
181+
data-min="{{ attr.min_max.min|floor }}" data-max="{{ attr.min_max.max|ceiling }}"
182182
data-curmin="{{ attr.min_max.min }}" data-curmax="{{ attr.min_max.max }}"
183-
data-curminrng="{{ attr.min_max.min }}" data-curmaxrng="{{ attr.min_max.max }}"
183+
data-curminrng="{{ attr.min_max.min|floor }}" data-curmaxrng="{{ attr.min_max.max|ceiling }}"
184184

185185
{% endif %}>
186186
{% comment %}
@@ -249,9 +249,9 @@ <h4 class="panel-title">Search Configuration
249249

250250
<div id="{{ attr.name }}" data-filter-attr-id="{{ attr.id }}" data-filter-display-attr="{{ attr.display_name }}" data-plotnm="{{ attr.name|plotnm }}" class="collapse list-group-item__body collapse"
251251
{% if attr.min_max %}
252-
data-min="{{ attr.min_max.min }}" data-max="{{ attr.min_max.max|ceiling }}"
253-
data-curmin="{{ attr.min_max.min }}" data-curmax="{{ attr.min_max.max|ceiling }}"
254-
data-curminrng="{{ attr.min_max.min }}" data-curmaxrng="{{ attr.min_max.max|ceiling }}"
252+
data-min="{{ attr.min_max.min|floor }}" data-max="{{ attr.min_max.max|ceiling }}"
253+
data-curmin="{{ attr.min_max.min }}" data-curmax="{{ attr.min_max.max }}"
254+
data-curminrng="{{ attr.min_max.min|floor }}" data-curmaxrng="{{ attr.min_max.max|ceiling }}"
255255
{% endif %}>
256256
<ul id="{{ attr.name }}_list" class="search-checkbox-list" style="list-style: none;">
257257
{% for val in attr.values|order_seg:attr_setK %}
@@ -316,10 +316,10 @@ <h4 class="panel-title">Search Configuration
316316
</div>
317317
<div id="{{ attr.name }}" data-filter-attr-id="{{ attr.id }}" class="collapse list-group-item__body collapse" aria-expanded="false"
318318
{% if attr.min_max %}
319-
data-min="{{ attr.min_max.min }}" data-filter-display-attr="{{ attr.display_name }}"
319+
data-min="{{ attr.min_max.min|floor }}" data-filter-display-attr="{{ attr.display_name }}"
320320
data-max="{{ attr.min_max.max|ceiling }}"
321-
data-curmin="{{ attr.min_max.min }}" data-curmax="{{ attr.min_max.max|ceiling }}"
322-
data-curminrng="{{ attr.min_max.min }}" data-curmaxrng="{{ attr.min_max.max|ceiling }}"
321+
data-curmin="{{ attr.min_max.min }}" data-curmax="{{ attr.min_max.max }}"
322+
data-curminrng="{{ attr.min_max.min|floor }}" data-curmaxrng="{{ attr.min_max.max|ceiling }}"
323323
{% endif %}>
324324
<ul id="{{ attr.name }}_list" class="search-checkbox-list" style="list-style: none;">
325325
{% for val in attr.values %}

0 commit comments

Comments
 (0)