diff --git a/static/src/app/army/army.component.ts b/static/src/app/army/army.component.ts
index f1d982e..55565dd 100644
--- a/static/src/app/army/army.component.ts
+++ b/static/src/app/army/army.component.ts
@@ -1,8 +1,7 @@
import {Component} from "@angular/core";
-import {Army, War} from "../models/model-interfaces";
+import {Army} from "../models/model-interfaces";
import {ArmyService} from "../services/army-service/army.service";
import {ActivatedRoute, Router} from "@angular/router";
-import {WarService} from "../services/war-service/war.service";
@Component({
@@ -14,34 +13,9 @@ export class ArmyComponent {
army: Army = {NATO: {squads: [], memberCount: 0}, CSAT: {squads: [], memberCount: 0}};
- chartData: any[] = [];
-
- view: any[] = [700, 400];
-
- // options
- showXAxis = true;
- showYAxis = true;
- timeline=true;
- gradient = false;
- showLegend = true;
- legendTitle = "";
- showXAxisLabel = true;
- xAxisLabel = 'Schlachtdatum';
- showYAxisLabel = true;
- yAxisLabel = 'Punkte';
-
- colorScheme = {
- domain: ['#0000FF', '#B22222', '#C7B42C', '#AAAAAA']
- };
-
- // line, area
- autoScale = false;
-
constructor(private router: Router,
private route: ActivatedRoute,
- private armyService: ArmyService,
- private warService: WarService) {
- Object.assign(this, this.chartData)
+ private armyService: ArmyService) {
}
ngOnInit() {
@@ -49,39 +23,10 @@ export class ArmyComponent {
.subscribe(army => {
this.army = army;
});
- this.warService.getAllWars()
- .subscribe((wars) => {
- let updateObj = [{
- "name": "NATO",
- "series": []
- },
- {
- "name": "CSAT",
- "series": []
- }];
- for (let i = 0; i < wars.length; i++) {
- let warDateString = wars[i].date;
- let bluforData = {
- name: warDateString,
- value: wars[i].ptBlufor
- };
- updateObj[0].series.push(bluforData);
- let opforData = {
- name: warDateString,
- value: wars[i].ptOpfor
- };
- updateObj[1].series.push(opforData);
- }
- this.chartData = updateObj;
- })
};
select(memberId) {
this.router.navigate(['member', memberId], {relativeTo: this.route});
}
- onSelect(event) {
- console.log(event);
- }
-
}
diff --git a/static/src/app/statistic/statistic.component.css b/static/src/app/statistic/statistic.component.css
new file mode 100644
index 0000000..7a0fe4c
--- /dev/null
+++ b/static/src/app/statistic/statistic.component.css
@@ -0,0 +1,48 @@
+h1 {
+ width: 920px;
+ margin-bottom: 50px;
+ margin-left: 25%
+}
+
+img {
+ margin-top: 10px;
+ padding-right: 30px;
+}
+
+.div-table {
+ display: table;
+ border-radius: 10px;
+ margin-left: 1%;
+ width: auto;
+ border-spacing: 5px; /* cellspacing:poor IE support for this */
+}
+
+.div-table-row {
+ display: table-row;
+ width: auto;
+ clear: both;
+}
+
+.div-table-col {
+ float: left; /* fix for buggy browsers */
+ display: table-column;
+ padding: 5px 15px 5px 15px;
+}
+
+.army-head {
+ font-weight: bolder;
+ text-align: center
+}
+
+.member-link {
+ cursor: pointer;
+ text-decoration: underline;
+}
+
+.text-opfor {
+ color: firebrick;
+}
+
+.text-blufor {
+ color: blue;
+}
diff --git a/static/src/app/statistic/statistic.component.html b/static/src/app/statistic/statistic.component.html
new file mode 100644
index 0000000..d13d4fb
--- /dev/null
+++ b/static/src/app/statistic/statistic.component.html
@@ -0,0 +1,23 @@
+
Statistik
+
+
+
+
+
+
+
diff --git a/static/src/app/statistic/statistic.component.ts b/static/src/app/statistic/statistic.component.ts
new file mode 100644
index 0000000..dbc9de3
--- /dev/null
+++ b/static/src/app/statistic/statistic.component.ts
@@ -0,0 +1,54 @@
+import {Component} from "@angular/core";
+import {WarService} from "../services/war-service/war.service";
+
+
+@Component({
+ selector: 'statistic',
+ templateUrl: './statistic.component.html',
+ styleUrls: ['./statistic.component.css']
+})
+export class StatisticComponent {
+
+ chartData: any[] = [];
+
+ colorScheme = {
+ domain: ['#0000FF', '#B22222', '#C7B42C', '#AAAAAA']
+ };
+
+ constructor(private warService: WarService) {
+ Object.assign(this, this.chartData)
+ }
+
+ ngOnInit() {
+ this.warService.getAllWars()
+ .subscribe((wars) => {
+ let updateObj = [{
+ "name": "NATO",
+ "series": []
+ },
+ {
+ "name": "CSAT",
+ "series": []
+ }];
+ for (let i = 0; i < wars.length; i++) {
+ let warDateString = new Date(wars[i].date);
+ let bluforData = {
+ name: warDateString,
+ value: wars[i].ptBlufor
+ };
+ updateObj[0].series.push(bluforData);
+ let opforData = {
+ name: warDateString,
+ value: wars[i].ptOpfor
+ };
+ updateObj[1].series.push(opforData);
+ }
+ this.chartData = updateObj;
+ })
+ };
+
+ onSelect(event) {
+ console.log(event);
+ }
+
+}