kickern/com_sportsmanager
1
0
Fork 0
mirror of https://github.com/Deutscher-Tischfussballbund/com_sportsmanager.git synced 2026-06-10 06:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #220 from Deutscher-Tischfussballbund/sportsmanager2-issue217

Browse Source 
Sportsmanager2 issue217
This commit is contained in:
MarvinF
2025-11-14 11:25:37 +01:00
committed by GitHub
parent 4cc403536e c1196c9fd9
commit e692edcb99
3 changed files with 69 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/structure/components/com_sportsmanager/admin.php
+19 -3
View File
@@ -10630,11 +10630,11 @@ function adminEditTurnier(): void
HTML_sportsmanager_admin::adminEditTurnier($row, $veranstalter, $saisons, $vorlage, $users, $berechtigt_fuer_turnier, $kategorien); HTML_sportsmanager_admin::adminEditTurnier($row, $veranstalter, $saisons, $vorlage, $users, $berechtigt_fuer_turnier, $kategorien);
} }
#[NoReturn] function adminSaveTurnier(): void function adminSaveTurnier(): void
{ {
$db = getDatabase(); $db = getDatabase();
$jInput = Factory::getContainer()->get(SiteApplication::class)->input; $jInput = Factory::getContainer()->get(SiteApplication::class)->input;
$Fehlertext = "";
if (!benutzerZugriff("turniere_aendern")) if (!benutzerZugriff("turniere_aendern"))
keinZugriff(); keinZugriff();
@@ -10648,7 +10648,9 @@ function adminEditTurnier(): void
$saison_id = $jInput->get('saison_id', 0, 'INT'); $saison_id = $jInput->get('saison_id', 0, 'INT');
$turnierort = $db->escape(trim($jInput->get('turnierort', '', 'RAW'))); $turnierort = $db->escape(trim($jInput->get('turnierort', '', 'RAW')));
$erster_tag = normalisiertesDatum(sprintf("%04d-%02d-%02d", $jInput->get('erster_tag_jahr', 2000, 'INT'), $jInput->get('erster_tag_monat', 1, 'INT'), $jInput->get('erster_tag_tag', 1, 'INT'))); $erster_tag = normalisiertesDatum(sprintf("%04d-%02d-%02d", $jInput->get('erster_tag_jahr', 2000, 'INT'), $jInput->get('erster_tag_monat', 1, 'INT'), $jInput->get('erster_tag_tag', 1, 'INT')));
$mehrtaegig = $jInput->get('mehrtaegig', 0, 'INT'); if (!validateDate($erster_tag,'Y-m-d'))
$Fehlertext = "Bitte gültiges Datum eingeben";
$mehrtaegig = $jInput->get('mehrtaegig', 0, 'INT');
$reminder_count = $jInput->get('reminder_count', 0, 'INT'); $reminder_count = $jInput->get('reminder_count', 0, 'INT');
if (!$mehrtaegig) if (!$mehrtaegig)
$letzter_tag = $erster_tag; $letzter_tag = $erster_tag;
@@ -10663,6 +10665,11 @@ function adminEditTurnier(): void
$berechtigt_fuer_turnier_user_ids[] = $berechtigt_user_id; $berechtigt_fuer_turnier_user_ids[] = $berechtigt_user_id;
} }
if ($Fehlertext != ""){
echo "<span style='display: inline-block; background: red; color: white;vertical-align: middle;'>$Fehlertext</span>\n";
return;
}
if ($vorlage) { if ($vorlage) {
$vorlage_id = $id; $vorlage_id = $id;
$id = 0; $id = 0;
@@ -10704,6 +10711,15 @@ function adminEditTurnier(): void
. "\n reminder_count = '$reminder_count'" . "\n reminder_count = '$reminder_count'"
. "\n WHERE turnier_id = $id"; . "\n WHERE turnier_id = $id";
$db->setQuery($query); $db->setQuery($query);
if (!$db->execute()) {
die($db->stderr(true));
}
if ($letzter_tag == $erster_tag){
$query = "UPDATE #__sportsmanager_turnierdisziplin"
. "\n SET beginn = CONCAT('$erster_tag', ' ', TIME(beginn))";
}
$db->setQuery($query);
if (!$db->execute()) { if (!$db->execute()) {
die($db->stderr(true)); die($db->stderr(true));
} }
src/structure/components/com_sportsmanager/database/update.php
+22 -1
View File
@@ -5364,7 +5364,7 @@ function updateDatabase(): void
die($db->stderr(true)); die($db->stderr(true));
} }
} }
if ($datenbank_version < 110) { if ($datenbank_version < 110) {
$aktueller_verein_aktualisieren = true; $aktueller_verein_aktualisieren = true;
@@ -5393,6 +5393,27 @@ function updateDatabase(): void
} }
} }
if ($datenbank_version < 112) {
// Korrektur Startuhrzeit in sportsmanager_turnierdisziplin bei eintägigen Veranstaltungen
$query = "UPDATE #__sportsmanager_turnierdisziplin td"
. "\n JOIN #__sportsmanager_turnier t ON td.turnier_id = t.turnier_id"
. "\n SET td.beginn = CONCAT(t.erster_tag, ' ', TIME(td.beginn))"
. "\n WHERE t.erster_tag = t.letzter_tag;";
$db->setQuery($query);
if (!$db->execute()) {
die($db->stderr(true));
}
$query = "UPDATE #__sportsmanager_einstellungen"
. "\n SET wert = '112'"
. "\n WHERE name = 'datenbank_version'";
$db->setQuery($query);
if (!$db->execute()) {
die($db->stderr(true));
}
}
if ($termin_aktionen_email_setzen) { if ($termin_aktionen_email_setzen) {
$query = "SELECT aktion_user_id, termin_aktion_id" $query = "SELECT aktion_user_id, termin_aktion_id"
. "\n FROM #__sportsmanager_termin_aktion"; . "\n FROM #__sportsmanager_termin_aktion";
src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
+28 -16
View File
@@ -11491,11 +11491,11 @@ class HTML_sportsmanager_admin
<form action="<?php echo SportsManagerURL(); ?>" method="post" name="adminForm" id="adminForm"> <form action="<?php echo SportsManagerURL(); ?>" method="post" name="adminForm" id="adminForm">
<div class="uk-overflow-auto"> <div class="uk-overflow-auto">
<table class="uk-table" style="width: 100%"> <table style="width: 100%">
<tr> <tr>
<td nowrap style="width: 60%; vertical-align: top"> <td nowrap style="width: 60%; vertical-align: top">
<div class="uk-overflow-auto"> <div class="uk-overflow-auto">
<table class="uk-table" style="width: 100%"> <table style="width: 100%">
<tr> <tr>
<td nowrap style="width: 20%; text-align: right"> <td nowrap style="width: 20%; text-align: right">
<label <label
@@ -11582,7 +11582,10 @@ class HTML_sportsmanager_admin
$datum = $row->erster_tag; $datum = $row->erster_tag;
else else
$datum = date("Y-m-d"); $datum = date("Y-m-d");
$datum_tag = substr($datum, 8, 2); $datum_tag = substr($datum, 8, 2);
if ($vorlage)
$datum_tag = "";
echo "<option value=\"\"></option>";
for ($i = 1; $i <= 31; $i++) { for ($i = 1; $i <= 31; $i++) {
echo "<option value=\"" . $i . "\" " . ($datum_tag == $i ? "selected" : "") . ">" . $i . "</option>"; echo "<option value=\"" . $i . "\" " . ($datum_tag == $i ? "selected" : "") . ">" . $i . "</option>";
} }
@@ -11593,6 +11596,9 @@ class HTML_sportsmanager_admin
aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_TOURNAMENT_START_MONTH'); ?>"> aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_TOURNAMENT_START_MONTH'); ?>">
<?php <?php
$datum_monat = substr($datum, 5, 2); $datum_monat = substr($datum, 5, 2);
if ($vorlage)
$datum_monat = "";
echo "<option value=\"\"></option>";
$monate = array(Text::_('COM_SPORTSMANAGER_JANUARY'), Text::_('COM_SPORTSMANAGER_FEBRUARY'), Text::_('COM_SPORTSMANAGER_MARCH'), Text::_('COM_SPORTSMANAGER_APRIL'), Text::_('COM_SPORTSMANAGER_MAY'), Text::_('COM_SPORTSMANAGER_JUNE'), Text::_('COM_SPORTSMANAGER_JULY'), Text::_('COM_SPORTSMANAGER_AUGUST'), Text::_('COM_SPORTSMANAGER_SEPTEMBER'), Text::_('COM_SPORTSMANAGER_OCTOBER'), Text::_('COM_SPORTSMANAGER_NOVEMBER'), Text::_('COM_SPORTSMANAGER_DECEMBER')); $monate = array(Text::_('COM_SPORTSMANAGER_JANUARY'), Text::_('COM_SPORTSMANAGER_FEBRUARY'), Text::_('COM_SPORTSMANAGER_MARCH'), Text::_('COM_SPORTSMANAGER_APRIL'), Text::_('COM_SPORTSMANAGER_MAY'), Text::_('COM_SPORTSMANAGER_JUNE'), Text::_('COM_SPORTSMANAGER_JULY'), Text::_('COM_SPORTSMANAGER_AUGUST'), Text::_('COM_SPORTSMANAGER_SEPTEMBER'), Text::_('COM_SPORTSMANAGER_OCTOBER'), Text::_('COM_SPORTSMANAGER_NOVEMBER'), Text::_('COM_SPORTSMANAGER_DECEMBER'));
for ($i = 1; $i <= 12; $i++) { for ($i = 1; $i <= 12; $i++) {
echo "<option value=\"" . $i . "\" " . ($datum_monat == $i ? "selected" : "") . ">" . htmlentities_utf8($monate[$i - 1]) . "</option>"; echo "<option value=\"" . $i . "\" " . ($datum_monat == $i ? "selected" : "") . ">" . htmlentities_utf8($monate[$i - 1]) . "</option>";
@@ -11832,6 +11838,10 @@ class HTML_sportsmanager_admin
static function adminEditTurnierdisziplin($turnier, $row, $ranglisten, $systeme): void static function adminEditTurnierdisziplin($turnier, $row, $ranglisten, $systeme): void
{ {
global $params; global $params;
if ($turnier->erster_tag == $turnier->letzter_tag)
$tag_zeigen = "none";
else
$tag_zeigen = "inline-block";
?> ?>
<div <div
class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_TOURNAMENT_DISCIPLINE'); ?><?php echo $row != null ? Text::_('COM_SPORTSMANAGER_CHANGING') : Text::_('COM_SPORTSMANAGER_ADD') ?><?php echo htmlentities_utf8($turnier->turnierbezeichnung . " (" . FormatiertesDatum($turnier->erster_tag, false) . " - " . FormatiertesDatum($turnier->letzter_tag, false) . ")"); ?></div> class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_TOURNAMENT_DISCIPLINE'); ?><?php echo $row != null ? Text::_('COM_SPORTSMANAGER_CHANGING') : Text::_('COM_SPORTSMANAGER_ADD') ?><?php echo htmlentities_utf8($turnier->turnierbezeichnung . " (" . FormatiertesDatum($turnier->erster_tag, false) . " - " . FormatiertesDatum($turnier->letzter_tag, false) . ")"); ?></div>
@@ -11905,8 +11915,8 @@ class HTML_sportsmanager_admin
:</label> :</label>
</td> </td>
<td nowrap> <td nowrap>
<select class="uk-select uk-form-width-medium" name="datum_tag" <select class="uk-select uk-form-width-small" name="datum_tag"
id="date_begin" size="1"> id="date_begin" size="1" style="display: <?php echo $tag_zeigen; ?>">
<?php <?php
$datum = $turnier->erster_tag; $datum = $turnier->erster_tag;
if ($row != null) if ($row != null)
@@ -11919,7 +11929,7 @@ class HTML_sportsmanager_admin
} }
?> ?>
</select> </select>
<select class="uk-select uk-form-width-medium" name="datum_monat" size="1" <select class="uk-select uk-form-width-small" name="datum_monat" size="1" style="display: <?php echo $tag_zeigen; ?>"
aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_MONTH'); ?>"> aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_MONTH'); ?>">
<?php <?php
$datum_monat = substr($datum, 5, 2); $datum_monat = substr($datum, 5, 2);
@@ -11930,7 +11940,7 @@ class HTML_sportsmanager_admin
} }
?> ?>
</select> </select>
<select class="uk-select uk-form-width-medium" name="datum_jahr" size="1" <select class="uk-select uk-form-width-small" name="datum_jahr" size="1" style="display: <?php echo $tag_zeigen; ?>"
aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_YEAR'); ?>"> aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_YEAR'); ?>">
<?php <?php
$datum_jahr = substr($datum, 0, 4); $datum_jahr = substr($datum, 0, 4);
@@ -11940,7 +11950,7 @@ class HTML_sportsmanager_admin
} }
?> ?>
</select> </select>
<select class="uk-select uk-form-width-medium" name="uhrzeit_stunden" <select class="uk-select uk-form-width-small" name="uhrzeit_stunden"
size="1" size="1"
aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_HOUR'); ?>"> aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_HOUR'); ?>">
<?php <?php
@@ -11954,7 +11964,7 @@ class HTML_sportsmanager_admin
} }
?> ?>
</select> </select>
<select class="uk-select uk-form-width-medium" name="uhrzeit_minuten" <select class="uk-select uk-form-width-small" name="uhrzeit_minuten"
size="1" size="1"
aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_MINUTE'); ?>"> aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_MINUTE'); ?>">
<?php <?php
@@ -12011,7 +12021,8 @@ class HTML_sportsmanager_admin
<td nowrap> <td nowrap>
<select class="uk-select uk-form-width-medium" <select class="uk-select uk-form-width-medium"
name="rangliste_id_<?php echo $i; ?>" name="rangliste_id_<?php echo $i; ?>"
id="ranking_<?php echo $i; ?>" size="1"> id="ranking_<?php echo $i; ?>" size="1"
style="width: 480px;">
<option value="0"></option> <option value="0"></option>
<?php <?php
$rangliste_system_id = 0; $rangliste_system_id = 0;
@@ -12032,7 +12043,8 @@ class HTML_sportsmanager_admin
:</label> :</label>
<select class="uk-select uk-form-width-medium" <select class="uk-select uk-form-width-medium"
name="rangliste_system_id_<?php echo $i; ?>" name="rangliste_system_id_<?php echo $i; ?>"
id="system_<?php echo $i; ?>" size="1"> id="system_<?php echo $i; ?>" size="1"
style="width: 275px;">
<option <option
value="0"><?php echo Text::_('COM_SPORTSMANAGER_RANKING_SETTING'); ?></option> value="0"><?php echo Text::_('COM_SPORTSMANAGER_RANKING_SETTING'); ?></option>
<?php <?php
@@ -12107,7 +12119,7 @@ class HTML_sportsmanager_admin
:</label> :</label>
</td> </td>
<td nowrap> <td nowrap>
<select class="uk-select uk-form-width-medium" name="voranmeldung_datum_tag" <select class="uk-select uk-form-width-small" name="voranmeldung_datum_tag"
id="appointment_date" id="appointment_date"
size="1"> size="1">
<?php <?php
@@ -12122,7 +12134,7 @@ class HTML_sportsmanager_admin
} }
?> ?>
</select> </select>
<select class="uk-select uk-form-width-medium" <select class="uk-select uk-form-width-small"
name="voranmeldung_datum_monat" name="voranmeldung_datum_monat"
size="1" size="1"
aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_MONTH'); ?>"> aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_MONTH'); ?>">
@@ -12135,7 +12147,7 @@ class HTML_sportsmanager_admin
} }
?> ?>
</select> </select>
<select class="uk-select uk-form-width-medium" <select class="uk-select uk-form-width-small"
name="voranmeldung_datum_jahr" name="voranmeldung_datum_jahr"
size="1" size="1"
aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_YEAR'); ?>"> aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_YEAR'); ?>">
@@ -12147,7 +12159,7 @@ class HTML_sportsmanager_admin
} }
?> ?>
</select> </select>
<select class="uk-select uk-form-width-medium" <select class="uk-select uk-form-width-small"
name="voranmeldung_uhrzeit_stunden" name="voranmeldung_uhrzeit_stunden"
size="1" size="1"
aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_HOUR'); ?>"> aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_HOUR'); ?>">
@@ -12162,7 +12174,7 @@ class HTML_sportsmanager_admin
} }
?> ?>
</select> </select>
<select class="uk-select uk-form-width-medium" <select class="uk-select uk-form-width-small"
name="voranmeldung_uhrzeit_minuten" name="voranmeldung_uhrzeit_minuten"
size="1" size="1"
aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_MINUTE'); ?>"> aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_SCHEDULE_DATE_MINUTE'); ?>">