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

stage to prod

.github/workflows/build_release.yml

@@ -28,6 +28,9 @@ jobs:
       - name: Get version from git tag
         run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
 
+      - name: Set DATE
+        run: echo "DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+
       - name: Update version.php
         run: |
           echo "<?php" > src/structure/components/com_sportsmanager/util/version.php
@@ -38,6 +41,8 @@ jobs:
           echo "];" >> src/structure/components/com_sportsmanager/util/version.php
           echo "Updating version to $VERSION in sportsmanager.xml"
           sed -i "s#<version>.*</version>#<version>$VERSION</version>#" src/structure/sportsmanager.xml
+          echo "Updating Date to $DATE in sportsmanager.xml"
+          sed -i "s#<creationDate>.*</creationDate>#<creationDate>$DATE</creationDate>#" src/structure/sportsmanager.xml
 
       - name: Generate release notes
         id: release_notes_extension
@@ -93,3 +98,24 @@ jobs:
           else
             echo "No draft releases found"
           fi
+
+      - name: Send notification to Teams
+        run: |
+          curl -H 'Content-Type: application/json' \
+               -d "{
+                     \"@type\": \"MessageCard\",
+                     \"@context\": \"http://schema.org/extensions\",
+                     \"summary\": \"New Release\",
+                     \"themeColor\": \"0076D7\",
+                     \"title\": \"🚀 New Release: ${{ github.ref_name }}\",
+                     \"sections\": [{
+                       \"activityTitle\": \"Repository: ${{ github.repository }}\",
+                       \"text\": \"${{ steps.release_notes_github.outputs.body }}\"
+                     }],
+                     \"potentialAction\": [{
+                       \"@type\": \"OpenUri\",
+                       \"name\": \"View Release\",
+                       \"targets\": [{ \"os\": \"default\", \"uri\": \"https://github.com/${{ github.repository }}/releases/tag/${{ github.ref_name }}\" }]
+                     }]
+                   }" \
+               ${{ secrets.TEAMS_WEBHOOK_URL }}

src/structure/components/com_sportsmanager/admin.php

@@ -10306,7 +10306,7 @@ function adminBegegnungenExportForm(): void
     $db = getDatabase();
     $jInput = Factory::getContainer()->get(SiteApplication::class)->input;
 
-    $veranstaltungId = $jInput->get('veranstaltungid', 0, 'INT');
+    $veranstaltungId = $jInput->get('veranstaltungId', 0, 'INT');
     $export = $jInput->get('export', '', 'RAW');
 
     if ($veranstaltungId == 0) die("Missing id!");
@@ -14157,8 +14157,7 @@ function adminTermine($admin_uebersicht): void
     $query = "SELECT land"
         . "\n FROM #__sportsmanager_termin"
         . "\n INNER JOIN #__sportsmanager_termin_aktion USING (termin_id)"
-        . "\n INNER JOIN (SELECT land FROM #__sportsmanager_termin_land UNION SELECT bundesland AS land FROM #__sportsmanager_termin_bundesland) AS land_bundesland USING (land)"
-        . "\n WHERE YEAR(erster_tag) = '$filter_jahr' AND status = 0 AND (typ = 0 OR typ = 1)"
+        . "\n WHERE YEAR(erster_tag) = '$filter_jahr' AND status = 0 AND (typ = 0 OR typ = 1) AND land <> ''"
         . "\n GROUP BY land"
         . "\n ORDER BY land";
     $laender = loadObjectList($db, $query);

src/structure/components/com_sportsmanager/sportsmanager.php

@@ -1385,6 +1385,7 @@ function aktuelleBegegnungen($pineingabe = FALSE): void
         HTML_sportsmanager::aktuelleBegegnungenHeader($params->get('titel'), $params->get('beschreibung'), $ticker_anzeigen, $pineingabe_anzeigen);
 
         if ($praesentation == 0) {
+            begegnungenAnzeigen(NULL, NULL, NULL, 7, true, true, false, Text::_('COM_SPORTSMANAGER_RUNNING_MATCHES'), true, true);
             begegnungenAnzeigen(NULL, NULL, NULL, 7, false, true, true, Text::_('COM_SPORTSMANAGER_MATCHES_THE_LAST_7_DAYS'), true, true);
             begegnungenAnzeigen(NULL, NULL, NULL, 14, true, false, true, Text::_('COM_SPORTSMANAGER_MATCHES_THE_NEXT_14_DAYS'), false, true);
             administrationFooter();
@@ -4677,6 +4678,13 @@ function teamstatistikAktualisieren($geaenderte_veranstaltung_id = 0, $geaendert
 			$anzahl_spieltage_gespielt = loadResult($db, $query);
 			$aktueller_spieltag = count($spieltage) > 0 ? $spieltage[0]->spieltag : 0;
 
+			//Platzierung ueberschreiben. Jetzige Platzierung kommt aus Tabelle und koennte falsch sein.
+			$platz = 0;
+			foreach($teams AS $team)
+			{
+				$team->platz = ++$platz;
+			}
+
 			// Direkter Vergleich, wenn mindestens die Hälfte der Spieltage gespielt sind.
 			if ($veranstaltung->direktervergleich && $anzahl_spieltage_gespielt >= $anzahl_spieltage_komplett/2 && $anzahl_spieltage_komplett >= 3){
 				$teams = getTabelleDirekterVergleich($teams,$veranstaltung,$aktueller_spieltag);