Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • ultrasoccer/ultrasoccer-nationsleague
  • ultrasoccer/ultrasoccer-superleague
2 results
Show changes
Commits on Source (60)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1470 additions and 362 deletions
env/LH_PORT_pma 0 → 100644
View file @ 22f68f51
LH_PORT_pma=8081
html/50.php
View file @ 22f68f51
......@@ -7,8 +7,8 @@ step: 1
finals_step: 2
finalteams: 8
managervoting:
enabled: true
result: ''
enabled: false
result: tz # tz 3 / pl 2 / fr nl de 1
startliste:
-
- fi
......
html/51.php 0 → 100644
View file @ 22f68f51
---
layout: default
saison: 51
date: '2024-02-23'
ligaspieltag: 7
step: 1
finals_step: 2
finalteams: 8
managervoting:
enabled: false
result: se # 2 Deutschland und Schweden, 1 USA, Finnland, Irland, Tanzania / Stichwahl 5 Schweden / 2 Deutschland
startliste:
-
- us
- fi
- co
- kz
- is
- se
- nl
- pl
- fr
- tz
- de
- ie
startliste_partien_pause:
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 0
---
html/52.php 0 → 100644
View file @ 22f68f51
---
layout: default
saison: 52
date: '2024-03-26'
ligaspieltag: 4
step: 1
finals_step: 2
finalteams: 8
managervoting:
enabled: false
result: pl # pl 3 / tz 2 / nl se fr is 1
startliste:
-
- ie
- kz
- fi
- us
- nl
- fr
- co
- is
- pl
- tz
- se
- de
- kr
startliste_partien_pause:
- 2
- 2
- 3
- 1
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 0
---
html/53.php 0 → 100644
View file @ 22f68f51
---
layout: default
saison: 53
date: '2024-04-30'
ligaspieltag: 4
step: 1
finals_step: 2
finalteams: 8
managervoting:
enabled: false
result: us # 6 us / 1 de kz
startliste:
-
- fr
- de
- nl
- tz
- se
- co
- pl
- is
- us
- kr
- kz
- fi
- ie
- fo
startliste_partien_pause:
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 3
- 1
- 2
- 0
---
html/54.php 0 → 100644
View file @ 22f68f51
---
layout: default
saison: 54
date: '2024-06-04'
ligaspieltag: 4
step: 1
finals_step: 2
finalteams: 8
managervoting:
enabled: false
result: gh # gh 4 / ca tz fr co pl 1
startliste:
-
- kr
- se
- fo
- kz
- nl
- co
- us
- fr
- is
- tz
- pl
- gh
- ca
startliste_partien_pause:
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 0
---
html/55.php 0 → 100644
View file @ 22f68f51
---
layout: default
saison: 55
date: '2024-07-09'
ligaspieltag: 4
step: 1
finals_step: 2
finalteams: 8
managervoting:
enabled: false
result: se # 7 - se / 1 - ca
startliste:
-
- ca
- se
- kz
- nl
- fo
- is
- pl
- gh
- us
- co
- tz
- fr
startliste_partien_pause:
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 0
---
html/56.php 0 → 100644
View file @ 22f68f51
---
layout: default
saison: 56
date: '2024-08-13'
ligaspieltag: 4
step: 1
finals_step: 2
finalteams: 8
managervoting:
enabled: false
result: ca # ca 5 / kr 2 / tz fo 1
startliste:
-
- kz
- fo
- us
- pl
- se
- nl
- ca
- co
- gh
- tz
- is
- fr
- kr
- au
startliste_partien_pause:
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 0
---
html/57.php 0 → 100644
View file @ 22f68f51
---
layout: default
saison: 57
date: '2024-09-17'
ligaspieltag: 4
step: 1
finals_step: 2
finalteams: 8
managervoting:
enabled: false
result: au # au ca 3 / kr 2 / tz 1 = Stichwahl au 5 / ca 3
startliste:
-
- se
- kz
- is
- nl
- au
- kr
- gh
- co
- tz
- fo
- fr
- ca
- pl
- en
startliste_partien_pause:
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 1
- 2
- 2
- 2
- 2
- 0
---
html/58.php 0 → 100644
View file @ 22f68f51
---
layout: default
saison: 58
date: '2024-10-20'
ligaspieltag: 2
step: 1
finals_step: 2
finalteams: 8
managervoting:
enabled: false
result: fo # nl, fo = 3 / au, ca, gh = 1 => Stichwahl 4 fo / 3 nl
startliste:
-
- en
- kz
- fo
- co
- is
- nl
- se
- pl
- tz
- fr
- ca
- gh
- au
- kr
startliste_partien_pause:
- 1
- 2
- 2
- 2
- 2
- 1
- 3
- 1
- 2
- 2
- 2
- 2
- 0
---
html/59.php 0 → 100644
View file @ 22f68f51
---
layout: default
saison: 59
date: '2024-11-23'
ligaspieltag: 1
step: 1
finals_step: 2
finalteams: 8
managervoting:
enabled: false
result: kr # kr 3 au ca gh 2
startliste:
-
- en
- se
- kz
- fr
- pl
- co
- au
- is
- gh
- nl
- tz
- fo
- ca
- kr
startliste_partien_pause:
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 0
---
html/60.php 0 → 100644
View file @ 22f68f51
---
layout: default
saison: 60
date: '2024-12-29'
ligaspieltag: 2
step: 1
finals_step: 1
finalteams: 8
managervoting:
enabled: false
result: bo # bo 4 ca 3 au ar co 1
startliste:
-
- se
- kz
- is
- pl
- fo
- nl
- fr
- co
- kr
- tz
- ca
- gh
- au
- ar
- bo
startliste_partien_pause:
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 1
- 1
- 1
---
html/61.php 0 → 100644
View file @ 22f68f51
---
layout: default
saison: 61
date: '2025-02-02'
ligaspieltag: 2
step: 1
finals_step: 1
finalteams: 8
managervoting:
enabled: false
result: fo # fo 4 tz 3 se 1 ca 1
startliste:
-
- kz
- se
- is
- gh
- pl
- ar
- fo
- nl
- co
- ca
- fr
- au
- tz
- kr
- bo
startliste_partien_pause:
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 1
- 1
- 1
---
html/62.php 0 → 100644
View file @ 22f68f51
---
layout: default
saison: 62
date: '2025-03-09'
ligaspieltag: 2
step: 1
finals_step: 2
finalteams: 8
managervoting:
enabled: false
result: ''
startliste:
-
- ar
- is
- gh
- nl
- au
- kr
- co
- bo
- ca
- pl
- fo
- tz
startliste_partien_pause:
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
- 2
---
html/_data/global.yml
View file @ 22f68f51
saison_now: 50
saison_now: 62
html/_data/partien/14.yml 0 → 100644
View file @ 22f68f51
- [ 1, 1,14 ,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 ,8,14 ]
- [ 1, 3,1 ,14,2 ,4,13 ,5,12 ,6,11 ,7,10 ,8,9 ]
- [ 1, 1,4 ,2,3 ,13,5 ,12,6 ,11,7 ,10,8 ,9,14 ]
- [ 1, 5,1 ,2,4 ,14,3 ,6,13 ,7,12 ,8,11 ,9,10 ]
- [ 1, 1,6 ,2,5 ,3,4 ,13,7 ,12,8 ,11,9 ,10,14 ]
- [ 1, 7,1 ,6,2 ,3,5 ,4,14 ,8,13 ,9,12 ,10,11 ]
- [ 1, 1,8 ,2,7 ,3,6 ,4,5 ,13,9 ,12,10 ,14,11 ]
- [ 1, 9,1 ,8,2 ,7,3 ,4,6 ,5,14 ,10,13 ,11,12 ]
- [ 1, 1,10 ,2,9 ,3,8 ,4,7 ,5,6 ,11,13 ,14,12 ]
- [ 1, 11,1 ,10,2 ,9,3 ,8,4 ,5,7 ,6,14 ,12,13 ]
- [ 1, 12,1 ,2,11 ,3,10 ,4,9 ,5,8 ,6,7 ,13,14 ]
- [ 1, 13,1 ,12,2 ,11,3 ,10,4 ,9,5 ,6,8 ,14,7 ]
html/_data/partien/15.yml 0 → 100644
View file @ 22f68f51
- [ 1 ,2,15 ,3,14 ,4,13 ,5,12 ,6,11 ,7,10 ,8,9 ]
- [ 1 ,1,2 ,15,3 ,14,4 ,13,5 ,12,6 ,11,7 ,10,8 ]
- [ 1 ,1,3 ,4,15 ,5,14 ,6,13 ,7,12 ,8,11 ,9,10 ]
- [ 1 ,1,4 ,2,3 ,15,5 ,14,6 ,13,7 ,12,8 ,9,11 ]
- [ 1 ,5,1 ,2,4 ,6,15 ,7,14 ,8,13 ,9,12 ,10,11 ]
- [ 1 ,1,6 ,2,5 ,3,4 ,15,7 ,14,8 ,13,9 ,10,12 ]
- [ 1 ,7,1 ,6,2 ,3,5 ,8,15 ,9,14 ,10,13,11,12 ]
- [ 1 ,1,8 ,2,7 ,3,6 ,4,5 ,15,9 ,14,10,11,13 ]
- [ 1 ,9,1 ,8,2 ,3,7 ,4,6 ,10,15,11,14,12,13 ]
- [ 1 ,1,10 ,2,9 ,3,8 ,4,7 ,5,6 ,11,15,12,14 ]
- [ 1 ,11,1 ,10,2 ,9,3 ,4,8 ,5,7 ,12,15,13,14 ]
- [ 1 ,12,1 ,2,11 ,3,10 ,4,9 ,5,8 ,6,7 ,13,15 ]
- [ 1 ,13,1 ,12,2 ,11,3 ,10,4 ,5,9 ,6,8 ,14,15 ]
- [ 1 ,14,1 ,13,2 ,3,12 ,4,11 ,5,10 ,6,9 ,7,8 ]
- [ 1 ,15,1 ,14,2 ,13,3 ,12,4 ,11,5 ,6,10 ,7,9 ]
\ No newline at end of file
html/_layouts/default.php
View file @ 22f68f51
......@@ -12,6 +12,13 @@ include_once('functions/db_connect.php');
include_once('functions/db_methods.php');
if( !empty($_POST['csv']) ) $csv=$_POST['csv'];
if( !empty($_POST['p']) ){
$PARTIEN = json_decode( $_POST['p'], true );
//var_dump( $PARTIEN );
}
$secret='';
if( !empty($csv) ){
......@@ -21,6 +28,7 @@ if( !empty($csv) ){
if( $user ){
$C=preg_split('/
/',$csv);
/*
if( trim($C[0]) == 'runde,spieltag,T,H,A,TH,TA,MID' ){
foreach( $C as $i=>$v ){
if( $i > 0 ) db_addErgebnisse(SAISON.','.$v,$secret);
......@@ -42,6 +50,78 @@ if( !empty($csv) ){
} else if( trim($C[0]) == 'SpielerID,Spieler,Alter,Nt,Saison,Liga,TeamID,Team,S,T,A,Z+,Z-,Zd,Bk,Bi+,Bi-,Attr,Face,Karriereende' ){
db_addSpieler(array_pop($C),$secret);
}
*/
if( trim($C[0]) == 'runde,spieltag,T,H,A,TH,TA,MID' ){
foreach( $C as $i=>$v ){
if( $i > 0 ) db_addErgebnisse(SAISON.','.$v,$secret);
}
} else if( trim($C[0]) == 'Saison,Spieltag,MatchID,teamID,L,Pos,SpielerID,Spieler,Z+,Z-,T,A,Bk' ) {
$H=0; $A=0; $T=''; $runde=0; $spieltag=0; $TH=0; $TA=0; $MID=0;
$St = [];
foreach( $C as $i=>$v ){
if( $i > 0 ) $St[]=$v;
$V = preg_split('/,/',$v);
if( $V[4] == 'H' && $V[5]*1 > 0 ){
$TH+=$V[10]*1;
$H =$V[3]*1;
}
if( $V[4] == 'G' && $V[5]*1 > 0 ){
$TA+=$V[10]*1;
$A =$V[3]*1;
}
$MID=$V[2];
}
$inv = false;
$r = array_filter($PARTIEN,
function($v,$k){
global $H;
global $A;
global $inv;
global $H_nt;
global $A_nt;
if( $v['MID']*1 == 0 && $v['H']*1 == $H && $v['A']*1 == $A ){
$H_nt = $v['H_nt'];
$A_nt = $v['A_nt'];
return true;
} else if( $v['MID']*1 == 0 && $v['H'] == $A && $v['A'] == $H ){
$H_nt = $v['H_nt'];
$A_nt = $v['A_nt'];
$inv = true;
return true;
}
},ARRAY_FILTER_USE_BOTH
);
if( sizeof($r) > 0 ){
$r = array_values($r)[0];
$runde = $r['runde'];
$spieltag = $r['spieltag'];
//$T=$r['T'];
$T=(new DateTime())->format('Y-m-d');
if( $inv == true ){
db_addErgebnisse(implode( ',', [ SAISON, $runde, $spieltag, $T, $H_nt, $A_nt, $TA, $TH, $MID ] ), $secret);
} else {
db_addErgebnisse(implode( ',', [ SAISON, $runde, $spieltag, $T, $H_nt, $A_nt, $TH, $TA, $MID ] ), $secret);
}
foreach( $St as $st ){
db_addStatistik($st,$secret);
}
}
} else if( trim($C[0]) == 'TeamID,N,SpielerID,Attr,Spieler,Alter,Pos,S,T,A,Z+,Z-,Zd' ){
$TEAMS=db_getIdNtFromTeams();
foreach( $C as $i=>$v ){
$w=preg_split('/,/',$v);
if( !empty($TEAMS[$w[0]]) ){
if( $TEAMS[$w[0]] == $w[1] ){
//db_addSpieler($v,$secret);
}
}
}
} else if( trim($C[0]) == 'SpielerID,Spieler,Alter,Nt,Saison,Liga,TeamID,Team,S,T,A,Z+,Z-,Zd,Bk,Bi+,Bi-,Attr,Face,Karriereende' ){
db_addSpieler(array_pop($C),$secret);
}
}
}
......@@ -82,6 +162,7 @@ if( !empty($csv) ){
T2ID[v.nt] = v.id;
}
);
var STARTLISTE={{ page.startliste | jsonify }}; {% assign startliste_size = page.startliste[0] | size | append: '' %}
var STARTLISTE_PARTIEN={{ site.data.partien | map: startliste_size | jsonify }}[0];
var STARTLISTE_PARTIEN_PAUSE={{ page.startliste_partien_pause | jsonify }};
......@@ -104,6 +185,7 @@ if( !empty($csv) ){
var ERGEBNISSE=json_load('functions/get_ergebnisse.php');
var STAT_SAISON=json_load('functions/get_statistik_by_saison.php?saison='+SAISON);
var STAT_ALL=json_load('functions/get_statistik.php');
var STAT_ALL_MID=json_load('functions/get_statistikMID.php');
STATISTIK_SAISON={};
var MEISTERTITEL=calculateAllPunktestand().map((a) => ( a[0].nt ));
......@@ -131,7 +213,7 @@ if( !empty($csv) ){
STAT_ALL.forEach(
function(v,i){
if( STATISTIK_ALL[v.SpielerID] == undefined ) STATISTIK_ALL[v.SpielerID]={ 'S' :0, 'T' : 0, 'A' : 0, 'Z' : 0, 'Zpos' : 0, 'Zneg' : 0, 'MID' : [], 'face' : '' };
STATISTIK_ALL[v.SpielerID].S++;
STATISTIK_ALL[v.SpielerID].S+=v.Spiele*1;
STATISTIK_ALL[v.SpielerID].T+=v.Tore*1;
STATISTIK_ALL[v.SpielerID].A+=v.Assists*1;
STATISTIK_ALL[v.SpielerID].Z+=v.Zwk*1;
......@@ -329,10 +411,11 @@ if( !empty($csv) ){
</script>
<form method="POST">
<form id="formu" method="POST">
<div id="copypaste" class="d-none" ondblclick="$(this).toggleClass('d-none')">
<button type="submit">update</button>
<button type="button" onclick="$('#p').val(JSON.stringify( PARTIEN )); $('#formu').submit();">update</button>
<input type="text" name="secret" placeholder="secret" value="<?=$secret?>">
<input type="hidden" id="p" name="p" value="">
<textarea name="csv"></textarea>
</div>
</form>
......@@ -349,7 +432,8 @@ if( !empty($csv) ){
{% endif %}
{% endfor %}
</div>
<h4 class="tabelle">Tabelle <button>Zweikampf</button><button>Assists</button><button>Tore</button><button class="punktestand active">Punktestand</button></h2>
<h4 class="tabelle">Tabelle <a style="color: aliceblue;" href="https://ultrasoccer.de/forum/?thread=29761&title=nationsleaguenlfaqdatenzahlen&page=1#post12" target="ultrasoccer">[Regelwerk]</a> <button>Zweikampf</button><button>Assists</button><button>Tore</button><button class="punktestand active">Punktestand</button></h2>
<div class="divTable">
<table id="tabelle_P" class="tabelle">
<thead>
<tr>
......@@ -373,6 +457,7 @@ if( !empty($csv) ){
<tbody>
</tbody>
</table>
</div>
<table id="tabelle_T" class="tabelle d-none">
<thead>
......@@ -419,32 +504,38 @@ if( !empty($csv) ){
</tbody>
</table>
<table id="tabelle_team" class="tabelle d-none" ondblclick="backToActiveTable()">
<thead>
<tr>
<th></th>
<th>Nt</th>
<th>Spieler</th>
<th>Alter</th>
<th>S/T/A</th>
<th>Zwk</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
<table id="tabelle_historie" class="tabelle d-none" ondblclick="backToActiveTable()">
<thead>
<tr>
</tr>
</thead>
<tbody>
</tbody>
</table>
<div class="scrollen_team">
<table id="tabelle_team" class="tabelle d-none" ondblclick="backToActiveTable()">
<thead>
<tr>
<th></th>
<th>Nt</th>
<th>Spieler</th>
<th>Alter</th>
<th>S</th>
<th>T</th>
<th>A</th>
<th>Zwk</th>
<th></th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
<div class="scrollen">
<table id="tabelle_historie" class="tabelle d-none" ondblclick="backToActiveTable()">
<thead>
<tr>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
<h3>Spielerdebüts</h3>
<table id="news">
<h3 class="news">Spielerdebüts</h3>
<table id="news" class="news">
<thead>
<th>Zeit</th>
<th></th>
......
html/assets/css/custom.scss
View file @ 22f68f51
......@@ -263,9 +263,15 @@ tr.stats {
&:nth-child(1) { width: 20px; }
&:nth-child(2) { width: 30px; }
&:nth-child(3) { width: 270px; }
&:nth-child(4) { width: 60px; }
&:nth-child(5) { width: 30px; text-align: right; }
&:nth-child(6) { width: 30px; text-align: right; }
&:nth-child(7) { width: 30px; text-align: right; }
&:nth-child(8) { width: 100px; text-align: center; }
/* &:nth-child(4) { width: 50px; } */
}
}
margin-bottom: 5em;
}
td.p { color: green; }
......@@ -382,9 +388,10 @@ td.n { color: firebrick; }
}
.face {
position: fixed;
/* position: fixed;
top: 100px;
right: 65%;
*/
> img {
position: absolute;
&:nth-child(1){ z-index: 1 }
......@@ -400,6 +407,8 @@ td.n { color: firebrick; }
#news div.face {
position: relative;
top: 100px;
right: 65%;
img {
width: 20px;
left: 12px;
......@@ -408,7 +417,7 @@ td.n { color: firebrick; }
}
.tabelle td.face {
position: initial;
position: sticky;
img {
width: 20px;
}
......@@ -449,4 +458,39 @@ i.fas {
td.managervoted {
background: palegoldenrod;
}
div.scrollen {
overflow: scroll;
}
div.scrollen_team {
overflow: auto;
max-height: 80vh;
}
.gruppe0 {
background: beige !important;
}
.gruppe1 {
background: aliceblue !important;
}
.gruppe2 {
background: lightsteelblue !important;
}
.gruppe3 {
background: lavender !important;
}
.unformated {
text-decoration: inherit;
color: inherit;
}
.divTable {
max-height:70vh;
overflow: auto;
}
\ No newline at end of file
html/assets/js/script.js
View file @ 22f68f51
This diff is collapsed.

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net