diff --git a/html/33.php b/html/33.php
new file mode 100644
index 0000000000000000000000000000000000000000..d56b70430503d2e87a65be6ae392aab5e3c802ae
--- /dev/null
+++ b/html/33.php
@@ -0,0 +1,39 @@
+---
+layout: default
+saison: 33
+date: '2022-05-29'
+ligaspieltag: 3
+step: 1
+finals_step: 2
+finalteams: 8
+startliste:
+ -
+ - fi
+ - es
+ - sx
+ - nl
+ - pl
+ - is
+ - hr
+ - se
+ - fr
+ - bw
+ - cm
+ - co
+ - cy
+
+startliste_partien_pause:
+ - 2
+ - 2
+ - 3
+ - 1
+ - 2
+ - 2
+ - 2
+ - 2
+ - 2
+ - 2
+ - 2
+ - 2
+ - 0
+---
diff --git a/html/_data/global.yml b/html/_data/global.yml
index dbfdfe074e130cc86932ed21a93cb17928e20633..a4e9c0aa683555035aa9a6f7b2ceee9cafa8c22d 100644
--- a/html/_data/global.yml
+++ b/html/_data/global.yml
@@ -1 +1 @@
-saison_now: 32
+saison_now: 33
diff --git a/html/_data/partien/13.yml b/html/_data/partien/13.yml
new file mode 100644
index 0000000000000000000000000000000000000000..87ae4f2be023d208baef4c8fab7f59a6cb2a1c9a
--- /dev/null
+++ b/html/_data/partien/13.yml
@@ -0,0 +1,13 @@
+- [ 1, 2,13, 3,12, 4,11, 5,10, 6,9, 7,8 ]
+- [ 1, 1,2, 13,3, 12,4, 11,5, 10,6, 9,7 ]
+- [ 1, 1,3, 4,13, 5,12, 6,11, 7,10, 8,9 ]
+- [ 1, 1,4, 2,3, 13,5, 12,6, 11,7, 8,10 ]
+- [ 1, 5,1, 2,4, 6,13, 7,12, 8,11, 9,10 ]
+- [ 1, 1,6, 2,5, 3,4, 13,7, 12,8, 9,11 ]
+- [ 1, 7,1, 6,2, 3,5, 8,13, 9,12, 10,11 ]
+- [ 1, 1,8, 2,7, 3,6, 4,5, 13,9, 10,12 ]
+- [ 1, 9,1, 8,2, 3,7, 4,6, 10,13, 11,12 ]
+- [ 1, 10,1, 2,9, 3,8, 4,7, 5,6, 11,13 ]
+- [ 1, 11,1, 10,2, 9,3, 4,8, 5,7, 12,13 ]
+- [ 1, 12,1, 11,2, 3,10, 4,9, 5,8, 6,7 ]
+- [ 1, 13,1, 12,2, 11,3, 10,4, 5,9, 6,8 ]
diff --git a/html/_layouts/default.php b/html/_layouts/default.php
index 42dde78864b12866e66835d60482c8f95557392f..c79470638552d2afc517749c8ddf79fb418c3726 100644
--- a/html/_layouts/default.php
+++ b/html/_layouts/default.php
@@ -189,8 +189,9 @@ if( !empty($csv) ){
<th>Pl.</th>
<th>Sp.</th>
<th>Team</th>
- <th><i class="fas fa-crown" title="Titelgewinne"></i></th>
- <th><i class="fas fa-star" title="Finalteilnahmen"></i></th>
+ <th><i class="fas fa-trophy" title="Pokalgewinn"></i></th>
+ <th><i class="fas fa-crown" title="Meistertitel"></i></th>
+ <th><i class="fas fa-star" title="knapp gescheitert"></i></th>
<th title="Siege">S</th>
<th title="Unentschieden">U</th>
<th title="Niederlagen">N</th>
diff --git a/html/assets/css/custom.scss b/html/assets/css/custom.scss
index 694fe376b90087c24cc7284f56fb2dc5e30e67b5..5bce0e642e28bbe2bf41dc05b1a4b963e7280db8 100644
--- a/html/assets/css/custom.scss
+++ b/html/assets/css/custom.scss
@@ -221,17 +221,19 @@ tr.stats {
&:nth-child(3) { width: 220px; }
&:nth-child(4),
&:nth-child(5),
+ &:nth-child(5),
&:nth-child(6),
&:nth-child(7),
&:nth-child(8){ width: 15px; text-align: center; }
&:nth-child(9),
- &:nth-child(10),
- &:nth-child(11){ width: 50px; }
- &:nth-child(5){ width: 30px; padding-right: 20px; }
+ &:nth-child(11),
+ &:nth-child(12){ width: 20px; }
+ &:nth-child(6){ width: 20px; padding-right: 10px; }
+ &:nth-child(10){ width: 40px; }
}
th {
- .fa-crown, .fa-star { font-size: 0.9em; }
+ .fa-crown, .fa-star, .fa-trophy { font-size: 0.9em; }
}
}
}
@@ -266,6 +268,9 @@ td.n { color: firebrick; }
.fa-smile-wink { color: #aa3; }
.fa-star { color: #369; }
.fa-meh-rolling-eyes { color: #a42; }
+.fa-crown { color: goldenrod; }
+.fa-trophy { color: goldenrod; }
+
#saisons {
padding-left: 5px;
@@ -334,5 +339,3 @@ td.n { color: firebrick; }
}
}
}
-
-.fa-crown { color: goldenrod; }
diff --git a/html/assets/js/script.js b/html/assets/js/script.js
index 65fddb6759edec589d17c45e5450b665d3dae403..26b6323dcf729650c12ccd8a3ac6b14eeaf381de 100644
--- a/html/assets/js/script.js
+++ b/html/assets/js/script.js
@@ -430,7 +430,8 @@ function calculatePunktestand(saison,runde,show=true){
tmp+='<td>'+t.reduce( (a,b) => a+b )+'</td>';
tmp+='<td><img class="flags" src="./images/flags/'+(( v.flag ) ? v.flag : v.nt.toLowerCase())+'.svg"> <a href="javascript:calculateTeam('+((saison == 0) ? SAISON_NOW : saison)+',\''+v.nt+'\')">'+v.name.replace(/\(NL\)/g,'<sup>'+v.nt.toUpperCase()+'</sup></a>')+' <a href="'+v.link+'" target="ultrasoccer"><i class="fas fa-link"></i></a></td>';
tmp+='<td>'+ERGEBNISSE.filter((a) => ( a.runde=='F' && ( parseInt(a.TH) > parseInt(a.TA) && a.H == v.nt.toLowerCase() || parseInt(a.TH) < parseInt(a.TA) && a.A == v.nt.toLowerCase() ) ) ).length+'</td>';
- tmp+='<td>'+ERGEBNISSE.filter((a) => ( a.runde=='F' && ( a.H == v.nt.toLowerCase() || a.A == v.nt.toLowerCase() ) ) ).length+'</td>';
+ tmp+='<td>'+calculateAllPunktestand().filter((a) => ( a[0].nt == v.nt.toLowerCase() ) ).length+'</td>';
+ tmp+='<td>'+( calculateAllPunktestand().filter((a) => ( a[1].nt == v.nt.toLowerCase() ) ).length + ERGEBNISSE.filter((a) => ( a.runde=='F' && ( a.H == v.nt.toLowerCase() && a.TH < a.TA || a.A == v.nt.toLowerCase() && a.TH > a.TA ) ) ).length )+'</td>';
tmp+='<td>'+v[saison].Tr.map( (a) => ( ( a == 'S') ? 1 : 0 ) ).reduce( (a,b) => a+b )+'</td>';
tmp+='<td>'+v[saison].Tr.map( (a) => ( ( a == 'U') ? 1 : 0 ) ).reduce( (a,b) => a+b )+'</td>';
tmp+='<td>'+v[saison].Tr.map( (a) => ( ( a == 'N') ? 1 : 0 ) ).reduce( (a,b) => a+b )+'</td>';
@@ -673,3 +674,17 @@ function hideLastResults(force=false){
function ignoreHideLastResults(){
ignore_hidelastresults=true;
}
+
+
+
+
+function calculateAllPunktestand(){
+
+ var T=[];
+ for( var i=0; i<=SAISON_NOW-26; i++){
+ if( ERGEBNISSE.filter((a) => ( a.runde=='F' && a.saison==i+26 )).length == 1 ){
+ T.push( JSON.parse(JSON.stringify( calculatePunktestand(i+26,7,false) )) );
+ }
+ }
+ return T;
+}