mirror of
https://github.com/Deutscher-Tischfussballbund/com_sportsmanager.git
synced 2026-06-10 06:27:52 +00:00
Merge branch 'sportsmanager2-dev' into php-debugging
This commit is contained in:
Tim
GitHub
@@ -1,16 +1,22 @@
|
||||
# SportsManager
|
||||
|
||||
## Deploy status
|
||||
## DEV/STAGE environments
|
||||
|
||||
### DEV environment
|
||||
[](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/173) [Preview: sportsmanager.s10.kicktemp.dev](https://sportsmanager.s10.kicktemp.dev)
|
||||
| LV | HOSTER | DOMAIN | BRANCH |
|
||||
| ------ | -------- | ------------------------------------------------------------ | ------------------ |
|
||||
| DTFB | Kicktemp | [stage.dtfb.de](https://stage.dtfb.de) | dev |
|
||||
| TFVHH | Kicktemp | [stage.kickern-hamburg.de](https://stage.kickern-hamburg.de) | dev |
|
||||
| STFVH | DTFB | [stage.stfv.de](https://stage.stfv.de/) | sportsmanager2-dev |
|
||||
|
||||
[](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/204) [Preview: stage.kickern-hamburg.de](https://stage.kickern-hamburg.de)
|
||||
## PROD environments
|
||||
|
||||
### PROD environment
|
||||
[](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/218) [Preview: dtfb.de](https://dtfb.de)
|
||||
|
||||
[](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/219) [Preview: kickern-hamburg.de](https://kickern-hamburg.de)
|
||||
| LV | HOSTER | DOMAIN | BRANCH |
|
||||
| ------ | -------- | ------------------------------------------------ | ------------------- |
|
||||
| DTFB | Kicktemp | [dtfb.de](https://dtfb.de) | production |
|
||||
| TFVHH | Kicktemp | [kickern-hamburg.de](https://kickern-hamburg.de) | production |
|
||||
| MTFV | DTFB | [mtfv.de](https://mtfv.de/) | sportsmanager2-prod |
|
||||
| TFVSH | DTFB | [tfvsh.de](https://tfvsh.de/) | sportsmanager2-prod |
|
||||
| STFVH | DTFB | [stfv.de](https://stfv.de/) | sportsmanager2-prod |
|
||||
|
||||
|
||||
## Test setup
|
||||
@@ -74,3 +80,6 @@ JConfig: `./data/joomla_data/configuration.php`
|
||||
7. (Not sure if optional) Install a browser extension by Jetbrains
|
||||
https://chromewebstore.google.com/detail/xdebug-helper-by-jetbrain/aoelhdemabeimdhedkidlnbkfhnhgnhm
|
||||
|
||||
=======
|
||||
|
||||
Test
|
||||
|
||||
@@ -7203,7 +7203,16 @@ function adminMannschaften(): void
|
||||
$query = "SELECT #__sportsmanager_team.*, #__sportsmanager_verein.vereinsname, #__sportsmanager_spielort.*,"
|
||||
. "\n (SELECT COUNT(*) FROM #__sportsmanager_mitglied_von_team WHERE #__sportsmanager_team.team_id = #__sportsmanager_mitglied_von_team.team_id AND NOT ausgetreten) AS mitglieder_aktiv,"
|
||||
. "\n (SELECT COUNT(*) FROM #__sportsmanager_mitglied_von_team WHERE #__sportsmanager_team.team_id = #__sportsmanager_mitglied_von_team.team_id) AS mitglieder,"
|
||||
. "\n (SELECT COUNT(*) FROM #__sportsmanager_begegnung WHERE heim_team_id = #__sportsmanager_team.team_id OR gast_team_id = #__sportsmanager_team.team_id) AS begegnungen"
|
||||
. "\n (SELECT COUNT(*) FROM #__sportsmanager_begegnung WHERE heim_team_id = #__sportsmanager_team.team_id OR gast_team_id = #__sportsmanager_team.team_id) AS begegnungen,"
|
||||
. "\n (SELECT COUNT(team_id) FROM #__sportsmanager_begegnung_historie"
|
||||
. "\n WHERE begegnung_historie_id IN ("
|
||||
. "\n SELECT MIN(begegnung_historie_id) AS historie_id FROM #__sportsmanager_begegnung_historie "
|
||||
. "\n WHERE aktion IN (0, 3) AND team_id in "
|
||||
. "\n (SELECT team_id FROM #__sportsmanager_team WHERE veranstaltung_id = $veranstaltungId)"
|
||||
. "\n GROUP BY begegnung_id"
|
||||
. "\n )"
|
||||
. "\n AND team_id = #__sportsmanager_team.team_id"
|
||||
. "\n ) AS anzahl_verschiebungen"
|
||||
. "\n FROM #__sportsmanager_team"
|
||||
. "\n LEFT JOIN #__sportsmanager_verein ON #__sportsmanager_verein.verein_id = #__sportsmanager_team.verein_id"
|
||||
. "\n LEFT JOIN #__sportsmanager_spielort ON #__sportsmanager_spielort.spielort_id = #__sportsmanager_team.heimspielort_id"
|
||||
@@ -8875,7 +8884,56 @@ function adminBegegnungen(): void
|
||||
|
||||
$query = "SELECT t1.*, t2.teamname AS heim_name, t3.teamname AS gast_name, t4.unbestaetigtes_ergebnis_id, t4.zwischenergebnis, t2.nichtraucherschutz AS heim_nichtraucherschutz, t3.nichtraucherschutz AS gast_nichtraucherschutz,"
|
||||
. "\n EXISTS(SELECT * FROM #__sportsmanager_begegnung_historie USE INDEX (begegnung_id) WHERE #__sportsmanager_begegnung_historie.begegnung_id = t1.begegnung_id AND aktion IN (1, 5)) AS verlegt,"
|
||||
. "\n (SELECT IF(#__sportsmanager_begegnung_historie.aktion NOT IN (0, 3, 4), NULL, #__sportsmanager_begegnung_historie.eingetragen) AS eingetragen FROM #__sportsmanager_begegnung_historie USE INDEX (begegnung_id) WHERE #__sportsmanager_begegnung_historie.begegnung_id = t1.begegnung_id ORDER BY begegnung_historie_id DESC LIMIT 1) AS verlegung_eingetragen"
|
||||
. "\n (SELECT IF(#__sportsmanager_begegnung_historie.aktion NOT IN (0, 3, 4), NULL, #__sportsmanager_begegnung_historie.eingetragen) AS eingetragen FROM #__sportsmanager_begegnung_historie USE INDEX (begegnung_id) WHERE #__sportsmanager_begegnung_historie.begegnung_id = t1.begegnung_id ORDER BY begegnung_historie_id DESC LIMIT 1) AS verlegung_eingetragen,"
|
||||
|
||||
. "\n UNIX_TIMESTAMP(t1.zeitpunkt) AS termin_spiel,"
|
||||
|
||||
. "\n ("
|
||||
. "\n SELECT UNIX_TIMESTAMP(zeitpunkt)"
|
||||
. "\n FROM #__sportsmanager_begegnung_historie"
|
||||
. "\n WHERE begegnung_id = t1.begegnung_id AND aktion = 2"
|
||||
. "\n ORDER BY begegnung_historie_id ASC"
|
||||
. "\n LIMIT 1"
|
||||
. "\n ) AS termin_original,"
|
||||
|
||||
. "\n ("
|
||||
. "\n SELECT team_id"
|
||||
. "\n FROM #__sportsmanager_begegnung_historie"
|
||||
. "\n WHERE begegnung_id = t1.begegnung_id AND aktion IN (0, 3)"
|
||||
. "\n ORDER BY begegnung_historie_id ASC"
|
||||
. "\n LIMIT 1"
|
||||
. "\n ) AS verantwortliches_team,"
|
||||
|
||||
. "\n ("
|
||||
. "\n SELECT UNIX_TIMESTAMP(zeitpunkt)"
|
||||
. "\n FROM #__sportsmanager_begegnung_historie"
|
||||
. "\n WHERE begegnung_id = t1.begegnung_id AND aktion = 1"
|
||||
. "\n ORDER BY begegnung_historie_id ASC"
|
||||
. "\n LIMIT 1"
|
||||
. "\n ) AS termin_akzeptiert,"
|
||||
|
||||
. "\n ("
|
||||
. "\n SELECT UNIX_TIMESTAMP(eingetragen)"
|
||||
. "\n FROM #__sportsmanager_begegnung_historie"
|
||||
. "\n WHERE begegnung_id = t1.begegnung_id AND aktion = 6"
|
||||
. "\n ORDER BY begegnung_historie_id ASC"
|
||||
. "\n LIMIT 1"
|
||||
. "\n ) AS ergebnis_vorgeschlagen,"
|
||||
|
||||
. "\n ("
|
||||
. "\n SELECT UNIX_TIMESTAMP(eingetragen)"
|
||||
. "\n FROM #__sportsmanager_begegnung_historie"
|
||||
. "\n WHERE begegnung_id = t1.begegnung_id AND aktion = 7"
|
||||
. "\n ORDER BY begegnung_historie_id ASC"
|
||||
. "\n LIMIT 1"
|
||||
. "\n ) AS ergebnis_akzeptiert,"
|
||||
|
||||
. "\n ("
|
||||
. "\n SELECT COUNT(*) FROM #__sportsmanager_teamspiel"
|
||||
. "\n WHERE begegnung_id = t1.begegnung_id"
|
||||
. "\n AND (heim_spieler_1_id = 0 OR heim_spieler_2_id = 0 OR gast_spieler_1_id = 0 OR gast_spieler_2_id = 0)"
|
||||
. "\n ) AS fehlende_spieler"
|
||||
|
||||
. "\n FROM #__sportsmanager_begegnung AS t1"
|
||||
. "\n LEFT JOIN #__sportsmanager_team AS t2 ON t1.heim_team_id = t2.team_id"
|
||||
. "\n LEFT JOIN #__sportsmanager_team AS t3 ON t1.gast_team_id = t3.team_id"
|
||||
|
||||
@@ -12,6 +12,29 @@ defined('_JEXEC') or die('Restricted access');
|
||||
require_once JPATH_SITE . '/components/com_sportsmanager/views/sportsmanager/view_tools.php';
|
||||
require_once JPATH_SITE . '/components/com_sportsmanager/util/image.php';
|
||||
|
||||
function formatTimediff( $timestamp1, $timestamp2, $verbose ) {
|
||||
if (empty($timestamp1) || empty($timestamp2)) {
|
||||
return "";
|
||||
} else {
|
||||
$daydiff = round(($timestamp2 - $timestamp1) / (3600.0 * 24.0));
|
||||
if ($verbose) {
|
||||
return sprintf("%+d d", $daydiff);
|
||||
} else if (abs($daydiff) > 0) {
|
||||
return sprintf("%dd", $daydiff);
|
||||
} else {
|
||||
return "-";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function formatTeamName( $team_name, $team_id, $highlight_team_id ) {
|
||||
if ($team_id == $highlight_team_id) {
|
||||
return "<b><i>" . htmlentities_utf8($team_name) . "</i></b>";
|
||||
} else {
|
||||
return htmlentities_utf8($team_name);
|
||||
}
|
||||
}
|
||||
|
||||
class HTML_sportsmanager_admin
|
||||
{
|
||||
static function adminUebersicht($veranstaltungen, $spielerstatistiken, $turniere, $ranglisten, $individualwettbewerbe, $statistik, $saisons, $filter_saison_id, $externe_datenbank): void
|
||||
@@ -7405,6 +7428,8 @@ class HTML_sportsmanager_admin
|
||||
<th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_CLUB'); ?></strong></th>
|
||||
<th nowrap title="<?php echo Text::_('COM_SPORTSMANAGER_PLAYERS_ACTIVE_INACTIVE'); ?>">
|
||||
<strong><?php echo Text::_('COM_SPORTSMANAGER_PLAYERS'); ?></strong></th>
|
||||
<th nowrap title="<?php echo Text::_('COM_SPORTSMANAGER_NUM_REQUESTED_SHFITS_TOOLTIP'); ?>">
|
||||
<strong><?php echo Text::_('COM_SPORTSMANAGER_NUM_REQUESTED_SHIFTS'); ?></strong></th>
|
||||
<th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_HOME_VENUE'); ?></strong></th>
|
||||
</tr>
|
||||
<?php
|
||||
@@ -7446,6 +7471,7 @@ class HTML_sportsmanager_admin
|
||||
<td nowrap style="text-align: center"><a
|
||||
href="<?php echo SportsManagerURL('&task=admin_mitglieder&teamid=' . $row->team_id); ?>"><?php echo $row->mitglieder_aktiv . " / " . ($row->mitglieder - $row->mitglieder_aktiv); ?></a>
|
||||
</td>
|
||||
<td nowrap align="center"><?php echo $row->anzahl_verschiebungen; ?></td>
|
||||
<td nowrap><?php if (!empty($row->name)) echo htmlentities_utf8($row->name); ?></td>
|
||||
<?php if ($row->begegnungen == 0) { ?>
|
||||
<td nowrap><small><a
|
||||
@@ -8616,6 +8642,7 @@ class HTML_sportsmanager_admin
|
||||
<strong><?php echo $modus->punktetyp == 0 ? Text::_('COM_SPORTSMANAGER_GOALS') : Text::_('COM_SPORTSMANAGER_SETS'); ?></strong>
|
||||
</th>
|
||||
<th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_GAME_POINTS'); ?></strong></th>
|
||||
<th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_GAME_RESULT_DELAYS');?></strong></th>
|
||||
</tr>
|
||||
<?php
|
||||
|
||||
@@ -8648,7 +8675,7 @@ class HTML_sportsmanager_admin
|
||||
if ($row->verlegung_eingetragen != null)
|
||||
echo " **";
|
||||
else if ($row->verlegt != 0)
|
||||
echo " *";
|
||||
echo " (" . formatTimediff($row->termin_original, $row->termin_akzeptiert, true) . ")";
|
||||
if ($row->nichtraucherschutz == 0 && ((($row->heim_nichtraucherschutz == 1 || $row->heim_nichtraucherschutz == 2 || $row->heim_nichtraucherschutz == 3) && ($row->gast_nichtraucherschutz == 3 || $row->gast_nichtraucherschutz == 7 || $row->gast_nichtraucherschutz == 8)) || (($row->heim_nichtraucherschutz == 5 || $row->heim_nichtraucherschutz == 6 || $row->heim_nichtraucherschutz == 8) && ($row->gast_nichtraucherschutz == 1 || $row->gast_nichtraucherschutz == 4 || $row->gast_nichtraucherschutz == 5))))
|
||||
echo " !";
|
||||
?>
|
||||
@@ -8658,13 +8685,20 @@ class HTML_sportsmanager_admin
|
||||
echo "<br/><small>" . Text::_('COM_SPORTSMANAGER_MATCH_TABLE') . ": " . htmlentities_utf8($row->tisch) . "</small>";
|
||||
?>
|
||||
</td>
|
||||
<td nowrap><?php echo htmlentities_utf8($row->heim_name); ?></td>
|
||||
<td nowrap><?php echo htmlentities_utf8($row->gast_name); ?></td>
|
||||
<td nowrap><?php echo formatTeamName($row->heim_name, $row->heim_team_id, $row->verantwortliches_team); ?></td>
|
||||
<td nowrap><?php echo formatTeamName($row->gast_name, $row->gast_team_id, $row->verantwortliches_team); ?></td>
|
||||
<td nowrap style="text-align: center"><a
|
||||
href="<?php echo SportsManagerURL('&task=admin_begegnung_spielplan_edit&veranstaltungid=' . $veranstaltung->veranstaltung_id . '&id=' . $row->begegnung_id); ?>"><?php if ($ergebnis_vorhanden) echo $row->heim_punkte . " : " . $row->gast_punkte; else echo "_ : _" ?></a><?php if ($row->unbestaetigtes_ergebnis_id != null) echo "<br /><small>" . ($row->zwischenergebnis ? "live" : "unbestätigt") . "</small>"; ?>
|
||||
href="<?php echo SportsManagerURL('&task=admin_begegnung_spielplan_edit&veranstaltungid=' . $veranstaltung->veranstaltung_id . '&id=' . $row->begegnung_id); ?>"><?php if ($ergebnis_vorhanden) echo $row->heim_punkte . " : " . $row->gast_punkte; else echo "_ : _" ?></a><?php if ($row->unbestaetigtes_ergebnis_id != null) echo "<br /><small>" . ($row->zwischenergebnis ? "live" : "unbestätigt") . "</small>"; else if ($row->fehlende_spieler > 0) echo " (*)"; ?>
|
||||
</td>
|
||||
<td nowrap
|
||||
style="text-align: center"><?php if ($ergebnis_vorhanden) echo $row->heim_spielpunkte . " : " . $row->gast_spielpunkte; else echo "_ : _" ?><?php if ($row->unbestaetigtes_ergebnis_id != null) echo "<br /><small>" . ($row->zwischenergebnis ? "live" : "unbestätigt") . "</small>"; ?></td>
|
||||
<td nowrap align="center">
|
||||
<?php echo
|
||||
formatTimediff($row->termin_spiel, $row->ergebnis_vorgeschlagen, false)
|
||||
. " / "
|
||||
. formatTimediff($row->ergebnis_vorgeschlagen, $row->ergebnis_akzeptiert, false);
|
||||
?>
|
||||
</td>
|
||||
<td nowrap><small><a
|
||||
href="<?php echo SportsManagerURL('&task=admin_begegnung_heimtausch&veranstaltungid=' . $veranstaltung->veranstaltung_id . '&id=' . $row->begegnung_id); ?>"><?php echo Text::_('COM_SPORTSMANAGER_HOME_EXCHANGE'); ?></a></small>
|
||||
</td>
|
||||
|
||||
@@ -990,3 +990,6 @@ COM_SPORTSMANAGER_ARIA_LABEL_RANKING_EVALUATION="Ranking Wertung"
|
||||
COM_SPORTSMANAGER_ARIA_LABEL_LASTNAME="Nachname"
|
||||
COM_SPORTSMANAGER_ARIA_LABEL_FIRSTNAME="Vorname"
|
||||
COM_SPORTSMANAGER_ARIA_LABEL_CLUB="Verein"
|
||||
COM_SPORTSMANAGER_NUM_REQUESTED_SHIFTS="Verschiebungen"
|
||||
COM_SPORTSMANAGER_NUM_REQUESTED_SHFITS_TOOLTIP="Spielverschiebungen durch diese Mannschaft"
|
||||
COM_SPORTSMANAGER_GAME_RESULT_DELAYS="Verzögerung"
|
||||
|
||||
@@ -988,3 +988,6 @@ COM_SPORTSMANAGER_ARIA_LABEL_RANKING_EVALUATION="Ranking evaluation"
|
||||
COM_SPORTSMANAGER_ARIA_LABEL_LASTNAME="Lastname"
|
||||
COM_SPORTSMANAGER_ARIA_LABEL_FIRSTNAME="Firstname"
|
||||
COM_SPORTSMANAGER_ARIA_LABEL_CLUB="Club"
|
||||
COM_SPORTSMANAGER_NUM_REQUESTED_SHIFTS="Shifts"
|
||||
COM_SPORTSMANAGER_NUM_REQUESTED_SHFITS_TOOLTIP="Game shifts caused by this team"
|
||||
COM_SPORTSMANAGER_GAME_RESULT_DELAYS="Delay"
|
||||
|
||||
Reference in New Issue
Block a user