diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 2d0b2be..b76747f 100644 --- a/.github/workflows/build_release.yml +++ b/.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 " 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#" src/structure/sportsmanager.xml + echo "Updating Date to $DATE in sportsmanager.xml" + sed -i "s#.*#$DATE#" src/structure/sportsmanager.xml - name: Generate release notes id: release_notes_extension diff --git a/src/structure/components/com_sportsmanager/admin.php b/src/structure/components/com_sportsmanager/admin.php index a31841f..cab859e 100644 --- a/src/structure/components/com_sportsmanager/admin.php +++ b/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); diff --git a/src/structure/components/com_sportsmanager/sportsmanager.php b/src/structure/components/com_sportsmanager/sportsmanager.php index 9c576d5..b1dcbc4 100644 --- a/src/structure/components/com_sportsmanager/sportsmanager.php +++ b/src/structure/components/com_sportsmanager/sportsmanager.php @@ -4676,7 +4676,14 @@ function teamstatistikAktualisieren($geaenderte_veranstaltung_id = 0, $geaendert $spieltage = loadObjectList($db, $query); $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);