Merge pull request #281 from Deutscher-Tischfussballbund/sportsmanager2-stage

stage to prod

.github/workflows/dev_preview.yml

@@ -1,84 +0,0 @@
-# Builds the codebase and publishes a rolling dev-preview release (no version bump).
-# The release uses a fixed tag "dev-preview" so each run replaces the previous one.
-
-name: Sportsmanager Dev Preview
-
-on:
-  workflow_dispatch:
-    inputs:
-      branch:
-        description: 'Branch to build'
-        required: true
-        default: 'sportsmanager2-prod'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.branch }}
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install npm dependencies
-        run: npm ci
-
-      - name: Run build script
-        run: npm run release
-
-      - name: Delete existing dev-preview release (if any)
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REPO: ${{ github.repository }}
-        run: |
-          release_id=$(curl -s -H "Authorization: token $GITHUB_TOKEN" \
-            "https://api.github.com/repos/$REPO/releases/tags/dev-preview" \
-            | jq -r '.id // empty')
-
-          if [ -n "$release_id" ]; then
-            curl -s -X DELETE -H "Authorization: token $GITHUB_TOKEN" \
-              "https://api.github.com/repos/$REPO/releases/$release_id"
-            echo "Deleted existing dev-preview release (ID: $release_id)"
-          else
-            echo "No existing dev-preview release found"
-          fi
-
-      - name: Delete existing dev-preview tag (if any)
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REPO: ${{ github.repository }}
-        run: |
-          status=$(curl -s -o /dev/null -w "%{http_code}" \
-            -H "Authorization: token $GITHUB_TOKEN" \
-            "https://api.github.com/repos/$REPO/git/refs/tags/dev-preview")
-
-          if [ "$status" = "200" ]; then
-            curl -s -X DELETE -H "Authorization: token $GITHUB_TOKEN" \
-              "https://api.github.com/repos/$REPO/git/refs/tags/dev-preview"
-            echo "Deleted existing dev-preview tag"
-          else
-            echo "No existing dev-preview tag found"
-          fi
-
-      - name: Publish dev-preview release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: dev-preview
-          name: "Dev Preview (${{ github.run_number }})"
-          body: |
-            Automated dev preview build from branch `${{ inputs.branch }}`.
-            Commit: ${{ github.sha }}
-            Run: ${{ github.run_number }}
-
-            > This is a temporary preview release and will be replaced on the next run.
-          files: package/packages/com_sportsmanager.zip
-          draft: false
-          prerelease: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

src/structure/components/com_sportsmanager/admin.php

@@ -3474,8 +3474,6 @@ function adminVereine(): void
     if (!benutzerZugriff("vereine_aendern"))
         keinZugriff(true);
 
-	$ansprechpartner = [];
-
     $query = "SELECT COUNT(DISTINCT veranstalter_id) FROM #__sportsmanager_verein WHERE NOT ausgetreten";
     $organisationAnzeigen = loadResult($db, $query) > 1;
 
@@ -3485,21 +3483,7 @@ function adminVereine(): void
         . "\n LEFT JOIN #__sportsmanager_veranstalter USING (veranstalter_id)"
         . "\n ORDER BY IF(ISNULL(#__sportsmanager_veranstalter.veranstalter_id), 1, 0), veranstalterbezeichnung, ausgetreten, vereinsname";
     $vereine = loadObjectList($db, $query);
-
-	$query = "SELECT #__sportsmanager_verein.verein_id, email FROM #__sportsmanager_vereinsansprechpartner"
-		. "\n LEFT join #__sportsmanager_verein ON #__sportsmanager_vereinsansprechpartner.verein_id = #__sportsmanager_verein.verein_id"
-		. "\n WHERE #__sportsmanager_verein.ausgetreten = 0"
-		. "\n AND email IS NOT NULL AND email <> '';";
-	$ergebnisse = loadObjectList($db, $query);
-
-	if (!empty($ergebnisse)){
-		foreach($ergebnisse as $value){
-			if (empty($ansprechpartner[$value->verein_id]) OR !in_array($value->email, $ansprechpartner[$value->verein_id]))
-				$ansprechpartner[$value->verein_id][] = $value->email;
-		}
-	}
-
-    HTML_sportsmanager_admin::adminVereine($vereine, $organisationAnzeigen, $ansprechpartner);
+    HTML_sportsmanager_admin::adminVereine($vereine, $organisationAnzeigen);
 }
 
 function adminEditVerein(): void
@@ -8590,8 +8574,6 @@ function adminMannschaften(): void
     if (!benutzerZugriff("mannschaftswettbewerb_aendern") && !benutzerVeranstaltungModerator($veranstaltungId))
         keinZugriff(true);
 
-	$ansprechpartner = [];
-
     $query = "SELECT * FROM #__sportsmanager_veranstaltung WHERE veranstaltung_id = $veranstaltungId";
     $rows = loadObjectList($db, $query);
     if (count($rows) < 1) die("Wrong id!");
@@ -8616,36 +8598,7 @@ function adminMannschaften(): void
         . "\n WHERE #__sportsmanager_team.veranstaltung_id = $veranstaltungId"
         . "\n ORDER BY teamname";
     $rows = loadObjectList($db, $query);
