hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

remove empty squads from army view; replace window.scroll with window.scrollTo()

pull/24/head
HardiReady 2018-02-03 12:13:11 +01:00
parent e2d522ac7c
commit fcae4d57cd
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
api/routes/overview.js
View File

@ -67,19 +67,24 @@ overview.route('/')
if (err) {
return next(err);
}
const s = squad.toObject();
s.members = squadMembers;
s.memberCount = squadMembers.length;
if (s.fraction === 'BLUFOR') {
delete s.fraction;
armyOverview.BLUFOR.squads.push(s);
countBlufor += s.members.length;
}
if (s.fraction === 'OPFOR') {
delete s.fraction;
armyOverview.OPFOR.squads.push(s);
countOpfor += s.members.length;
// do not return empty squads
if (squadMembers.length > 0) {
const s = squad.toObject();
s.members = squadMembers;
s.memberCount = squadMembers.length;
if (s.fraction === 'BLUFOR') {
delete s.fraction;
armyOverview.BLUFOR.squads.push(s);
countBlufor += s.members.length;
}
if (s.fraction === 'OPFOR') {
delete s.fraction;
armyOverview.OPFOR.squads.push(s);
countOpfor += s.members.length;
}
}
callback();
});
});

2
static/src/app/statistic/war-detail/war-detail.component.ts
View File

@ -66,7 +66,7 @@ export class WarDetailComponent {
this.fractionStatsInitialized = true;
});
}
window.scroll({left: 0, top: 0, behavior: 'smooth'});
window.scrollTo({left: 0, top: 0, behavior: 'smooth'});
}
/**