[FEATURE] Allow time slots with open end

Remove requirement of period.end date and show "Open end" if it's empty Fixes #61 - Thanks to @Hobokens for this feature request
jweiland-net · Jan 27, 2021 · b009b72 · b009b72
1 parent 26ea89d
commit b009b72
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 16 deletions.
diff --git a/Classes/Domain/Model/Order.php b/Classes/Domain/Model/Order.php
@@ -338,7 +338,7 @@ public function getCancelableUntil()
      */
     public function canBeBooked(): bool
     {
-        $numberOfParticipants = $this->getParticipants()->count() + 1;
+        $numberOfParticipants = $this->getParticipants()->count();
         return $numberOfParticipants <= $this->getBookedPeriod()->getMaxParticipantsPerOrder();
     }
 

diff --git a/Classes/Domain/Model/Period.php b/Classes/Domain/Model/Period.php
@@ -45,7 +45,7 @@ class Period extends AbstractEntity
     protected $begin;
 
     /**
-     * @var \DateTime
+     * @var \DateTime|null
      */
     protected $end;
 
@@ -163,11 +163,11 @@ public function setBegin(\DateTime $begin)
     }
 
     /**
-     * @return \DateTime
+     * @return \DateTime|null
      */
-    public function getEnd(): \DateTime
+    public function getEnd(): ?\DateTime
     {
-        if ($this->end->getTimezone() !== 'UTC') {
+        if ($this->end && $this->end->getTimezone() !== 'UTC') {
             $this->end->setTimezone(new \DateTimeZone('UTC'));
         }
         return $this->end;

diff --git a/Classes/Domain/Model/Reservation.php b/Classes/Domain/Model/Reservation.php
@@ -133,7 +133,7 @@ public function getIsCurrentlyValid(): bool
         if (
             $period->getDate()->getTimestamp() === $currentDate
             && $period->getBegin()->getTimestamp() <= $currentTime
-            && $period->getEnd()->getTimestamp() > $currentTime
+            && ($period->getEnd() === null || $period->getEnd()->getTimestamp() > $currentTime)
         ) {
             return true;
         }

diff --git a/Classes/Utility/QrCodeUtility.php b/Classes/Utility/QrCodeUtility.php
@@ -36,15 +36,15 @@ public static function generateQrCode(Reservation $reservation): QrCode
         $qrCode
             ->setLabel(
                 sprintf(
-                    '%s %s %s - %s',
+                    '%s %s %s %s',
                     $reservation->getCustomerOrder()->getBookedPeriod()->getFacility()->getShortName()
                 ?: $reservation->getCustomerOrder()->getBookedPeriod()->getFacility()->getName(),
                     strftime(
                         LocalizationUtility::translate('date_format', 'reserve'),
                         $reservation->getCustomerOrder()->getBookedPeriod()->getDate()->getTimestamp()
                     ),
                     $reservation->getCustomerOrder()->getBookedPeriod()->getBegin()->format('H:i'),
-                    $reservation->getCustomerOrder()->getBookedPeriod()->getEnd()->format('H:i')
+                    $reservation->getCustomerOrder()->getBookedPeriod()->getEnd() ? (' - ' . $reservation->getCustomerOrder()->getBookedPeriod()->getEnd()->format('H:i')) : ''
                 ),
                 16,
                 ExtensionManagementUtility::extPath('reserve') . 'Resources/Private/Fonts/noto_sans.otf',

diff --git a/Configuration/TCA/tx_reserve_domain_model_period.php b/Configuration/TCA/tx_reserve_domain_model_period.php
@@ -137,7 +137,7 @@
                 'type' => 'input',
                 'size' => 30,
                 'renderType' => 'inputDateTime',
-                'eval' => 'time,int,required',
+                'eval' => 'time,int',
             ],
         ],
         'max_participants' => [

diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
@@ -265,6 +265,10 @@
             <trans-unit id="datatables.languageFile">
                 <target>EXT:reserve/Resources/Public/JavaScript/datatables/de.json</target>
             </trans-unit>
+
+          <trans-unit id="period.openEnd">
+            <target>Offenes Ende</target>
+          </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
@@ -265,6 +265,10 @@
             <trans-unit id="datatables.languageFile">
                 <source></source>
             </trans-unit>
+
+          <trans-unit id="period.openEnd">
+            <source>Open end</source>
+          </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/Private/Partials/Mail/ReservationDetails.html b/Resources/Private/Partials/Mail/ReservationDetails.html
@@ -2,5 +2,5 @@
 
 <ul>
 	<li><f:translate extensionName="reserve" key="mail.facility" />: {order.bookedPeriod.facility.name}</li>
-	<li><f:translate extensionName="reserve" key="mail.period" />: <f:format.date format="{f:translate(key: 'date_format', extensionName: 'reserve')}">{order.bookedPeriod.date}</f:format.date> <f:format.date format="H:i">{order.bookedPeriod.begin}</f:format.date> - <f:format.date format="H:i">{order.bookedPeriod.end}</f:format.date></li>
+	<li><f:translate extensionName="reserve" key="mail.period" />: <f:format.date format="{f:translate(key: 'date_format', extensionName: 'reserve')}">{order.bookedPeriod.date}</f:format.date> <f:format.date format="H:i">{order.bookedPeriod.begin}</f:format.date> - <f:if condition="{order.bookedPeriod.end}"><f:then><f:format.date format="H:i">{order.bookedPeriod.end}</f:format.date></f:then><f:else><f:translate key="period.openEnd" /></f:else></f:if></li>
 </ul>
diff --git a/Resources/Private/Templates/Checkout/Form.html b/Resources/Private/Templates/Checkout/Form.html
@@ -7,7 +7,7 @@ <h2>
 			<f:translate key="form.order.header" arguments="{0: order.bookedPeriod.facility.name}"/>
 		</h2>
 		<p>
-			<f:translate key="form.order.description" arguments="{0: '{f:format.date(date: order.bookedPeriod.date, format: \'{f:translate(key: \\\'date_format\\\')}\')}', 1: '{f:format.date(date: order.bookedPeriod.begin, format: \'H:i\')}', 2: '{f:format.date(date: order.bookedPeriod.end, format: \'H:i\')}'}"/>
+			<f:translate key="form.order.description" arguments="{0: '{f:format.date(date: order.bookedPeriod.date, format: \'{f:translate(key: \\\'date_format\\\')}\')}', 1: '{f:format.date(date: order.bookedPeriod.begin, format: \'H:i\')}', 2: '{f:if(condition: order.bookedPeriod.end, then: \'{f:format.date(date: order.bookedPeriod.end, format: \\\'H:i\\\')}\', else: \'{f:translate(key: \\\'period.openEnd\\\')}\')}'}"/>
 		</p>
 
 		<f:form.hidden property="bookedPeriod"/>

diff --git a/Resources/Private/Templates/Checkout/List.html b/Resources/Private/Templates/Checkout/List.html
@@ -20,7 +20,7 @@ <h2>{facility.name}</h2>
 					<tr>
 						<td data-order="{period.date.timestamp}"><f:format.date format="{f:translate(key: 'date_format')}">{period.date}</f:format.date></td>
 						<td><f:format.date format="H:i">{period.begin}</f:format.date></td>
-						<td><f:format.date format="H:i">{period.end}</f:format.date></td>
+						<td><f:if condition="{period.end}"><f:then><f:format.date format="H:i">{period.end}</f:format.date></f:then><f:else><f:translate key="period.openEnd" /></f:else></f:if></td>
 						<td>{period.remainingParticipants}</td>
 						<td>
 							<f:if condition="{period.isBookable}">

diff --git a/Resources/Private/Templates/Management/Overview.html b/Resources/Private/Templates/Management/Overview.html
@@ -16,7 +16,7 @@
 				<tr>
 					<td data-sort="{period.date.timestamp}"><f:format.date format="{f:translate(key: 'date_format')}">{period.date}</f:format.date></td>
 					<td><f:format.date format="H:i">{period.begin}</f:format.date></td>
-					<td><f:format.date format="H:i">{period.end}</f:format.date></td>
+					<td><f:if condition="{period.end}"><f:then><f:format.date format="H:i">{period.end}</f:format.date></f:then><f:else><f:translate key="period.openEnd" /></f:else></f:if></td>
 					<td>{period.countActiveReservations} <f:translate key="of" /> {period.maxParticipants}</td>
 					<f:if condition="{period.countActiveReservations}">
 						<f:then>

diff --git a/Resources/Private/Templates/Management/Period.html b/Resources/Private/Templates/Management/Period.html
@@ -1,7 +1,7 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
 <f:layout name="Management" />
 <f:section name="Main">
-	<h2><f:format.date format="{f:translate(key: 'date_format')}">{period.date}</f:format.date> <f:format.date format="H:i">{period.begin}</f:format.date> - <f:format.date format="H:i">{period.end}</f:format.date></h2>
+	<h2><f:format.date format="{f:translate(key: 'date_format')}">{period.date}</f:format.date> <f:format.date format="H:i">{period.begin}</f:format.date> - <f:if condition="{period.end}"><f:then><f:format.date format="H:i">{period.end}</f:format.date></f:then><f:else><f:translate key="period.openEnd" /></f:else></f:if></h2>
 	<f:render partial="Reservations" arguments="{reservations: period.activeReservationsOrderedByCode}" />
 </f:section>
 </html>
diff --git a/Resources/Private/Templates/Management/PeriodsOnSameDay.html b/Resources/Private/Templates/Management/PeriodsOnSameDay.html
@@ -2,7 +2,7 @@
 <f:layout name="Management" />
 <f:section name="Main">
 	<f:for each="{periods}" as="period" >
-		<h2><f:format.date format="{f:translate(key: 'date_format')}">{period.date}</f:format.date> <f:format.date format="H:i">{period.begin}</f:format.date> - <f:format.date format="H:i">{period.end}</f:format.date></h2>
+		<h2><f:format.date format="{f:translate(key: 'date_format')}">{period.date}</f:format.date> <f:format.date format="H:i">{period.begin}</f:format.date> - <f:if condition="{period.end}"><f:then><f:format.date format="H:i">{period.end}</f:format.date></f:then><f:else><f:translate key="period.openEnd" /></f:else></f:if></h2>
 		<f:render partial="Reservations" arguments="{reservations: period.activeReservationsOrderedByCode}" />
 	</f:for>
 </f:section>

diff --git a/Resources/Private/Templates/Management/Scanner.html b/Resources/Private/Templates/Management/Scanner.html
@@ -1,7 +1,7 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
 <f:layout name="Management" />
 <f:section name="Main">
-	<h2><f:format.date format="{f:translate(key: 'date_format')}">{period.date}</f:format.date> <f:format.date format="H:i">{period.begin}</f:format.date> - <f:format.date format="H:i">{period.end}</f:format.date></h2>
+	<h2><f:format.date format="{f:translate(key: 'date_format')}">{period.date}</f:format.date> <f:format.date format="H:i">{period.begin}</f:format.date> - <f:if condition="{period.end}"><f:then><f:format.date format="H:i">{period.end}</f:format.date></f:then><f:else><f:translate key="period.openEnd" /></f:else></f:if></h2>
 	<div style="float: right">
 		<p><span id="remainingParticipants">{period.remainingParticipants}</span> {f:translate(key: 'list.free_slots')}</p>
 		<p><span id="usedReservations">{period.usedReservations -> f:count()}</span> {f:translate(key: 'redeemed')}</p>