Work-Related/events
Work-Related/events
1
0
mirror of https://github.com/werkraum-media/events.git synced 2024-11-09 23:56:11 +01:00
Code Issues Activity

Add show plugin, prepare consider date

Browse source
This commit is contained in:
Dirk 2019-11-13 10:46:21 +01:00
parent 6e11f00c13
commit 38a76b26f9
8 changed files with 124 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Classes/Controller/DateController.php
View file

@ -88,6 +88,7 @@ class DateController extends ActionController
$selRegion = $arguments['region'];
$start = $arguments['start'];
$end = $arguments['end'];
$considerDate = $arguments['considerDate'];
$regions = $this->regionRepository->findAll();
$this->view->assign('regions', $regions);
@ -96,6 +97,7 @@ class DateController extends ActionController
$this->view->assign('selRegion', $selRegion);
$this->view->assign('start', $start);
$this->view->assign('end', $end);
$this->view->assign('considerDate', $considerDate);
}
/**
@ -165,6 +167,9 @@ class DateController extends ActionController
if ($this->request->hasArgument('end') && $this->request->getArgument('end') != '')
$demand->setEnd(strtotime($this->request->getArgument('end')));
if ($this->request->hasArgument('considerDate') && $this->request->getArgument('considerDate') != '')
$demand->setConsiderDate(strtotime($this->request->getArgument('considerDate')));
$demand->setSortBy((string)$this->settings['sortByDate']);
$demand->setSortOrder((string)$this->settings['sortOrder']);

21
Classes/Domain/Model/Dto/DateDemand.php
View file

@ -59,6 +59,11 @@ class DateDemand {
*/
protected $searchword = '';
/**
* @var bool
*/
protected $considerDate = 0;
/**
* @return string
*/
@ -235,4 +240,20 @@ class DateDemand {
$this->end = $end;
}
/**
* @return bool
*/
public function getConsiderDate(): bool
{
return $this->considerDate;
}
/**
* @param bool $considerDate
*/
public function setConsiderDate(string $considerDate): void
{
$this->considerDate = $considerDate;
}
}

2
Classes/Domain/Repository/DateRepository.php
View file

@ -82,7 +82,7 @@ class DateRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
$constraints['daterange'] = $query->logicalAnd(
[
$query->greaterThanOrEqual('start', $demand->getStart()),
$query->lessThanOrEqual('start', $demand->getEnd())
$query->lessThanOrEqual('end', $demand->getEnd())
]
);
} else {

0
Configuration/FlexForms/Search.xml → Configuration/FlexForms/DateSearch.xml
View file

57
Configuration/FlexForms/DateShow.xml Normal file
View file

@ -0,0 +1,57 @@
<T3DataStructure>
<sheets>
<sDEF>
<ROOT>
<TCEforms>
<sheetTitle>Options</sheetTitle>
</TCEforms>
<type>array</type>
<el>
<settings.backPID>
<TCEforms>
<exclude>1</exclude>
<label>Back page</label>
<config>
<type>group</type>
<internal_type>db</internal_type>
<allowed>pages</allowed>
<size>1</size>
<maxitems>1</maxitems>
<minitems>0</minitems>
<show_thumbs>1</show_thumbs>
</config>
</TCEforms>
</settings.backPID>
</el>
</ROOT>
</sDEF>
<sTemplate>
<ROOT>
<TCEforms>
<sheetTitle>Template</sheetTitle>
</TCEforms>
<type>array</type>
<el>
<settings.template>
<exclude>1</exclude>
<label>Layout option</label>
<config>
<type>select</type>
<items type="array">
<numIndex index="0" type="array">
<numIndex index="0">Default</numIndex>
<numIndex index="1">default</numIndex>
</numIndex>
<numIndex index="1" type="array">
<numIndex index="0">Costum</numIndex>
<numIndex index="1">costum</numIndex>
</numIndex>
</items>
<default>default</default>
</config>
</settings.template>
</el>
</ROOT>
</sTemplate>
</sheets>
</T3DataStructure>

22
Configuration/TCA/Overrides/tt_content.php
View file

@ -25,7 +25,7 @@ call_user_func(function () {
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
'Wrm.Events',
'DateSearch',
'Events Date Search',
'Events: Date Search',
'EXT:events/Resources/Public/Icons/user_plugin_events.svg'
);
@ -33,7 +33,7 @@ call_user_func(function () {
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
'events_datesearch',
'FILE:EXT:events/Configuration/FlexForms/Search.xml'
'FILE:EXT:events/Configuration/FlexForms/DateSearch.xml'
);
/* Date List Plugin */
@ -41,7 +41,7 @@ call_user_func(function () {
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
'Wrm.Events',
'DateList',
'Events Date List',
'Events: Date List',
'EXT:events/Resources/Public/Icons/user_plugin_events.svg'
);
@ -52,5 +52,21 @@ call_user_func(function () {
'FILE:EXT:events/Configuration/FlexForms/DateList.xml'
);
/* Date Show Plugin */
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
'Wrm.Events',
'DateShow',
'Events: Date Show',
'EXT:events/Resources/Public/Icons/user_plugin_events.svg'
);
$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['events_dateshow'] = 'pi_flexform';
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
'events_dateshow',
'FILE:EXT:events/Configuration/FlexForms/DateShow.xml'
);
});

10
Resources/Private/Templates/Date/Search.html
View file

@ -12,6 +12,16 @@
</div>
</div>
</div>
<f:comment><!--
<div class="row">
<div class="col">
<div class="form-group form-check">
<f:form.checkbox class="form-check-input" id="considerDate" name="considerDate" value="1" checked="{considerDate} == 1" />
<label class="form-check-label" for="considerDate">Datum berücksichtigen?</label>
</div>
</div>
</div>
--></f:comment>
<div class="row">
<div class="col col-md-6">
<div class="form-group">

11
ext_localconf.php
View file

@ -40,6 +40,17 @@ call_user_func(
]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'Wrm.Events',
'DateShow',
[
'Date' => 'show'
],
[
'Date' => 'show'
]
);
/*
$iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);