Skip to content
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

Jump to bottom

Filters in Claims #29

Merged
merged 2 commits into from
Jun 19, 2017
Merged

Filters in Claims #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f612ef
added menu bar
mukulsaini Jun 5, 2017
8453e5f
added filter by username in claims
mukulsaini Jun 6, 2017
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
43 changes: 36 additions & 7 deletions routes/root.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,44 @@ route.get('/leaderboard', (req, res) => {
route.get('/claims/view', (req, res) => {

const options = {
status : req.query.status,
username: req.query.username,
status : req.query.status || "claimed",
page : req.query.page || 1,
size : req.query.size || config.PAGINATION_SIZE
};

var menuH = {};

if (options.status == "claimed")
menuH[options.status] = 'active';
else if (options.status == "accepted")
menuH[options.status] = 'active';
else
menuH[options.status] = 'active';

options.page = parseInt(options.page);

du.getClaims(options).then(data => {
const pagination = [];
const lastPage = Math.ceil(data.count / options.size);
for(var i=1;i<=lastPage;i++)
pagination.push(`?page=${i}&size=${options.size}`);

const pagination = [];
const filter = [];
const lastPage = Math.ceil(data[1].count / options.size);

for(var i=1;i<=lastPage;i++){
if (options.username) {
pagination.push(`?page=${i}&size=${options.size}&status=${options.status}&username=${options.username}`);
}else{
pagination.push(`?page=${i}&size=${options.size}&status=${options.status}`);
}
}

data[0].forEach(function(item, index){
filter.push({
name : item.DISTINCT,
url : `?status=${options.status}&username=${item.DISTINCT}`
});
});

res.render('pages/claims/view', {
prevPage : options.page-1,
nextPage : options.page+1,
Expand All @@ -102,8 +127,12 @@ route.get('/claims/view', (req, res) => {
isLastPage : lastPage == options.page ,
page : options.page ,
size : options.size,
claims: data.rows,
menu: {claims_view: 'active'}
claims: data[1].rows,
menu: {claims_view: 'active'},
status1 : options.status,
menuH,
filter : filter,
username : options.username
})
}).catch((err) => {
console.log(err);
Expand Down
7 changes: 5 additions & 2 deletions utils/datautils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@ function getClaims(options) {

const offset = (options.page - 1 ) * options.size ;

const whereClause = options.status ? { status: options.status } : null ;
return db.Claim.findAndCountAll({
const whereClause = options.username ? { status: options.status, user : options.username } : { status: options.status} ;
const distinctUsers = db.Claim.aggregate('user', 'DISTINCT', { plain: false, where : { status: options.status} })
const allClaims = db.Claim.findAndCountAll({
limit : options.size,
offset : offset,
where : whereClause ,
order: [['updatedAt', 'DESC']]
});

return Promise.all([distinctUsers, allClaims])
}

function getClaimById(claimId) {
Expand Down
44 changes: 36 additions & 8 deletions views/pages/claims/view.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
<div class="ui stackable three item menu">
<a class="item {{menuH.claimed}}" href="?status=claimed">Claimed</a>
<a class="item {{menuH.accepted}}" href="?status=accepted">Accepted</a>
<a class="item {{menuH.rejected}}" href="?status=rejected">Rejected</a>
</div>
<div align="right">
<div class="ui floating dropdown labeled icon button">
<i class="filter icon"></i>
{{#if username}}
<span class="text">{{username}}</span>
{{else}}
<span class="text">Filter Usernames</span>
{{/if}}
<div class="menu">
<div class="ui icon search input">
<i class="search icon"></i>
<input type="text" placeholder="Search users...">
</div>

<div class="scrolling menu">
{{#each filter as |user|}}
<a class="item" href="{{user.url}}">
{{user.name}}
</a>
{{/each}}
</div>
</div>
</div>
</div>
<script>
$('.ui.dropdown').dropdown('hide');
</script>
<div class="ui very relaxed divided items">
{{#each claims as |claim|}}
{{#each claims as |claim|}}
<div class="four wide item">
<div class="image">
<a class="ui statistic" href="/claims/{{claim.id}}">
Expand Down Expand Up @@ -44,28 +76,24 @@
{{/each}}

<div class="pagination">


<div class="ui pagination menu">
{{#if isFirstPage}}
<a class="item disabled"> Prev</a>
{{else}}
<a class="item" href="?page={{prevPage}}&size={{size}}" >Prev </a>
<a class="item" href="?page={{prevPage}}&size={{size}}&status={{status}}&username={{username}}" >Prev </a>
{{/if}}

{{#each pagination as |link index|}}
<a class="item {{#equal (add index 1) ../page}} active {{/equal}} " href="{{link}}" >
<a class="item {{#equal (add index 1) ../page}} active {{/equal}} " href="{{link}}" >
{{add index 1}}
</a>
{{/each}}
{{#if isLastPage}}
<a class="item disabled"> Next </a>
{{else}}
<a class="item" href="?page={{nextPage}}&size={{size}}" >Next </a>
<a class="item" href="?page={{nextPage}}&size={{size}}&status={{status}}&username={{username}}" >Next </a>
{{/if}}
</div>


</div>
</div>
<style>
Expand Down