diff --git a/src/structure/components/com_sportsmanager/admin.php b/src/structure/components/com_sportsmanager/admin.php index 49cc2da..7ce20be 100644 --- a/src/structure/components/com_sportsmanager/admin.php +++ b/src/structure/components/com_sportsmanager/admin.php @@ -5183,6 +5183,9 @@ function adminKategorien(): void $kategorien[2] = array(); $kategorien[3] = array(); $kategorien[4] = array(); + $kategorien[5] = array(); + $kategorien[6] = array(); + $kategorien[7] = array(); foreach ($rows as $row) $kategorien[$row->typ][$row->nummer] = $row->bezeichnung; @@ -5216,12 +5219,12 @@ function adminKategorien(): void $kategorien[4] = array(); $kategorien[5] = array(); $kategorien[6] = array(); - + $kategorien[7] = array(); foreach ($rows as $row) $kategorien[$row->typ][$row->nummer] = $row->bezeichnung; - for ($typ = 1; $typ <= 6; $typ++) { + for ($typ = 1; $typ <= 7; $typ++) { for ($nummer = 1; $nummer <= 50; $nummer++) { $bezeichnung = $db->escape($jInput->get('bezeichnung_' . $typ . '_' . $nummer, '', 'RAW')); if (empty($bezeichnung)) { @@ -11255,6 +11258,7 @@ function adminBegegnungenExportForm(): void // Veranstaltung ermitteln $query = "SELECT * FROM #__sportsmanager_veranstaltung WHERE veranstaltung_id = $veranstaltungId"; + $db->setQuery($query); if (!$db->execute()) { die($db->stderr(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 db2a63f..c1db5d5 100644 --- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php +++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php @@ -16,145 +16,156 @@ class HTML_sportsmanager_admin { static function adminUebersicht($veranstaltungen, $spielerstatistiken, $turniere, $ranglisten, $individualwettbewerbe, $statistik, $saisons, $filter_saison_id, $externe_datenbank): void { + function checkZeilenumbruch($Spalte_Nr, $max_Spalten) + { + $Spalte_Nr++; + if ($Spalte_Nr >= $max_Spalten){ + echo "\n\n"; + $Spalte_Nr = 0; + } + return $Spalte_Nr; + } + global $params; - ?> -
Sports - Manager +
+ + Sports Manager
- - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - 0) { ?> - - - - - - -
- - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
0) { ?> @@ -4891,20 +4902,20 @@ class HTML_sportsmanager_admin static function adminKategorien($kategorien): void { global $params; - + ?>
- +
@@ -7264,13 +7277,13 @@ class HTML_sportsmanager_admin ?> -

-

@@ -7301,13 +7314,13 @@ class HTML_sportsmanager_admin -

-

- +
@@ -4924,6 +4935,8 @@ class HTML_sportsmanager_admin echo Text::_('COM_SPORTSMANAGER_PLAYER_STATISTICS'); else if ($typ == 6) echo Text::_('COM_SPORTSMANAGER_INDIVIDUAL_COMPETITIONS'); + else if ($typ == 7) + echo Text::_('COM_SPORTSMANAGER_ASSOCIATION_BODIES'); ?> @@ -6922,11 +6935,11 @@ class HTML_sportsmanager_admin
-
+
- +
-
- -
+

- + "; + echo ""; } if ($spieltag == $spieltage + 1){ - echo ""; + echo ""; } ?> - "; - echo ""; for ($teamnr = 1; $teamnr <= $anzahlteams; $teamnr += 2) { ?> @@ -10013,52 +10026,49 @@ class HTML_sportsmanager_admin { global $params; ?> -
- -
Grundeinstellungen
Grundeinstellungen
Runden @@ -9607,14 +9620,14 @@ class HTML_sportsmanager_admin $bgcolor = "#000099"; } if ($spieltag == 1){ - echo "
Hinrunde
Hinrunde
Rückrunde (Bei Nur Hinrunde sind hier keine Eingaben erforderlich)
Rückrunde (Bei Nur Hinrunde sind hier keine Eingaben erforderlich)
+ @@ -9659,7 +9672,7 @@ class HTML_sportsmanager_admin  
Setzliste bzw. Erste Paarung
- - - -
-
- - - - - - - - - - - - -
- - - -
- - - -
- - - -
-
+
+ + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+
diff --git a/src/structure/language/de-DE/de-DE.com_sportsmanager.ini b/src/structure/language/de-DE/de-DE.com_sportsmanager.ini index e1c84f4..b639d11 100644 --- a/src/structure/language/de-DE/de-DE.com_sportsmanager.ini +++ b/src/structure/language/de-DE/de-DE.com_sportsmanager.ini @@ -1,4 +1,4 @@ -; Sports Manager (C) 2006-2020, Sven Nickel (Test) +; Sports Manager (C) 2006-2020, Sven Nickel (Test) COM_SPORTSMANAGER="Sports Manager" COM_SPORTSMANAGER_PLAYERS="Spieler" COM_SPORTSMANAGER_CLUBS="Vereine" @@ -70,6 +70,7 @@ COM_SPORTSMANAGER_CONFIRM_REMOVE_RANKING="Willst du die Rangliste wirklich entfe COM_SPORTSMANAGER_ADD_INDIVIDUAL_COMPETITION="Individualwettbewerb hinzufügen" COM_SPORTSMANAGER_INDIVIDUAL_COMPETITION="Individualwettbewerb" COM_SPORTSMANAGER_INDIVIDUAL_COMPETITIONS="Individualwettbewerbe" +COM_SPORTSMANAGER_ASSOCIATION_BODIES="Verbandsorgane" COM_SPORTSMANAGER_GAME="Spiel" COM_SPORTSMANAGER_GAMES="Spiele" COM_SPORTSMANAGER_GAMES_SHORTCUT="S" diff --git a/src/structure/language/en-GB/en-GB.com_sportsmanager.ini b/src/structure/language/en-GB/en-GB.com_sportsmanager.ini index fdbdd5d..ad77db4 100644 --- a/src/structure/language/en-GB/en-GB.com_sportsmanager.ini +++ b/src/structure/language/en-GB/en-GB.com_sportsmanager.ini @@ -1,4 +1,4 @@ -; Sports Manager (C) 2006-2020, Sven Nickel +; Sports Manager (C) 2006-2020, Sven Nickel COM_SPORTSMANAGER="Sports Manager" COM_SPORTSMANAGER_PLAYERS="Players" COM_SPORTSMANAGER_CLUBS="Clubs" @@ -70,6 +70,7 @@ COM_SPORTSMANAGER_CONFIRM_REMOVE_RANKING="Do you really want to remove the ranki COM_SPORTSMANAGER_ADD_INDIVIDUAL_COMPETITION="Add individual competition" COM_SPORTSMANAGER_INDIVIDUAL_COMPETITION="Individual competition" COM_SPORTSMANAGER_INDIVIDUAL_COMPETITIONS="Individual competitions" +COM_SPORTSMANAGER_ASSOCIATION_BODIES="Association bodies" COM_SPORTSMANAGER_GAME="Game" COM_SPORTSMANAGER_GAMES="Games" COM_SPORTSMANAGER_GAMES_SHORTCUT="G" diff --git a/src/structure/script.php b/src/structure/script.php index 08c8d21..c8a961b 100644 --- a/src/structure/script.php +++ b/src/structure/script.php @@ -1110,7 +1110,7 @@ return new class () implements InstallerScriptInterface $db->setQuery( $query ); if (!$db->execute()) { die($db->stderr(true)); } - $query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'datenbank_version', wert = '102';"; + $query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'datenbank_version', wert = '103';"; $db->setQuery( $query ); if (!$db->execute()) { die($db->stderr(true)); }