Merge master

digedag · Jan 6, 2024 · a0ee898 · a0ee898
2 parents 8c241c3 + ddbb1bb
commit a0ee898
Show file tree

Hide file tree

Showing 14 changed files with 127 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 Changes
 -------
 
+v1.11.3 (??.12.2023)
+ * Add video assists to fixtures
+ * Add option for sort order in match table view
+
 v1.11.2 (09.12.2023)
  * Fix statistics view
  * Fix rendering of empty profile lists

diff --git a/Classes/Filter/MatchFilter.php b/Classes/Filter/MatchFilter.php
@@ -6,6 +6,7 @@
 use Sys25\RnBase\Frontend\Marker\Templates;
 use Sys25\RnBase\Frontend\Request\RequestInterface;
 use Sys25\RnBase\Utility\Misc;
+use Sys25\RnBase\Utility\Strings;
 use System25\T3sports\Model\Profile;
 use System25\T3sports\Utility\MatchTableBuilder;
 use System25\T3sports\Utility\ScopeController;
@@ -59,6 +60,10 @@ protected function initFilter(&$fields, &$options, RequestInterface $request)
             $teamId = $parameters->get('teamId');
         }
 
+        if (!is_array($options['orderby'] ?? null) && $orderby = $options['orderby']) {
+            list($key, $value) = Strings::trimExplode('=', $orderby);
+            $options['orderby'] = [$key => $value];
+        }
         $matchtable = new MatchTableBuilder();
         $matchtable->setScope($scopeArr);
         $matchtable->setTeams($teamId);

diff --git a/Classes/Frontend/Action/MatchTable.php b/Classes/Frontend/Action/MatchTable.php
@@ -14,7 +14,7 @@
 /***************************************************************
  *  Copyright notice
  *
- *  (c) 2007-2017 Rene Nitzsche (rene@system25.de)
+ *  (c) 2007-2023 Rene Nitzsche (rene@system25.de)
  *  All rights reserved
  *
  *  This script is part of the TYPO3 project. The TYPO3 project is

diff --git a/Classes/Frontend/Marker/MatchMarker.php b/Classes/Frontend/Marker/MatchMarker.php
@@ -233,7 +233,7 @@ private function prepareFields($match, $formatter, $confId)
         $match->setProperty('pictures', $match->getProperty('dam_images'));
         $match->setProperty('firstpicture', $match->getProperty('dam_images'));
 
-        /* @var $report MatchReport */
+        /** @var MatchReport $report */
         $report = $match->getMatchReport();
         if (!is_object($report)) {
             return;
@@ -258,6 +258,8 @@ private function prepareFields($match, $formatter, $confId)
         $match->setProperty('coachnames_guest', $report->getCoachNameGuest('matchreport.coachnames.'));
         $match->setProperty('refereenames', $report->getRefereeName('matchreport.refereenames.'));
         $match->setProperty('assistsnames', $report->getAssistNames('matchreport.assistsnames.'));
+        $match->setProperty('videorefereename', $report->getVideoRefereeName('matchreport.videorefereename.'));
+        $match->setProperty('videoassistsnames', $report->getVideoAssistNames('matchreport.videoassistsnames.'));
     }
 
     /**

diff --git a/Classes/Model/MatchReportModel.php b/Classes/Model/MatchReportModel.php
@@ -3,6 +3,7 @@
 namespace System25\T3sports\Model;
 
 use Sys25\RnBase\Configuration\ConfigurationInterface;
+use Sys25\RnBase\Domain\Model\DataInterface;
 use Sys25\RnBase\Utility\Strings;
 use Sys25\RnBase\Utility\T3General;
 use System25\T3sports\Decorator\MatchNoteDecorator;
@@ -284,6 +285,23 @@ public function getAssistNames($confId = 'matchreport.assists.')
         return $this->_getNames2($this->matchProfileProvider->getProfiles($this->match, $this->match->getAssists()), $confId);
     }
 
+    /**
+     * Liefert den Namen des Schiedsrichters.
+     */
+    public function getVideoRefereeName($confId = 'matchreport.videoreferee.')
+    {
+        // der Schiedsrichter wird schon als Instanz geliefert.
+        return $this->_getNames2($this->match->getVideoReferee(), $confId);
+    }
+
+    /**
+     * Liefert die Namen der Linienrichters.
+     */
+    public function getVideoAssistNames($confId = 'matchreport.videoassists.')
+    {
+        return $this->_getNames2($this->matchProfileProvider->getVideoAssists($this->match), $confId);
+    }
+
     /**
      * Liefert den Namen des Heimtrainers.
      */
