scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2905 from urbanrotnik/ur-sci-5085-active-filters

Browse source 
Add mark for active filters [SCI-5085]
This commit is contained in:
Urban Rotnik 2020-10-25 16:06:59 +01:00 committed by GitHub
parent c5a1d34c36 75351a3aed
commit b23f110184
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/javascripts/dashboard/current_tasks.js
View file

@ -38,6 +38,17 @@ var DasboardCurrentTasksWidget = (function() {
return values;
}
function markAppliedFilters(state) {
if (state.statuses.sort().toString() === getDefaultStatusValues().sort().toString()
&& (state.project_id.length === 0)
&& (state.sort === 'due_date')
&& (state.experiment_id.length === 0)) {
$('.filter-container').removeClass('filters-applied');
} else {
$('.filter-container').addClass('filters-applied');
}
}
function initInfiniteScroll() {
InfiniteScroll.init('.current-tasks-list', {
url: $('.current-tasks-list').data('tasksListUrl'),
@ -73,6 +84,7 @@ var DasboardCurrentTasksWidget = (function() {
};
if (filterState) {
markAppliedFilters(filterState);
localStorage.setItem('current_tasks_filters_per_team/' + teamId, JSON.stringify(filterState));
}
}
@ -100,6 +112,7 @@ var DasboardCurrentTasksWidget = (function() {
// Select saved navbar state
$('.current-tasks-navbar .navbar-link').removeClass('active');
$('.current-tasks-navbar').find(`[data-mode='${parsedFilterState.mode}']`).addClass('active');
markAppliedFilters(parsedFilterState);
} catch (e) {
dropdownSelector.selectValues(statusFilter, getDefaultStatusValues());
}

12
app/assets/stylesheets/dashboard/current_tasks.scss
View file

@ -111,6 +111,18 @@
width: 100%;
}
}
&.filters-applied::after {
background: $brand-danger;
border: 1px solid $color-white;
border-radius: 50%;
content: "";
height: .5em;
left: 1.5em;
position: absolute;
top: .5em;
width: .5em;
}
}
.widget-placeholder {