Bugfix Week.html

joachimruhs · May 3, 2023 · 2659c4a · 2659c4a
1 parent 5b519df
commit 2659c4a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/Classes/Controller/BookobjectController.php b/Classes/Controller/BookobjectController.php
@@ -801,12 +801,7 @@ public function showWeek()
 		$view->assign('calendarWeekLabel', $this->translate('calendarWeek'));
 
 		$view->assign('now', time());
-		print_r($view->render());
-		exit;		
-//        return $this->responseFactory->createResponse()
-//            ->withAddedHeader('Content-Type', 'text/html; charset=utf-8')
-//            ->withBody($this->streamFactory->createStream($this->view->render()));		
-
+		return $view->render();
     }
 
     /**

diff --git a/Resources/Private/Templates/Standard/Week.html b/Resources/Private/Templates/Standard/Week.html
@@ -23,8 +23,8 @@
 			<div class="bookobjectTitle">{bookobject.name}</div>
 			<div class="weekSelector">
 				<img class="previousWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/typo3conf/ext/booking/Resources/Public/Icons/actions-view-paging-previous.svg"/>
-				<f:translate key="calendarWeek" extensionName="booking"/>
-				{week} - {year}
+				{calendarWeekLabel}
+                {week} - {year}
 				<img class="nextWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/typo3conf/ext/booking/Resources/Public/Icons/actions-view-paging-next.svg"/>
 			</div>
 			<div class="bookobjectWeek">
@@ -33,6 +33,11 @@
 					<f:for each="{days}" as="day" iteration="iterDay">
 						<f:if condition="{iterWeekday.index} == {iterDay.index}">
 							<f:variable name="weekDate" value='{day}' />
+                			<f:for each="{dayLabels}" as="dayLabel" iteration="iterDayLabel">
+        						<f:if condition="{iterDayLabel.index} == {iterDay.index}">
+        							<f:variable name="dayLabelShort" value='{dayLabel}' />
+                                </f:if>
+                            </f:for>
 						</f:if>		
 					</f:for>
 
@@ -43,6 +48,7 @@
 					</f:for>
 
 					<tr><td class="weekdayTable" date="{weekDate}" bookobjectUid="{bookobject.uid}">
+{dayLabelShort}
 						<f:translate key='<f:format.date format="D">{dayDate}</f:format.date>' /> - <f:format.date format="d.m.Y">{dayDate}</f:format.date></td></tr>
 					<tr><td>
 

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -14,7 +14,7 @@
   'title' => 'Booking',
   'description' => 'Booking extension for FE users',
   'category' => 'plugin',
-  'version' => '2.1.0',
+  'version' => '2.1.1',
   'state' => 'beta',
   'uploadfolder' => false,
   'clearcacheonload' => false,