From 81020b66ba31e8b0531940da4debdb789fe593b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Nu=CC=88bel?= Date: Tue, 29 Nov 2022 15:39:41 +0100 Subject: [PATCH 1/6] FIX #31 Please update Database see updates.sql --- src/database/updates.sql | 1 + .../components/com_sportsmanager/admin.php | 9 ++++++++- .../com_sportsmanager/sportsmanager.php | 8 +++++++- .../views/sportsmanager/view_admin.php | 15 +++++++++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 src/database/updates.sql diff --git a/src/database/updates.sql b/src/database/updates.sql new file mode 100644 index 0000000..48802df --- /dev/null +++ b/src/database/updates.sql @@ -0,0 +1 @@ +ALTER TABLE `#__sportsmanager_rangliste` ADD COLUMN `lizenzen` varchar(50) NULL DEFAULT ''; diff --git a/src/structure/components/com_sportsmanager/admin.php b/src/structure/components/com_sportsmanager/admin.php index 3c1d545..45be134 100644 --- a/src/structure/components/com_sportsmanager/admin.php +++ b/src/structure/components/com_sportsmanager/admin.php @@ -6034,6 +6034,11 @@ function adminEditRangliste() { $rows = $db->loadObjectList(); if (count($rows) < 1) die ("Wrong id"); $rangliste = $rows[0]; + + if(isset($rangliste->lizenzen)) + { + $rangliste->lizenzen = explode(',', $rangliste->lizenzen); + } } $query = "SELECT * FROM #__sportsmanager_rangliste_system WHERE status > 0 " . ($id != 0 ? "OR rangliste_system_id = $rangliste->system_id " : "") . "ORDER BY systembezeichnung"; @@ -6094,11 +6099,12 @@ function adminSaveRangliste() { $maxalter = $jinput->get('maxalter', 0, 'INT'); $ohnealter = $jinput->get('ohnealter', 0, 'INT'); $geschlecht = $jinput->get('geschlecht', 0, 'INT'); + $lizenzen = $jinput->get('lizenzen', [], 'ARRAY'); $status = $jinput->get('status', 0, 'INT'); $reihenfolge = $jinput->get('reihenfolge', 0, 'INT'); $kategorie = $jinput->get('kategorie', 0, 'INT'); if ($id == 0) - $query = "INSERT INTO #__sportsmanager_rangliste (bezeichnung, saison_id, erster_tag, " . ($letzter_tag != null ? "letzter_tag, " : "") . "system_id, streichergebnisse, geschlecht, minalter, maxalter, ohnealter, status, reihenfolge, kategorie) VALUES ('$bezeichnung', '$saison_id', '$erster_tag', " . ($letzter_tag != null ? "'$letzter_tag', " : "") . "'$system_id', '$maximal_gewertet_zahl', " . ($geschlecht == null ? "null" : "'$geschlecht'") . ", " . ($minalter == null ? "null" : "'$minalter'") . ", " . ($maxalter == null ? "null" : "'$maxalter'") . ", '$ohnealter', '$status', '$reihenfolge', '$kategorie');"; + $query = "INSERT INTO #__sportsmanager_rangliste (bezeichnung, saison_id, erster_tag, " . ($letzter_tag != null ? "letzter_tag, " : "") . "system_id, streichergebnisse, geschlecht, lizenzen, minalter, maxalter, ohnealter, status, reihenfolge, kategorie) VALUES ('$bezeichnung', '$saison_id', '$erster_tag', " . ($letzter_tag != null ? "'$letzter_tag', " : "") . "'$system_id', '$maximal_gewertet_zahl', " . ($geschlecht == null ? "null" : "'$geschlecht'") . ", " . (count((array) $lizenzen) ? implode(',', $lizenzen) : "null") . ", " . ($minalter == null ? "null" : "'$minalter'") . ", " . ($maxalter == null ? "null" : "'$maxalter'") . ", '$ohnealter', '$status', '$reihenfolge', '$kategorie');"; else { $query = "UPDATE #__sportsmanager_rangliste" . "\n SET bezeichnung = '$bezeichnung'," @@ -6108,6 +6114,7 @@ function adminSaveRangliste() { . "\n system_id = '$system_id'," . "\n streichergebnisse = '$maximal_gewertet_zahl'," . "\n geschlecht = " . ($geschlecht != null ? "'$geschlecht'," : "NULL,") + . "\n lizenzen = " . (count((array) $lizenzen) ? "'" . implode(',', $lizenzen) . "',": "NULL,") . "\n minalter = " . ($minalter != null ? "'$minalter'," : "NULL,") . "\n maxalter = " . ($maxalter != null ? "'$maxalter'," : "NULL,") . "\n ohnealter = '$ohnealter'," diff --git a/src/structure/components/com_sportsmanager/sportsmanager.php b/src/structure/components/com_sportsmanager/sportsmanager.php index 1f452cd..e361efc 100644 --- a/src/structure/components/com_sportsmanager/sportsmanager.php +++ b/src/structure/components/com_sportsmanager/sportsmanager.php @@ -5524,6 +5524,7 @@ function teamSpielplanXML() { foreach ($ranglisten as $rangliste_index => $rangliste) { $rangliste_id = $rangliste->rangliste_id; + $rangliste->lizenzen = explode(',', $rangliste->lizenzen); $query = "SELECT *" . "\n FROM #__sportsmanager_rangliste_turnierdisziplin" . "\n INNER JOIN #__sportsmanager_turnierdisziplin USING (turnierdisziplin_id)" @@ -5576,7 +5577,7 @@ function teamSpielplanXML() { $system = $systeme[$systemid]; $systempunkte = $systemepunkte[$systemid]; - $query = "SELECT turniermeldung_id, platz, spieler_id, geburtsjahr, geschlecht" + $query = "SELECT turniermeldung_id, platz, spieler_id, geburtsjahr, geschlecht, lizenz" . "\n FROM #__sportsmanager_turniermeldung" . "\n INNER JOIN #__sportsmanager_turniermeldung_spieler USING (turniermeldung_id)" . "\n LEFT JOIN #__sportsmanager_spieler USING (spieler_id)" @@ -5626,6 +5627,10 @@ function teamSpielplanXML() { if ($rangliste->geschlecht == 2 && $turnierplatzierung->geschlecht == 'M') continue; } + if (!empty($rangliste->lizenzen) && count($rangliste->lizenzen)) { + if (!in_array($turnierplatzierung->lizenz, $rangliste->lizenzen)) + continue; // TODO @TimWedemann prüfen + } $meldung_einzelner_doppelspieler_gewertet = FALSE; if (!isset($meldungen[$turnierplatzierung->turniermeldung_id])) { @@ -5650,6 +5655,7 @@ function teamSpielplanXML() { if ($rangliste->geschlecht == 2 && $naechste_turnierplatzierung->geschlecht == 'M') $meldung_einzelner_doppelspieler_gewertet = TRUE; } + // TODO @TimWedemann muss hier was beachtet werden bzgl. Lizenzen? } } else $meldung_einzelner_doppelspieler_gewertet = TRUE; diff --git a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php index 1c3d66d..56b2dfc 100644 --- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php +++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php @@ -5319,6 +5319,21 @@ class HTML_sportsmanager_admin + + + : + + + lizenzen)) ? ' checked': ''; + echo '
'; + } + ?> + + : From 89ae0e31773944b9140da6ba382192ddc868d03a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Nu=CC=88bel?= Date: Tue, 29 Nov 2022 16:09:30 +0100 Subject: [PATCH 2/6] FIX #36 --- .../views/sportsmanager/view_admin.php | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php index 56b2dfc..73fc71a 100644 --- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php +++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php @@ -5325,7 +5325,7 @@ class HTML_sportsmanager_admin lizenzen)) ? ' checked': ''; @@ -10873,14 +10873,26 @@ class HTML_sportsmanager_admin : From ac6a0085be420636d303b9e578c8b5b2b2c42f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Nu=CC=88bel?= Date: Wed, 7 Dec 2022 10:37:25 +0100 Subject: [PATCH 3/6] add missing Option in rangliste_doppel_teilwertung --- .../views/sportsmanager/view_admin.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php index 73fc71a..d5e76fe 100644 --- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php +++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php @@ -10901,8 +10901,23 @@ class HTML_sportsmanager_admin = -10; $j -= 0.25) - echo ""; + $wertungen[] = $j; + } + + $wertungen[] = 0.7; + $wertungen[] = 1.3; + $wertungen[] = 1.7; + $wertungen[] = -0.7; + $wertungen[] = -1.3; + $wertungen[] = -1.7; + + asort($wertungen); + + foreach ($wertungen as $wertung) { + echo ""; + } ?> From 79f7a3db034af3cda4862207132bbd3c10e23d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Nu=CC=88bel?= Date: Fri, 9 Dec 2022 17:02:19 +0100 Subject: [PATCH 4/6] fix issue --- .../com_sportsmanager/views/sportsmanager/view_admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php index d5e76fe..4ad2e14 100644 --- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php +++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php @@ -10901,8 +10901,8 @@ class HTML_sportsmanager_admin = -10; $j -= 0.25) + $wertungen = []; + for ($j = -1.25; $j >= -10; $j -= 0.25) { $wertungen[] = $j; } From 3a04f00f9360951618a345a1ab82ac4637c71304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20G=C3=B6rlich?= Date: Thu, 5 Jan 2023 11:08:44 +0100 Subject: [PATCH 5/6] Remove unused values from Ranglistenwertung --- .../com_sportsmanager/views/sportsmanager/view_admin.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php index 4ad2e14..4028fa2 100644 --- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php +++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php @@ -10906,9 +10906,6 @@ class HTML_sportsmanager_admin $wertungen[] = $j; } - $wertungen[] = 0.7; - $wertungen[] = 1.3; - $wertungen[] = 1.7; $wertungen[] = -0.7; $wertungen[] = -1.3; $wertungen[] = -1.7; From 7b5f6cb9f16f4d42a07aac8d93c9670b6138a732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20G=C3=B6rlich?= Date: Mon, 9 Jan 2023 13:04:56 +0100 Subject: [PATCH 6/6] Change Wertungen to positive, dont know why?!?!! --- .../com_sportsmanager/views/sportsmanager/view_admin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php index 4028fa2..f713bc4 100644 --- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php +++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php @@ -10906,9 +10906,9 @@ class HTML_sportsmanager_admin $wertungen[] = $j; } - $wertungen[] = -0.7; - $wertungen[] = -1.3; - $wertungen[] = -1.7; + $wertungen[] = 0.7; + $wertungen[] = 1.3; + $wertungen[] = 1.7; asort($wertungen);