|
764 | 764 |
|
765 | 765 | function addInputSelectedToDataModal(selectBox){
|
766 | 766 | var data = genericCollect(selectBox, textType);
|
767 |
| - modifySelectedFilterData(data.serverParameterName, data.value); |
| 767 | + modifySelectedFilterData(data.serverParameterName, data.value, textType); |
768 | 768 | }
|
769 | 769 |
|
770 | 770 | function bindSingleClick(){
|
|
783 | 783 | $('.remove-filter').on('click', function(){
|
784 | 784 | var serverFilterName = $(this).parent('.selectbox').attr('data-attribute');
|
785 | 785 |
|
786 |
| - modifySelectedFilterData(serverFilterName, undefined); |
| 786 | + modifySelectedFilterData(serverFilterName, undefined, null); |
787 | 787 |
|
788 | 788 | //re render the filter
|
789 | 789 | filterModal.that.renderFilter();
|
|
927 | 927 | }
|
928 | 928 |
|
929 | 929 |
|
930 |
| - function modifySelectedFilterData(key, value){ |
| 930 | + function modifySelectedFilterData(key, value, type){ |
931 | 931 | var removed = false;
|
932 | 932 | if (value) {
|
933 | 933 | filterModal.selectedFilterParameters[key] = value;
|
|
936 | 936 | delete filterModal.selectedFilterParameters[key];
|
937 | 937 | }
|
938 | 938 |
|
939 |
| - embodySelectedFiltersInUrl(removed) |
| 939 | + // currently on single and multi are supported, |
| 940 | + // TODO - add date range and text input |
| 941 | + if ($.inArray(type, [single, multiCheckBoxes]) > -1) { |
| 942 | + embodySelectedFiltersInUrl(removed) |
| 943 | + } |
940 | 944 |
|
941 | 945 | }
|
942 | 946 |
|
|
1091 | 1095 | humanParameterName = getAttributeHumanName(selectBox),
|
1092 | 1096 | data = buildElementData(selectedItem, single);
|
1093 | 1097 |
|
1094 |
| - modifySelectedFilterData(serverParameterName, {attributeHumaneName: humanParameterName, values: [data]}) |
| 1098 | + modifySelectedFilterData(serverParameterName, {attributeHumaneName: humanParameterName, values: [data]}, single) |
1095 | 1099 | }
|
1096 | 1100 |
|
1097 | 1101 | function addMultiSelectedToDataModal(selectBox, dontAlert){
|
|
1108 | 1112 | return {checked: []};
|
1109 | 1113 | }
|
1110 | 1114 |
|
1111 |
| - modifySelectedFilterData(serverParameterName, { attributeHumaneName: humanParameterName, values: optionsResult.checked}); |
| 1115 | + modifySelectedFilterData(serverParameterName, |
| 1116 | + { attributeHumaneName: humanParameterName, values: optionsResult.checked}, |
| 1117 | + multiCheckBoxes); |
1112 | 1118 |
|
1113 | 1119 | return {checked: optionsResult.checked}
|
1114 | 1120 | }
|
1115 | 1121 |
|
1116 | 1122 | function addDateSelectedToDataModal(selectBox){
|
1117 | 1123 | var data = genericCollect(selectBox, dateRange);
|
1118 | 1124 |
|
1119 |
| - modifySelectedFilterData(data.serverParameterName, data.value); |
| 1125 | + modifySelectedFilterData(data.serverParameterName, data.value, dateRange); |
1120 | 1126 | }
|
1121 | 1127 |
|
1122 | 1128 | function resetShowSingleFilterIfNeeded(){
|
|
1158 | 1164 | modifySelectedFilterData(serverParameterName, {
|
1159 | 1165 | attributeHumaneName: humanParameterName,
|
1160 | 1166 | values: selected
|
1161 |
| - }); |
| 1167 | + }, |
| 1168 | + parameter.type); |
1162 | 1169 | }
|
1163 | 1170 | }
|
1164 | 1171 | });
|
|
0 commit comments