Merge pull request #305 from Deutscher-Tischfussballbund/sportsmanager2-issue289

Zusatzinfo-Feld für Spielorte

src/structure/components/com_sportsmanager/admin.php

@@ -4040,6 +4040,7 @@ function adminEditSpielort(): void
 	$telefon = $db->escape(trim($jInput->get('telefon', '', 'RAW')));
 	$email = $db->escape(trim($jInput->get('email', '', 'RAW')));
 	$ruhetage = $db->escape(trim($jInput->get('ruhetage', '', 'RAW')));
+	$zusatzinfo = $db->escape(trim($jInput->get('zusatzinfo', '', 'RAW')));
     $beschreibung = $db->escape(trim($jInput->get('beschreibung', '', 'RAW')));
     $status = $jInput->get('status', 0, 'INT');
 
@@ -4048,8 +4049,8 @@ function adminEditSpielort(): void
     }
 
     if ($id == 0) {
-        $query = "INSERT INTO #__sportsmanager_spielort (name, strasse, plz, ortsname, ortsteil, url, telefon, email, ruhetage, beschreibung, status)"
+        $query = "INSERT INTO #__sportsmanager_spielort (name, strasse, plz, ortsname, ortsteil, url, telefon, email, ruhetage, zusatzinfo, beschreibung, status)"
-            . "\n VALUES ('$name', '$strasse', '$plz', '$ortsname', '$ortsteil', '$url', '$telefon', '$email', '$ruhetage', '$beschreibung', '$status');";
+            . "\n VALUES ('$name', '$strasse', '$plz', '$ortsname', '$ortsteil', '$url', '$telefon', '$email', '$ruhetage', '$zusatzinfo', '$beschreibung', '$status');";
         $db->setQuery($query);
         if (!$db->execute()) {
             die($db->stderr(true));
@@ -4066,6 +4067,7 @@ function adminEditSpielort(): void
             . "\n telefon = '$telefon',"
             . "\n email = '$email',"
             . "\n ruhetage = '$ruhetage',"
+            . "\n zusatzinfo = '$zusatzinfo',"
             . "\n beschreibung = '$beschreibung',"
             . "\n status = '$status'"
             . "\n WHERE spielort_id = $id";

src/structure/components/com_sportsmanager/views/sportsmanager/view.html.php

@@ -2664,13 +2664,47 @@ global $params;
 							else
 								echo htmlentities_utf8($team->name);
 							$anschrift = $team->strasse . (!empty($team->strasse) && (!empty($team->plz) || !empty($team->ortsname) || !empty($team->ortsteil)) ? ", " : "") . $team->plz . (!empty($team->plz) ? " " : "") . $team->ortsname . (!empty($team->ortsname) && !empty($team->ortsteil) ? "-" : "") . $team->ortsteil;
-							echo "<br />" . htmlentities_utf8($anschrift);
+							if (!empty($anschrift))
+								echo "<br /><a href=\"https://www.google.com/maps/search/?api=1&query=" . urlencode($anschrift) . "\" target=\"_blank\" rel=\"noopener\">" . htmlentities_utf8($anschrift) . "</a>";
 							if (!empty($team->telefon))
 								echo "<br />" . htmlentities_utf8($team->telefon);
 							?>
 						</td>
 					</tr>
 					<?php
+					if (!empty($team->zusatzinfo)) {
+						?>
+						<tr>
+							<td nowrap style="vertical-align: top">
+								<strong>Weitere Infos:</strong></td>
+							<td>
+								<?php echo nl2br(htmlentities_utf8($team->zusatzinfo)); ?>
+							</td>
+						</tr>
+						<?php
+					}
+					if (!empty($team->ruhetage)) {
+						?>
+						<tr>
+							<td nowrap style="vertical-align: top">
+								<strong>Ruhetag:</strong></td>
+							<td nowrap>
+								<?php echo htmlentities_utf8($team->ruhetage); ?>
+							</td>
+						</tr>
+						<?php
+					}
+					if (!empty($team->trainingstage)) {
+						?>
+						<tr>
+							<td nowrap style="vertical-align: top">
+								<strong>Training:</strong></td>
+							<td nowrap>
+								<?php echo htmlentities_utf8($team->trainingstage); ?>
+							</td>
+						</tr>
+						<?php
+					}
 				}
 				if ($team->nichtraucherschutz != 0) {
 					?>

src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php

@@ -4436,6 +4436,17 @@ class HTML_sportsmanager_admin
 								   value="<?php if ($row != null) echo htmlentities_utf8($row->ruhetage); ?>"/>
 						</td>
 					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right; vertical-align: top">
+							<label
+								for="zusatzinfo"><?php echo Text::_('COM_SPORTSMANAGER_ADDITIONAL_INFO'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+					<textarea name="zusatzinfo" id="zusatzinfo" cols="60"
+							  rows="8"><?php if ($row != null) echo htmlentities_utf8($row->zusatzinfo); ?></textarea>
+						</td>
+					</tr>
 					<tr>
 						<td nowrap style="width: 20%; text-align: right; vertical-align: top">
 							<label

src/structure/language/de-DE/de-DE.com_sportsmanager.ini

@@ -1089,6 +1089,7 @@ COM_SPORTSMANAGER_MATCH_SWAPPING_HELP="Bei Heimrechttausch gleichen Termin eintr
 COM_SPORTSMANAGER_NOT_VALID_TIME="Ungültige Uhrzeit"
 COM_SPORTSMANAGER_REALLY_MATCH_RESCHEDULING="Willst Du diesen Spielverlegung wirklich entfernen?"
 COM_SPORTSMANAGER_REST_DAYS="Ruhetage"
+COM_SPORTSMANAGER_ADDITIONAL_INFO="Zusatzinfo"
 COM_SPORTSMANAGER_TRAINING_DAYS="Trainingstage"
 COM_SPORTSMANAGER_NOT_ACTUALIZED_DATA="Nicht aktualisierte Daten"
 COM_SPORTSMANAGER_ASSOCIATION_BODIES="Verbandsorgane"

src/structure/language/en-GB/en-GB.com_sportsmanager.ini

@@ -1089,6 +1089,7 @@ COM_SPORTSMANAGER_MATCH_SWAPPING_HELP="If home advantage is swapped, enter the s
 COM_SPORTSMANAGER_NOT_VALID_TIME="Not valid time"
 COM_SPORTSMANAGER_REALLY_MATCH_RESCHEDULING="Do you really want to remove this match rescheduling?"
 COM_SPORTSMANAGER_REST_DAYS="Rest days"
+COM_SPORTSMANAGER_ADDITIONAL_INFO="Additional info"
 COM_SPORTSMANAGER_TRAINING_DAYS="Training days"
 COM_SPORTSMANAGER_NOT_ACTUALIZED_DATA="Data not updated"
 COM_SPORTSMANAGER_ASSOCIATION_BODIES="Association bodies"