|
6 | 6 | dateRangeName = 'daterange',
|
7 | 7 | dateTimeFormat = 'DD-MM-YYYY',
|
8 | 8 | multiCheckBoxes = 'multi',
|
| 9 | + rawObject = 'raw', |
9 | 10 | single = 'single',
|
10 | 11 | empty = 'empty',
|
11 | 12 | showSingleFilterStatus = 'show-single',
|
|
255 | 256 | selectedValue,
|
256 | 257 | parameter;
|
257 | 258 |
|
| 259 | + populateSelectedFiltersFromDefaultValues(); |
| 260 | + |
258 | 261 | $.each(filterModal.selectedFilterParameters, function(serverName, selectedParameter){
|
259 | 262 | humanParameterName = selectedParameter.attributeHumaneName;
|
260 | 263 | showMoreModelName = calcShowMoreModelName(selectedParameter.attributeHumaneName);
|
|
517 | 520 | name = $(element).text();
|
518 | 521 | value = $(element).attr('data-attribute');
|
519 | 522 | break;
|
| 523 | + case rawObject: |
| 524 | + name = element.name; |
| 525 | + value = element.value; |
| 526 | + break; |
520 | 527 | default:
|
521 | 528 | $(element).text();
|
522 | 529 | break;
|
|
700 | 707 | filterModal.selectedFiltersObj = filterModal.that.find('#selected-filters');
|
701 | 708 | }
|
702 | 709 |
|
| 710 | + function populateSelectedFiltersFromDefaultValues(){ |
| 711 | + $.each(filterModal.settings.options, function(_, parameter){ |
| 712 | + var serverParameterName = parameter.attributeName, |
| 713 | + humanParameterName = parameter.name, |
| 714 | + selected = []; |
| 715 | + $.each(parameter.options, function(_, parameterOption){ |
| 716 | + if (parameterOption.selected){ |
| 717 | + var data = buildElementData(element, rawObject); |
| 718 | + selected.push(data); |
| 719 | + } |
| 720 | + }); |
| 721 | + |
| 722 | + if (0 > selected.length) { |
| 723 | + filterModal.selectedFilterParameters[serverParameterName] = { |
| 724 | + attributeHumaneName: humanParameterName, |
| 725 | + values: selected |
| 726 | + }; |
| 727 | + } |
| 728 | + }); |
| 729 | + |
| 730 | + } |
| 731 | + |
703 | 732 | function isEven(number){
|
704 | 733 | return 0 == number%2
|
705 | 734 | }
|
|
0 commit comments