mirror of
https://github.com/Deutscher-Tischfussballbund/com_sportsmanager.git
synced 2026-06-10 06:27:52 +00:00
Dropdownliste Liga erweitert und Bugs bei Export gefixt.
This commit is contained in:
@@ -11211,7 +11211,20 @@ function adminBegegnungenExportForm(): void
|
|||||||
if (count($rows) < 1) die("Wrong id!");
|
if (count($rows) < 1) die("Wrong id!");
|
||||||
$veranstaltung = $rows[0];
|
$veranstaltung = $rows[0];
|
||||||
|
|
||||||
HTML_sportsmanager_admin::adminBegegnungenExport($veranstaltung);
|
//Alle Ligen einer Saison ermitteln
|
||||||
|
$query = "SELECT * FROM #__sportsmanager_veranstaltung
|
||||||
|
WHERE saison_id = " . $veranstaltung->saison_id . "
|
||||||
|
AND #__sportsmanager_veranstaltung.bezeichnung NOT IN ('Schiedsrichter')
|
||||||
|
ORDER BY #__sportsmanager_veranstaltung.reihenfolge;";
|
||||||
|
$db->setQuery($query);
|
||||||
|
if (!$db->execute()) {
|
||||||
|
die($db->stderr(true));
|
||||||
|
}
|
||||||
|
$rows = $db->loadObjectList();
|
||||||
|
if (count($rows) < 1) die("Wrong id!");
|
||||||
|
$saison = $rows;
|
||||||
|
|
||||||
|
HTML_sportsmanager_admin::adminBegegnungenExport($veranstaltung,$saison);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[NoReturn] function adminBegegnungenExport(): void
|
#[NoReturn] function adminBegegnungenExport(): void
|
||||||
@@ -11248,12 +11261,13 @@ function adminBegegnungenExportForm(): void
|
|||||||
$query = "
|
$query = "
|
||||||
SELECT t5.bezeichnung AS Veranstaltung, t2.vereinsname AS Verein, t1.teamname AS Team,
|
SELECT t5.bezeichnung AS Veranstaltung, t2.vereinsname AS Verein, t1.teamname AS Team,
|
||||||
t4.spielernr AS Passnummer, t4.nachname AS Nachname, t4.vorname AS Vorname, t4.geburtsjahr AS Geburtsjahr,
|
t4.spielernr AS Passnummer, t4.nachname AS Nachname, t4.vorname AS Vorname, t4.geburtsjahr AS Geburtsjahr,
|
||||||
t3.erster_spieltag AS Spielberechtigt_von, t3.letzter_spieltag AS Spielberechtigt_bis
|
t6.saisonbezeichnung AS Saison, t3.erster_spieltag AS Spielberechtigt_von, t3.letzter_spieltag AS Spielberechtigt_bis
|
||||||
FROM #__sportsmanager_team AS t1
|
FROM #__sportsmanager_team AS t1
|
||||||
LEFT JOIN #__sportsmanager_veranstaltung AS t5 ON t1.veranstaltung_id = t5.veranstaltung_id
|
LEFT JOIN #__sportsmanager_veranstaltung AS t5 ON t1.veranstaltung_id = t5.veranstaltung_id
|
||||||
LEFT JOIN #__sportsmanager_verein AS t2 ON t1.verein_id = t2.verein_id
|
LEFT JOIN #__sportsmanager_verein AS t2 ON t1.verein_id = t2.verein_id
|
||||||
LEFT JOIN #__sportsmanager_mitglied_von_team AS t3 ON t1.team_id = t3.team_id
|
LEFT JOIN #__sportsmanager_mitglied_von_team AS t3 ON t1.team_id = t3.team_id
|
||||||
LEFT JOIN #__sportsmanager_spieler AS t4 ON t3.spieler_id = t4.spieler_id
|
LEFT JOIN #__sportsmanager_spieler AS t4 ON t3.spieler_id = t4.spieler_id
|
||||||
|
LEFT JOIN #__sportsmanager_saison AS t6 ON t5.saison_id = t6.saison_id
|
||||||
WHERE t1.veranstaltung_id = " . $veranstaltungId . ";
|
WHERE t1.veranstaltung_id = " . $veranstaltungId . ";
|
||||||
";
|
";
|
||||||
|
|
||||||
@@ -11268,15 +11282,17 @@ function adminBegegnungenExportForm(): void
|
|||||||
|
|
||||||
if ($export == "spielplan" or $export == "spielberichte") {
|
if ($export == "spielplan" or $export == "spielberichte") {
|
||||||
$query = "
|
$query = "
|
||||||
SELECT t1.begegnung_id, t4.bezeichnung AS Liga, t1.zeitpunkt AS Spielstart, t2.teamname AS Heim, t3.teamname AS Gast,
|
SELECT t1.begegnung_id AS ID, t5.saisonbezeichnung AS Saison,
|
||||||
|
t4.bezeichnung AS Liga, t1.zeitpunkt AS Spielstart, t2.teamname AS Heim, t3.teamname AS Gast,
|
||||||
t1.spieltag AS Spieltag_Nr, t1.heim_punkte AS Heim_Tore, t1.gast_punkte AS Gast_Tore,
|
t1.spieltag AS Spieltag_Nr, t1.heim_punkte AS Heim_Tore, t1.gast_punkte AS Gast_Tore,
|
||||||
t1.heim_spielpunkte AS Heim_Satzpunkte, t1.gast_spielpunkte AS Gast_Satzpunkte
|
t1.heim_spielpunkte AS Heim_Satzpunkte, t1.gast_spielpunkte AS Gast_Satzpunkte
|
||||||
FROM #__sportsmanager_begegnung AS t1
|
FROM #__sportsmanager_begegnung AS t1
|
||||||
LEFT JOIN #__sportsmanager_team AS t2 ON t1.heim_team_id = t2.team_id
|
LEFT JOIN #__sportsmanager_team AS t2 ON t1.heim_team_id = t2.team_id
|
||||||
LEFT JOIN #__sportsmanager_team AS t3 ON t1.gast_team_id = t3.team_id
|
LEFT JOIN #__sportsmanager_team AS t3 ON t1.gast_team_id = t3.team_id
|
||||||
LEFT JOIN #__sportsmanager_veranstaltung AS t4 ON t2.veranstaltung_id = t4.veranstaltung_id
|
LEFT JOIN #__sportsmanager_veranstaltung AS t4 ON t2.veranstaltung_id = t4.veranstaltung_id
|
||||||
|
LEFT JOIN #__sportsmanager_saison AS t5 ON t4.saison_id = t5.saison_id
|
||||||
WHERE t4.veranstaltung_id = " . $veranstaltungId . "
|
WHERE t4.veranstaltung_id = " . $veranstaltungId . "
|
||||||
ORDER BY t4.veranstaltung_id, t1.spieltag;
|
ORDER BY t4.veranstaltung_id, t1.spieltag, t1.zeitpunkt;
|
||||||
";
|
";
|
||||||
|
|
||||||
$db->setQuery($query);
|
$db->setQuery($query);
|
||||||
@@ -11295,8 +11311,8 @@ function adminBegegnungenExportForm(): void
|
|||||||
if ($export == "spielberichte") {
|
if ($export == "spielberichte") {
|
||||||
// Modus ermitteln
|
// Modus ermitteln
|
||||||
$query = "
|
$query = "
|
||||||
SELECT t2.* FROM stfv_sportsmanager_veranstaltung AS t1
|
SELECT t2.* FROM #__sportsmanager_veranstaltung AS t1
|
||||||
LEFT JOIN stfv_sportsmanager_teamspiel_modus AS t2 ON t1.modus_id = t2.teamspiel_modus_id
|
LEFT JOIN #__sportsmanager_teamspiel_modus AS t2 ON t1.modus_id = t2.teamspiel_modus_id
|
||||||
WHERE t1.veranstaltung_id = " . $veranstaltungId . "
|
WHERE t1.veranstaltung_id = " . $veranstaltungId . "
|
||||||
";
|
";
|
||||||
|
|
||||||
@@ -11316,13 +11332,13 @@ function adminBegegnungenExportForm(): void
|
|||||||
t5.spielernr AS Pass_Gast1, t6.spielernr AS Pass_Gast2,
|
t5.spielernr AS Pass_Gast1, t6.spielernr AS Pass_Gast2,
|
||||||
t1.teamspiel_heim_punkte AS Heim_Tore, t1.teamspiel_gast_punkte AS Gast_Tore,
|
t1.teamspiel_heim_punkte AS Heim_Tore, t1.teamspiel_gast_punkte AS Gast_Tore,
|
||||||
t1.teamspiel_heim_spielpunkte AS Heim_Punkte, t1.teamspiel_gast_spielpunkte AS Gast_Punkte
|
t1.teamspiel_heim_spielpunkte AS Heim_Punkte, t1.teamspiel_gast_spielpunkte AS Gast_Punkte
|
||||||
FROM stfv_sportsmanager_teamspiel AS t1
|
FROM #__sportsmanager_teamspiel AS t1
|
||||||
LEFT JOIN stfv_sportsmanager_begegnung AS t2 ON t1.begegnung_id = t2.begegnung_id
|
LEFT JOIN #__sportsmanager_begegnung AS t2 ON t1.begegnung_id = t2.begegnung_id
|
||||||
LEFT JOIN stfv_sportsmanager_spieler AS t3 ON t1.heim_spieler_1_id = t3.spieler_id
|
LEFT JOIN #__sportsmanager_spieler AS t3 ON t1.heim_spieler_1_id = t3.spieler_id
|
||||||
LEFT JOIN stfv_sportsmanager_spieler AS t4 ON t1.heim_spieler_2_id = t4.spieler_id
|
LEFT JOIN #__sportsmanager_spieler AS t4 ON t1.heim_spieler_2_id = t4.spieler_id
|
||||||
LEFT JOIN stfv_sportsmanager_spieler AS t5 ON t1.gast_spieler_1_id = t5.spieler_id
|
LEFT JOIN #__sportsmanager_spieler AS t5 ON t1.gast_spieler_1_id = t5.spieler_id
|
||||||
LEFT JOIN stfv_sportsmanager_spieler AS t6 ON t1.gast_spieler_2_id = t6.spieler_id
|
LEFT JOIN #__sportsmanager_spieler AS t6 ON t1.gast_spieler_2_id = t6.spieler_id
|
||||||
WHERE t1.begegnung_id = " . $value->begegnung_id . "
|
WHERE t1.begegnung_id = " . $value->ID . "
|
||||||
ORDER BY t1.teamspiel_nummer;
|
ORDER BY t1.teamspiel_nummer;
|
||||||
";
|
";
|
||||||
|
|
||||||
|
|||||||
@@ -10009,7 +10009,7 @@ class HTML_sportsmanager_admin
|
|||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|
||||||
static function adminBegegnungenExport($veranstaltung): void
|
static function adminBegegnungenExport($veranstaltung,$saison): void
|
||||||
{
|
{
|
||||||
global $params;
|
global $params;
|
||||||
?>
|
?>
|
||||||
@@ -10025,8 +10025,11 @@ class HTML_sportsmanager_admin
|
|||||||
<label for="veranstaltungId">Veranstaltung</label>
|
<label for="veranstaltungId">Veranstaltung</label>
|
||||||
</td>
|
</td>
|
||||||
<td nowrap>
|
<td nowrap>
|
||||||
<select class="uk-select uk-form-width-medium" name="veranstaltungid" id="veranstaltungId" size="1">
|
<select class="uk-select uk-form-width-medium" name="veranstaltungid" size="1">
|
||||||
<option value='<?PHP echo $veranstaltung->veranstaltung_id; ?>'><?PHP echo $veranstaltung->bezeichnung; ?></option>
|
<option value='<?PHP echo $veranstaltung->veranstaltung_id; ?>'><?PHP echo $veranstaltung->bezeichnung; ?></option>
|
||||||
|
<?PHP foreach ($saison AS $key => $value) { ?>
|
||||||
|
<option value='<?PHP echo $value->veranstaltung_id; ?>'><?PHP echo $value->bezeichnung; ?></option>
|
||||||
|
<?PHP } ?>
|
||||||
</select>
|
</select>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user