Skip to content

fix: all date filter #6283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Feb 5, 2021
Merged

fix: all date filter #6283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
14cfd9c
added accordion for mobile in twitter
ranjitkshah Dec 23, 2020
f6eeb10
all date and upcomingfilter
ranjitkshah Jan 8, 2021
67fb253
fix
ranjitkshah Jan 9, 2021
0427b6c
fix
ranjitkshah Jan 9, 2021
335d26b
position change
ranjitkshah Jan 10, 2021
c41a39e
f
ranjitkshah Jan 12, 2021
77a1f44
f
ranjitkshah Jan 12, 2021
123527a
f
ranjitkshah Jan 12, 2021
b072e8b
fix
ranjitkshah Jan 15, 2021
bef96ef
f
ranjitkshah Jan 15, 2021
69eb271
Merge branch 'development' into issue-5921
ranjitkshah Jan 30, 2021
8b6d7db
Merge branch 'development' into issue-5921
ranjitkshah Feb 4, 2021
ab43629
all date filter only
ranjitkshah Feb 4, 2021
037383a
lint
ranjitkshah Feb 4, 2021
db11667
lint
ranjitkshah Feb 4, 2021
0cf37e6
f
ranjitkshah Feb 4, 2021
6736846
Merge branch 'development' into issue-5921
ranjitkshah Feb 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/components/explore/side-bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ export default class SideBar extends Component {
break;

case 'all_dates':
newStartDate = 'all_date';
break;

case 'today':
Expand Down
47 changes: 32 additions & 15 deletions app/routes/explore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,20 +223,37 @@ export default class ExploreRoute extends Route {
]
});
} else if (params.start_date) {
filterOptions.push({
or: [
{
name : 'starts-at',
op : 'ge',
val : params.start_date
},
{
name : 'ends-at',
op : 'ge',
val : params.start_date
}
]
});
if (params.start_date === 'all_date') {
filterOptions.push({
or: [
{
name : 'starts-at',
op : 'le',
val : moment().toISOString()
},
{
name : 'ends-at',
op : 'ge',
val : moment().toISOString()
}
]
});
} else {
filterOptions.push({
or: [
{
name : 'starts-at',
op : 'ge',
val : params.start_date
},
{
name : 'ends-at',
op : 'ge',
val : params.start_date
}
]
});
}
} else if (params.is_past) {
filterOptions.push({
and: [
Expand Down Expand Up @@ -272,7 +289,7 @@ export default class ExploreRoute extends Route {
return this.infinity.model('event', {
include : 'event-topic,event-sub-topic,event-type',
filter : filterOptions,
sort : params.is_past ? '-starts-at' : 'starts-at',
sort : params.is_past || (params.start_date === 'all_date') ? '-starts-at' : 'starts-at',
perPage : 6,
startingPage : 1,
perPageParam : 'page[size]',
Expand Down
2 changes: 1 addition & 1 deletion app/templates/explore.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<a href="#" role="button" {{action 'clearFilter' 'event_type'}}><i class="icon close"></i></a>
</div>
{{/if}}
{{#if this.filters.start_date}}
{{#if (and this.filters.start_date (not-eq this.filters.start_date "all_date"))}}
<div class="ui mini label">
{{general-date this.filters.start_date 'date-short'}}
<a href="#" role="button" {{action 'clearFilter' 'start_date'}}><i class="icon close"></i></a>
Expand Down