-
+ {{ myts }}
Punktetabelle
- {{ userpoints.points }} |
+ {{ userpoints.tsPoints }} |
diff --git a/src/components/startseite/Bilderbuch.vue b/src/components/startseite/Bilderbuch.vue
index e4d7030..11ebf2d 100644
--- a/src/components/startseite/Bilderbuch.vue
+++ b/src/components/startseite/Bilderbuch.vue
@@ -3,7 +3,7 @@ import RitzenbergenLib from "../../ritzenbergenlib.ts";
export default {
data() {
return {
- RitzenbergenLib
+ RitzenbergenLib: RitzenbergenLib.RitzenbergenLib
};
}
};
diff --git a/src/components/startseite/Events.vue b/src/components/startseite/Events.vue
index 19bf767..bc33a59 100644
--- a/src/components/startseite/Events.vue
+++ b/src/components/startseite/Events.vue
@@ -11,14 +11,14 @@ export default {
return {
openedModals,
modaltypes: ["text", "html"],
- RitzenbergenLib,
+ RitzenbergenLib: RitzenbergenLib.RitzenbergenLib,
};
},
computed: {
events() {
let result: any[]=[];
- $.ajax(RitzenbergenLib.api("get_events.php"),{
+ $.ajax(RitzenbergenLib.RitzenbergenLib.api("get_events.php"),{
crossDomain: true,
async: false,
success: function (data:string) {
diff --git a/src/components/startseite/Forms.vue b/src/components/startseite/Forms.vue
index aac4109..13ed5b3 100644
--- a/src/components/startseite/Forms.vue
+++ b/src/components/startseite/Forms.vue
@@ -7,13 +7,13 @@ export default {
return {
openedModals: [],
formValues: [],
- RitzenbergenLib,
+ RitzenbergenLib: RitzenbergenLib.RitzenbergenLib,
};
},
computed: {
forms() {
let result: any[] = [];
- $.ajax(RitzenbergenLib.api("/get_forms.php"), {
+ $.ajax(RitzenbergenLib.RitzenbergenLib.api("/get_forms.php"), {
async: false,
crossDomain: true,
success: function (data: string) {
@@ -54,7 +54,7 @@ export default {
},
formresults(formid){
let result: any[] = [];
- $.ajax(RitzenbergenLib.api("/get_ergebnisse.php"), {
+ $.ajax(RitzenbergenLib.RitzenbergenLib.api("/get_ergebnisse.php"), {
async: false,
crossDomain: true,
success: function (data: string) {
diff --git a/src/ritzenbergenlib.ts b/src/ritzenbergenlib.ts
index 342f12e..c0755fe 100644
--- a/src/ritzenbergenlib.ts
+++ b/src/ritzenbergenlib.ts
@@ -1,4 +1,26 @@
-export default class RitzenbergenLib {
+class User {
+ public username: string;
+ public kuerzel: string;
+ public points: number;
+ public id: number;
+ constructor (username: string, kuerzel: string, points: number, id: number) {
+ this.username = username;
+ this.kuerzel = kuerzel;
+ this.points=points;
+ this.id=id;
+ }
+}
+
+class SpieltagSumme {
+ public user: User;
+ public tsPoints: number;
+ constructor (user: User, tsPoints: number) {
+ this.user = user;
+ this.tsPoints = tsPoints;
+ }
+}
+
+class RitzenbergenLib {
static get_img(mypath: string) {
if(mypath.startsWith("/")) return "http://bilder.ritzenbergen.de"+mypath;
else return "http://bilder.ritzenbergen.de/"+mypath;
@@ -7,4 +29,10 @@ export default class RitzenbergenLib {
if(path.startsWith("/")) return "http://192.168.188.38/Jonas/ritzenbergenapi"+path;
else return "http://192.168.188.38/Jonas/ritzenbergenapi/"+path;
}
-}
\ No newline at end of file
+}
+
+export default {
+ RitzenbergenLib,
+ User,
+ SpieltagSumme
+}
\ No newline at end of file
diff --git a/src/views/Bulitipp.vue b/src/views/Bulitipp.vue
index dde1148..cd2e580 100644
--- a/src/views/Bulitipp.vue
+++ b/src/views/Bulitipp.vue
@@ -7,6 +7,7 @@ import Rangliste from "../components/bulitipp/Rangliste.vue";
import Paarungsergebnisse from "../components/bulitipp/Paarungsergebnisse.vue";
import Tabelle from "../components/bulitipp/Tabelle.vue";
import RitzenbergenLib from "../ritzenbergenlib.ts";
+import SpieltagSumme from "../ritzenbergenlib.ts";
import Loading from "../components/bulitipp/Loading.vue";
export default {
@@ -23,46 +24,59 @@ export default {
asyncComputed: {
users: {
get(){
- return fetch(RitzenbergenLib.api("/bulitipp/get-users.php"))
+ return fetch(RitzenbergenLib.RitzenbergenLib.api("/bulitipp/get-users.php"))
.then((response) => response.json())
.then((result2) => {
if(result2.reload) this.update();
return result2.data;
})
.then((result) => {
- console.log(result);
result.forEach((user, i) => {
let sum = 0;
- this.spieltage.forEach((spieltag) => {
+ this.ts.forEach((spieltag) => {
+ console.log(spieltag);
let points = spieltag.find((element) => {
return element.user.id === user.id;
});
- sum += points.points;
+ sum += points.tsPoints;
});
user.points = sum;
});
return result;
- }).catch((error) => {
+ })
+ .then((result) => {
+ return result.map(el => new RitzenbergenLib.User(el.name,el.kuerzel, el.points, el.id));
+ })
+ .catch((error) => {
return null;
});
},
default: [],
- watch: ["spieltage"]
+ watch: ["ts"]
},
- spieltage: {
+ ts: {
get() {
- return fetch(RitzenbergenLib.api("/bulitipp/ts.php"))
+ return fetch(RitzenbergenLib.RitzenbergenLib.api("/bulitipp/ts.php"))
.then((response) => response.json())
.then((result2) => {
if(result2.reload) this.update();
return result2.data;
- });
+ })
+ .then((result)=>{
+ result.map(element => element.map((element) => {
+
+ element.user=new RitzenbergenLib.User(element.user.name, element.user.kuerzel,0, element.user.id);
+ return element;
+ }));
+ return result;
+ })
+ .then((result)=>result.map((el) => el.map((el)=> new RitzenbergenLib.SpieltagSumme(el.user,el.points))));
},
default: []
},
saison:{
get(){
- return fetch(RitzenbergenLib.api("/bulitipp/saison.php"))
+ return fetch(RitzenbergenLib.RitzenbergenLib.api("/bulitipp/saison.php"))
.then((response) => response.text())
.then((result)=> parseInt(result));
},
@@ -200,7 +214,7 @@ export default {
];
},
loading(){
- return this.$asyncComputed.users.updating || this.$asyncComputed.spieltage.updating;
+ return this.$asyncComputed.users.updating || this.$asyncComputed.ts.updating;
},
},
@@ -267,7 +281,7 @@ export default {
-
+
diff --git a/src/views/Main.vue b/src/views/Main.vue
index a31e0e8..7012f89 100644
--- a/src/views/Main.vue
+++ b/src/views/Main.vue
@@ -27,7 +27,7 @@ export default {
data() {
return {
- RitzenbergenLib,
+ RitzenbergenLib: RitzenbergenLib.RitzenbergenLib,
};
},
mounted(){