@@ -514,7 +532,7 @@ protected function _getNames2($profiles, $confIdAll)
     protected function _wrapProfiles($profiles, $confId)
     {
         $ret = [];
-        if (!is_array($profiles)) {
+        if ($profiles instanceof DataInterface || !is_iterable($profiles)) {
             if (!is_object($profiles)) {
                 return [];
             }

diff --git a/Classes/Table/Volleyball/Comparator.php b/Classes/Table/Volleyball/Comparator.php
@@ -7,7 +7,11 @@
 /***************************************************************
  *  Copyright notice
  *
+<<<<<<< HEAD
  *  (c) 2011-2024 Rene Nitzsche (rene@system25.de)
+=======
+ *  (c) 2011-2023 Rene Nitzsche (rene@system25.de)
+>>>>>>> master
  *  All rights reserved
  *
  *  This script is part of the TYPO3 project. The TYPO3 project is

diff --git a/Classes/Table/Volleyball/Comparator3Point.php b/Classes/Table/Volleyball/Comparator3Point.php
@@ -8,7 +8,7 @@
 /***************************************************************
  *  Copyright notice
  *
- *  (c) 2013-2020 Rene Nitzsche (rene@system25.de)
+ *  (c) 2013-2023 Rene Nitzsche (rene@system25.de)
  *  All rights reserved
  *
  *  This script is part of the TYPO3 project. The TYPO3 project is

diff --git a/Classes/Utility/MatchProfileProvider.php b/Classes/Utility/MatchProfileProvider.php
@@ -44,6 +44,11 @@ public function __construct(ProfileRepository $profileRepo = null)
         $this->profileRepo = $profileRepo ?: new ProfileRepository();
     }
 
+    public function getVideoAssists(Fixture $match)
+    {
+        return $this->profileRepo->findByFixtureRelation($match->getUid(), 'videoassists');
+    }
+
     /**
      * Liefert die Spieler eines Spiels.
      *

diff --git a/Configuration/Flexform/plugin_competition.xml b/Configuration/Flexform/plugin_competition.xml
@@ -362,6 +362,38 @@
 							</config>
 						</TCEforms>
 					</matchtable.options.limit>
+					<matchtable.options.orderby>
+						<TCEforms>
+							<exclude>1</exclude>
+							<label>LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.competition.flexform.matchtable.orderby
+							</label>
+							<config>
+								<type>select</type>
+								<renderType>selectSingle</renderType>
+								<items type="array">
+									<numIndex index="0" type="array">
+										<numIndex index="0">LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.competition.flexform.matchtable.orderby.typoscript</numIndex>
+										<numIndex index="1"></numIndex>
+									</numIndex>
+									<numIndex index="5" type="array">
+										<numIndex index="0">LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.competition.flexform.matchtable.orderby.date.desc</numIndex>
+										<numIndex index="1">MATCH.DATE=desc</numIndex>
+									</numIndex>
+									<numIndex index="6" type="array">
+										<numIndex index="0">LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.competition.flexform.matchtable.orderby.date.asc</numIndex>
+										<numIndex index="1">MATCH.DATE=asc</numIndex>
+									</numIndex>
+									<numIndex index="10" type="array">
+										<numIndex index="0">LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.competition.flexform.matchtable.orderby.number.asc</numIndex>
+										<numIndex index="1">MATCH.MATCH_NO=asc</numIndex>
+									</numIndex>
+								</items>
+								<multiple>0</multiple>
+								<maxitems>1</maxitems>
+								<size>1</size>
+							</config>
+						</TCEforms>
+					</matchtable.options.orderby>
 
 					<matchtable.timeRangePast>
 						<TCEforms>

diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf
@@ -179,6 +179,26 @@
 				<source>Max matches to show</source>
 				<target>Max. Anzahl Spiele</target>
 			</trans-unit>
+			<trans-unit id="plugin.competition.flexform.matchtable.orderby" xml:space="preserve">
+				<source>Sort order of matches</source>
+				<target>Sortierung der Spiele</target>
+			</trans-unit>
+			<trans-unit id="plugin.competition.flexform.matchtable.orderby.typoscript" xml:space="preserve">
+				<source>As configured by typoscript</source>
+				<target>Per Typoscript konfiguriert</target>
+			</trans-unit>
+			<trans-unit id="plugin.competition.flexform.matchtable.orderby.date.asc" xml:space="preserve">
+				<source>Kickoff date ascending</source>
+				<target>Spielbeginn ansteigend</target>
+			</trans-unit>
+			<trans-unit id="plugin.competition.flexform.matchtable.orderby.date.desc" xml:space="preserve">
+				<source>Kickoff date descending</source>
+				<target>Spielbeginn absteigend</target>
+			</trans-unit>
+			<trans-unit id="plugin.competition.flexform.matchtable.orderby.number.desc" xml:space="preserve">
+				<source>Fixture number ascending</source>
+				<target>Spielnummer ansteigend</target>
+			</trans-unit>
 			<trans-unit id="plugin.competition.flexform.matchtable.report_page" xml:space="preserve">
 				<source>Page for report</source>
 				<target>Seite für Spielbericht</target>

diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
@@ -135,6 +135,21 @@
 			<trans-unit id="plugin.competition.flexform.matchtable.limit" xml:space="preserve">
 				<source>Max matches to show</source>
 			</trans-unit>
+			<trans-unit id="plugin.competition.flexform.matchtable.orderby" xml:space="preserve">
+				<source>Sort order of matches</source>
+			</trans-unit>
+			<trans-unit id="plugin.competition.flexform.matchtable.orderby.typoscript" xml:space="preserve">
+				<source>As configured by typoscript</source>
+			</trans-unit>
+			<trans-unit id="plugin.competition.flexform.matchtable.orderby.date.asc" xml:space="preserve">
+				<source>Kickoff date ascending</source>
+			</trans-unit>
+			<trans-unit id="plugin.competition.flexform.matchtable.orderby.date.desc" xml:space="preserve">
+				<source>Kickoff date descending</source>
+			</trans-unit>
+			<trans-unit id="plugin.competition.flexform.matchtable.orderby.number.desc" xml:space="preserve">
+				<source>Fixture number ascending</source>
+			</trans-unit>
 			<trans-unit id="plugin.competition.flexform.matchtable.report_page" xml:space="preserve">
 				<source>Page for report</source>
 			</trans-unit>

diff --git a/Resources/Private/Templates/Html/matchreport.html b/Resources/Private/Templates/Html/matchreport.html
@@ -20,6 +20,8 @@ <h2>Der Spielbericht ###MATCH_COMPETITION_NAME### ###MATCH_ROUND_NAME###</h2>
  Datum: <b>###MATCH_DATE###</b><br />
  Schiedsrichter: <b>###MATCH_REFEREENAMES###</b><br />
  SRA: <b>###MATCH_ASSISTSNAMES###</b><br />
+ VAR: <b>###MATCH_VIDEOREFEREENAME###</b><br />
+ VAR-Assists: <b>###MATCH_VIDEOASSISTSNAMES###</b><br />
  Zuschauer: <b>###MATCH_VISITORS###</b><br />
 </td>
 <td class="cfcleague-report-teamname">###MATCH_GUEST_NAME###</td>

diff --git a/Tests/Unit/PHP/Table/Volleyball/TableTest.php b/Tests/Unit/PHP/Table/Volleyball/TableTest.php
@@ -13,7 +13,7 @@
  * *************************************************************
  * Copyright notice.
  *
- * (c) 2013-2022 Rene Nitzsche (rene@system25.de)
+ * (c) 2013-2023 Rene Nitzsche (rene@system25.de)
  * All rights reserved
  *
  * This script is part of the TYPO3 project. The TYPO3 project is
@@ -50,6 +50,7 @@ public function testLeagueTableWithTwoPointSystem()
         ], 'cfc_league_fe');
         $confId = '';
 
+        $confId = '';
         $leagueTable = Builder::buildByCompetitionAndMatches($league, $matches, $config, $confId);
         $leagueTable->getMatchProvider()->setTeams($league->getTeams(), false);
 

diff --git a/static/setup.txt b/static/setup.txt
@@ -1776,10 +1776,24 @@ plugin.tx_cfcleaguefe_report {
       }
     }
 
+    videorefereename =< lib.t3sports.matchreport.profiles
+    videorefereename.profile {
+      # Heimatstadt des Schiedsrichters anzeigen
+      home_town {
+        s_weight = 10
+        wrap = &nbsp;(|)
+        required = 1
+      }
+    }
+
     assistsnames =< lib.t3sports.matchreport.profiles
     assistsnames{
       seperator = | und |
     }
+    videoassistsnames =< lib.t3sports.matchreport.profiles
+    videoassistsnames{
+      seperator = |, |
+    }
   }
 
   stadiumview {