From a7b7b7a476c00dc7011e5f76e075dc47b9585050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Tue, 3 Nov 2026 15:29:21 +0100 Subject: [PATCH] feat: manually maintained webcams are shown regardless of availability MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The feed's "verfügbar" flag only applies to imported webcams. Editors who tick "Manuell gepflegt" expect the webcam to appear, so the website, the API and the content feed now show a webcam if it is available or manual; manual ones are hidden via "Verbergen" instead. The availability checkbox is hidden on manual webcams, which reloads the form when toggled. Co-Authored-By: Claude Opus 5.5 --- .../Classes/ContentFeed/RecordSerializer.php | 5 +++- .../Classes/Domain/Model/Region.php | 2 +- .../Classes/Domain/Model/Webcam.php | 23 +++++++++++++++++++ .../Classes/Middleware/ApiMiddleware.php | 2 +- .../TCA/tx_epproducts_domain_model_webcam.php | 6 +++-- .../Private/Partials/Region/Webcam.html | 2 +- 6 files changed, 34 insertions(+), 6 deletions(-) diff --git a/packages/ep_products/Classes/ContentFeed/RecordSerializer.php b/packages/ep_products/Classes/ContentFeed/RecordSerializer.php index 6eaa09b..92ec938 100644 --- a/packages/ep_products/Classes/ContentFeed/RecordSerializer.php +++ b/packages/ep_products/Classes/ContentFeed/RecordSerializer.php @@ -388,7 +388,10 @@ class RecordSerializer ->select('url') ->from('tx_epproducts_domain_model_webcam')->where( $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($webcamUid, Connection::PARAM_INT)), - $queryBuilder->expr()->eq('available', $queryBuilder->createNamedParameter(1, Connection::PARAM_INT)), + $queryBuilder->expr()->or( + $queryBuilder->expr()->eq('available', $queryBuilder->createNamedParameter(1, Connection::PARAM_INT)), + $queryBuilder->expr()->eq('manual', $queryBuilder->createNamedParameter(1, Connection::PARAM_INT)), + ), )->executeQuery() ->fetchOne() ; diff --git a/packages/ep_products/Classes/Domain/Model/Region.php b/packages/ep_products/Classes/Domain/Model/Region.php index e4e4324..fd96eab 100644 --- a/packages/ep_products/Classes/Domain/Model/Region.php +++ b/packages/ep_products/Classes/Domain/Model/Region.php @@ -371,7 +371,7 @@ class Region extends AbstractDestination implements TeaserInterface public function getWebcamAvailable(): bool { $webcam = $this->getWebcam(); - return $webcam !== null && $webcam->getAvailable(); + return null !== $webcam && $webcam->isVisible(); } /** diff --git a/packages/ep_products/Classes/Domain/Model/Webcam.php b/packages/ep_products/Classes/Domain/Model/Webcam.php index e45f29d..afc1edc 100644 --- a/packages/ep_products/Classes/Domain/Model/Webcam.php +++ b/packages/ep_products/Classes/Domain/Model/Webcam.php @@ -34,6 +34,11 @@ class Webcam extends AbstractEntity */ protected $available = true; + /** + * @var bool + */ + protected $manual = false; + /** * @return Snowreport */ @@ -113,4 +118,22 @@ class Webcam extends AbstractEntity { $this->available = $available; } + + public function getManual(): bool + { + return (bool) $this->manual; + } + + public function setManual(bool $manual): void + { + $this->manual = $manual; + } + + /** + * The feed's availability only applies to imported cams; editors show or hide their own via "hidden" + */ + public function isVisible(): bool + { + return $this->getManual() || (bool) $this->getAvailable(); + } } diff --git a/packages/ep_products/Classes/Middleware/ApiMiddleware.php b/packages/ep_products/Classes/Middleware/ApiMiddleware.php index 3ba9dd1..aa8453f 100644 --- a/packages/ep_products/Classes/Middleware/ApiMiddleware.php +++ b/packages/ep_products/Classes/Middleware/ApiMiddleware.php @@ -277,7 +277,7 @@ class ApiMiddleware implements MiddlewareInterface 'webcam.url as webcamUrl', ) ->from('tx_epproducts_domain_model_region', 'region') - ->leftJoin('region', 'tx_epproducts_domain_model_webcam', 'webcam', 'region.webcam = webcam.uid AND webcam.available = 1') + ->leftJoin('region', 'tx_epproducts_domain_model_webcam', 'webcam', 'region.webcam = webcam.uid AND (webcam.available = 1 OR webcam.manual = 1)') ->where($queryBuilder->expr()->eq('region.uid', $queryBuilder->createNamedParameter($regionUid, Connection::PARAM_INT)))->setMaxResults(1)->executeQuery() ->fetchAssociative() ; diff --git a/packages/ep_products/Configuration/TCA/tx_epproducts_domain_model_webcam.php b/packages/ep_products/Configuration/TCA/tx_epproducts_domain_model_webcam.php index edd7f97..941dfa2 100644 --- a/packages/ep_products/Configuration/TCA/tx_epproducts_domain_model_webcam.php +++ b/packages/ep_products/Configuration/TCA/tx_epproducts_domain_model_webcam.php @@ -138,15 +138,17 @@ return [ 'available' => [ 'exclude' => 0, 'label' => 'verfügbar', + 'description' => 'Vom Import gesetzt, gilt nur für importierte Webcams', + 'displayCond' => 'FIELD:manual:REQ:false', 'config' => [ 'type' => 'check', - 'default' => 1, ], ], 'manual' => [ 'exclude' => 0, 'label' => 'Manuell gepflegt', - 'description' => 'Der Schneehöhen-Import ändert und löscht diese Webcam nicht', + 'description' => 'Der Schneehöhen-Import ändert und löscht diese Webcam nicht; sie wird immer angezeigt (ausblenden über "Verbergen")', + 'onChange' => 'reload', 'config' => [ 'type' => 'check', 'default' => 1, diff --git a/packages/ep_theme/Resources/Private/Partials/Region/Webcam.html b/packages/ep_theme/Resources/Private/Partials/Region/Webcam.html index 4f1351b..11e6c1f 100644 --- a/packages/ep_theme/Resources/Private/Partials/Region/Webcam.html +++ b/packages/ep_theme/Resources/Private/Partials/Region/Webcam.html @@ -2,7 +2,7 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - +

Webcam