Compare commits
No commits in common. "bacb350a180299fec8e277dc251f951276fe1c67" and "10d6f3078148251756f5eaca3441e032d4b980b4" have entirely different histories.
bacb350a18
...
10d6f30781
|
@ -1,7 +1,7 @@
|
|||
.slide-chart-container {
|
||||
width: 90%;
|
||||
min-width: 880px;
|
||||
height: 650px;
|
||||
height: 750px;
|
||||
margin: auto;
|
||||
padding-left: 6%;
|
||||
}
|
||||
|
|
|
@ -21,7 +21,9 @@ export class StatisticOverviewComponent {
|
|||
pointSumData: any[] = [];
|
||||
playerData: any[] = [];
|
||||
|
||||
|
||||
colorScheme = {
|
||||
group: 'Ordinal',
|
||||
domain: ['#0000FF', '#B22222']
|
||||
};
|
||||
gradient = false;
|
||||
|
@ -55,6 +57,7 @@ export class StatisticOverviewComponent {
|
|||
}
|
||||
|
||||
initWars(campaigns) {
|
||||
|
||||
let wars = [];
|
||||
let itemsProcessed = 0;
|
||||
campaigns = campaigns.filter(campaign => this.id === 'all' || campaign._id === this.id);
|
||||
|
@ -89,16 +92,32 @@ export class StatisticOverviewComponent {
|
|||
"name": "CSAT",
|
||||
"series": []
|
||||
}];
|
||||
let pointsSumObj = JSON.parse(JSON.stringify(pointsObj));
|
||||
let playersObj = JSON.parse(JSON.stringify(pointsObj));
|
||||
|
||||
let pointsSumObj = [
|
||||
{
|
||||
"name": "NATO",
|
||||
"series": []
|
||||
},
|
||||
{
|
||||
"name": "CSAT",
|
||||
"series": []
|
||||
}];
|
||||
let playersObj = [
|
||||
{
|
||||
"name": "NATO",
|
||||
"series": []
|
||||
},
|
||||
{
|
||||
"name": "CSAT",
|
||||
"series": []
|
||||
}
|
||||
];
|
||||
for (let i = wars.length - 1; i >= 0; i--) {
|
||||
let j = wars.length - i - 1;
|
||||
// const warDateString = new Date(wars[i].date); TODO: use ngx-chart timeline
|
||||
const isoDate = wars[i].date.slice(0, 10);
|
||||
const dayDate = parseInt(isoDate.slice(8, 10)) + 1;
|
||||
const warDateString = (dayDate < 10 ? "0" + dayDate : dayDate) + '.'
|
||||
+ isoDate.slice(5, 7) + '.' + isoDate.slice(2, 4);
|
||||
+ isoDate.slice(5, 7) + '.' + isoDate.slice(0, 4);
|
||||
|
||||
pointsObj[0].series.push({
|
||||
name: warDateString,
|
||||
|
@ -133,7 +152,7 @@ export class StatisticOverviewComponent {
|
|||
this.pointData = pointsObj;
|
||||
this.pointSumData = pointsSumObj;
|
||||
this.playerData = playersObj;
|
||||
Object.assign(this, [this.pointData, this.pointSumData, this.playerData]);
|
||||
Object.assign(this, [this.pointData, this.pointSumData, this.playerData])
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue