Merge pull request #27 from docmcfly/development

Resort the columns of the dutyroster.
docmcfly · Dec 20, 2024 · bea8109 · bea8109
2 parents ef73588 + 73bbd5a
commit bea8109
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 35 deletions.
diff --git a/Configuration/TCA/tx_participants_domain_model_event.php b/Configuration/TCA/tx_participants_domain_model_event.php
@@ -154,6 +154,7 @@
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'tx_participants_domain_model_eventtype',
+                'foreign_table_where' => 'ORDER BY title',
                 'eval' => 'required'
             ]
         ],

diff --git a/Resources/Private/Templates/DutyRoster/Show.html b/Resources/Private/Templates/DutyRoster/Show.html
@@ -24,19 +24,19 @@
 								</h4></th>
 							<th>
 								<div class="row">
-									<div class="col-sm">
+									<div class="col">
 										<h4 class="label-info eventName">
 											<f:translate key="dutyRoster.large.header.event" />
 										</h4>
 									</div>
-									<div class="col-sm">
+<!--									<div class="col">
 										<h4 class="label-info eventName">
-											<f:translate key="dutyRoster.large.header.targetGroups" />
+											<f:translate key="dutyRoster.large.header.descriptions" />
 										</h4>
-									</div>
+									</div>-->
 									<div class="col-sm">
 										<h4 class="label-info eventName">
-											<f:translate key="dutyRoster.large.header.descriptions" />
+											<f:translate key="dutyRoster.large.header.targetGroups" />
 										</h4>
 									</div>
 								</div>
@@ -59,8 +59,35 @@ <h4 class="label-info eventName">
 								</span></td>
 								<td>
 									<div class="row">
-										<div class="col-sm">
-											<span class="label-info eventName {f:if(condition:event.canceled, then:'canceled')}">{event.eventType.title}</span>
+										<div class="col ">
+											<span class="fw-bold label-info eventName {f:if(condition:event.canceled, then:'canceled')}">{event.eventType.title}</span>
+											<div class="fst-italic">
+												<span class="label-info teaser"><f:if condition="{event.canceled}">
+														<f:then>
+															<f:translate key="dutyRoster.large.event.canceled" />
+														</f:then>
+														<f:else>
+															<f:if condition="{event.showPublicDescription}">
+																<f:then>
+																	<f:if condition="{event.publicDescription}">
+																		<f:then>
+																			<f:format.html>{event.publicDescription}</f:format.html>
+																		</f:then>
+																		<f:else>&nbsp;</f:else>
+																	</f:if>
+																</f:then>
+																<f:else>
+																	<f:if condition="{event.description}">
+																		<f:then>
+																			<f:format.html>{event.description}</f:format.html>
+																		</f:then>
+																		<f:else>&nbsp;</f:else>
+																	</f:if>
+																</f:else>
+															</f:if>
+														</f:else>
+													</f:if> </span>
+											</div>
 										</div>
 										<div class="col-sm">
 											<ul class="commalist">
@@ -69,33 +96,6 @@ <h4 class="label-info eventName">
 												</f:for>
 											</ul>
 										</div>
-										<div class="col-sm ">
-											<span class="label-info teaser"><f:if condition="{event.canceled}">
-													<f:then>
-														<f:translate key="dutyRoster.large.event.canceled" />
-													</f:then>
-													<f:else>
-														<f:if condition="{event.showPublicDescription}">
-															<f:then>
-																<f:if condition="{event.publicDescription}">
-																	<f:then>
-																		<f:format.html>{event.publicDescription}</f:format.html>
-																	</f:then>
-																	<f:else>&nbsp;</f:else>
-																</f:if>
-															</f:then>
-															<f:else>
-																<f:if condition="{event.description}">
-																	<f:then>
-																		<f:format.html>{event.description}</f:format.html>
-																	</f:then>
-																	<f:else>&nbsp;</f:else>
-																</f:if>
-															</f:else>
-														</f:if>
-													</f:else>
-												</f:if> </span>
-										</div>
 									</div>
 								</td>
 							</tr>

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -14,7 +14,7 @@
     'uploadfolder' => 0,
     'createDirs' => '',
     'clearCacheOnLoad' => 1,
-    'version' => '4.0.3',
+    'version' => '4.0.5',
     'constraints' => [
         'depends' => [
             'typo3' => '12.4.0-12.4.99',
@@ -29,6 +29,8 @@
 /**
  * Change log: 
  * 
+4.0.5   :: UPD : Resort the columns of the dutyroster.  
+4.0.4   :: UPD : THe event types are sorted by alphabet in the event BE form. 
 4.0.3   :: FIX : PersonalDutyRoster -> fix the progess bars counter if the user has changed its commitment.
 4.0.2   :: CHG : Change the small duty roster output. 
 4.0.1   :: FIX : Fix colors of next event in the duty roster and update the bootstrap package to 14.0.0