-
-	//Ansprechpartner Teams
-	$query = "SELECT #__sportsmanager_team.team_id, email FROM #__sportsmanager_teamansprechpartner"
-		. "\n LEFT JOIN #__sportsmanager_team ON #__sportsmanager_teamansprechpartner.team_id = #__sportsmanager_team.team_id"
-		. "\n WHERE #__sportsmanager_team.veranstaltung_id = $veranstaltungId"
-		. "\n AND email IS NOT NULL AND email <> '';";
-	$ergebnisse = loadObjectList($db, $query);
-	if (!empty($ergebnisse)){
-		foreach($ergebnisse as $value){
-			if (empty($ansprechpartner[$value->team_id]) OR !in_array($value->email, $ansprechpartner[$value->team_id]))
-				$ansprechpartner[$value->team_id][] = $value->email;
-		}
-	}
-
-	//Ansprechpartner Vereine
-	$query = "SELECT #__sportsmanager_team.team_id, #__sportsmanager_vereinsansprechpartner.email"
-		. "\n FROM #__sportsmanager_team"
-		. "\n LEFT JOIN #__sportsmanager_verein ON #__sportsmanager_team.verein_id = #__sportsmanager_verein.verein_id"
-		. "\n LEFT JOIN #__sportsmanager_vereinsansprechpartner ON #__sportsmanager_verein.verein_id = #__sportsmanager_vereinsansprechpartner.verein_id"
-		. "\n WHERE #__sportsmanager_team.veranstaltung_id = $veranstaltungId"
-		. "\n AND #__sportsmanager_vereinsansprechpartner.email IS NOT NULL AND #__sportsmanager_vereinsansprechpartner.email <> '';";
-	$ergebnisse = loadObjectList($db, $query);
-	if (!empty($ergebnisse)){
-		foreach($ergebnisse as $value){
-			if (empty($ansprechpartner[$value->team_id]) OR !in_array($value->email, $ansprechpartner[$value->team_id]))
-				$ansprechpartner[$value->team_id][] = $value->email;
-		}
-	}
-
-    HTML_sportsmanager_admin::adminMannschaften($veranstaltung, $rows, $ansprechpartner);
+    HTML_sportsmanager_admin::adminMannschaften($veranstaltung, $rows);
 }
 
 function adminEditMannschaft(): void

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

@@ -3539,7 +3539,7 @@ class HTML_sportsmanager_admin
         <?php
     }
 
-    static function adminVereine($rows, $organisationAnzeigen, $ansprechpartner): void
+    static function adminVereine($rows, $organisationAnzeigen): void
     {
         global $params;
 
@@ -3599,8 +3599,6 @@ class HTML_sportsmanager_admin
                 <th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_MEMBERS'); ?></strong></th>
                 <th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_TEAM_SEAT'); ?></strong></th>
                 <th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_BEATEN'); ?></strong></th>
-				<th></th>
-				<th></th>
             </tr>
             <?php
 
@@ -3663,15 +3661,7 @@ class HTML_sportsmanager_admin
                     </td>
                     <td nowrap><?php if (!empty($row->vereinssitz)) echo htmlentities_utf8($row->vereinssitz . (!empty($row->vereinssitz_ortsteil) ? ("-" . $row->vereinssitz_ortsteil) : "")); ?></td>
                     <td nowrap><?php echo $row->ausgetreten ? Text::_('COM_SPORTSMANAGER_YES') : Text::_('COM_SPORTSMANAGER_NO'); ?></td>
-                    <td>
-					<?PHP
-					if (!empty($ansprechpartner[$row->verein_id])){
-						$emails = implode(';', $ansprechpartner[$row->verein_id]);
-						echo "<a href='mailto:" . $emails . "?subject=" . $row->vereinsname . "'>E-Mail</a>&nbsp;";
-					}
-					?>
-					</td>
-					<td nowrap><small><a
+                    <td nowrap><small><a
                                 href="<?php echo SportsManagerURL('&task=admin_verein_remove&id=' . $row->verein_id); ?>"
                                 onclick="return confirm('<?php echo Text::_('COM_SPORTSMANAGER_WANT_REALLY_REMOVE'); ?>');"
                                 title="<?php echo Text::_('COM_SPORTSMANAGER_REMOVE'); ?>">X</a></small></td>
@@ -9722,7 +9712,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
         <?php
     }
 
-    static function adminMannschaften($veranstaltung, $rows, $ansprechpartner): void
+    static function adminMannschaften($veranstaltung, $rows): void
     {
         global $params;
 
@@ -9772,8 +9762,6 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
                     <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>
-                    <th></th>
-                    <th></th>
                 </tr>
                 <?php
 
@@ -9816,14 +9804,6 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
                         </td>
                         <td nowrap align="center"><?php echo $row->anzahl_verschiebungen; ?></td>
                         <td nowrap><?php if (!empty($row->name)) echo htmlentities_utf8($row->name); ?></td>
-						<td>
-						<?PHP
-						if (!empty($ansprechpartner[$row->team_id])){
-							$emails = implode(';', $ansprechpartner[$row->team_id]);
-							echo "<a href='mailto:" . $emails . "?subject=" . $row->teamname . "'>E-Mail</a>&nbsp;";
-						}
-						?>
-						</td>
                         <?php if ($row->begegnungen == 0) { ?>
                             <td nowrap><small><a
                                         href="<?php echo SportsManagerURL('&task=admin_team_remove&veranstaltungid=' . $veranstaltung->veranstaltung_id . '&id=' . $row->team_id); ?>"