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) { if (err) {
return next(err); return next(err);
} }
const s = squad.toObject();
s.members = squadMembers; // do not return empty squads
s.memberCount = squadMembers.length; if (squadMembers.length > 0) {
if (s.fraction === 'BLUFOR') { const s = squad.toObject();
delete s.fraction; s.members = squadMembers;
armyOverview.BLUFOR.squads.push(s); s.memberCount = squadMembers.length;
countBlufor += s.members.length; if (s.fraction === 'BLUFOR') {
} delete s.fraction;
if (s.fraction === 'OPFOR') { armyOverview.BLUFOR.squads.push(s);
delete s.fraction; countBlufor += s.members.length;
armyOverview.OPFOR.squads.push(s); }
countOpfor += s.members.length; if (s.fraction === 'OPFOR') {
delete s.fraction;
armyOverview.OPFOR.squads.push(s);
countOpfor += s.members.length;
}
} }
callback(); callback();
}); });
}); });

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

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