jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

allow to configure calendar slot duration (#1269)

Browse Source
This commit is contained in:
Kevin Papst
2019-11-22 01:30:25 +01:00
committed by GitHub
parent 9222075c7a
commit 60d16016e8
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Controller/SystemConfigurationController.php
View File

@@ -34,6 +34,7 @@ use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Validator\Constraints\DateTime; use Symfony\Component\Validator\Constraints\DateTime;
use Symfony\Component\Validator\Constraints\GreaterThanOrEqual; use Symfony\Component\Validator\Constraints\GreaterThanOrEqual;
use Symfony\Component\Validator\Constraints\NotNull; use Symfony\Component\Validator\Constraints\NotNull;
use Symfony\Component\Validator\Constraints\Regex;
/** /**
* Controller used for executing system relevant tasks. * Controller used for executing system relevant tasks.
@@ -346,6 +347,11 @@ class SystemConfigurationController extends AbstractController
->setTranslationDomain('system-configuration') ->setTranslationDomain('system-configuration')
->setType(TextType::class) ->setType(TextType::class)
->setConstraints([new DateTime(['format' => 'H:i']), new NotNull()]), ->setConstraints([new DateTime(['format' => 'H:i']), new NotNull()]),
(new Configuration())
->setName('calendar.slot_duration')
->setTranslationDomain('system-configuration')
->setType(TextType::class)
->setConstraints([new Regex(['pattern' => '/[0-2]{1}[0-9]{1}:[0-9]{2}:[0-9]{2}/']), new NotNull()]),
]), ]),
(new SystemConfigurationModel()) (new SystemConfigurationModel())
->setSection(SystemConfigurationModel::SECTION_BRANDING) ->setSection(SystemConfigurationModel::SECTION_BRANDING)

4
translations/system-configuration.de.xliff
View File

@@ -98,6 +98,10 @@
<source>label.calendar.visibleHours.end</source> <source>label.calendar.visibleHours.end</source>
<target>Ende des sichtbaren Zeitbereichs</target> <target>Ende des sichtbaren Zeitbereichs</target>
</trans-unit> </trans-unit>
<trans-unit id="label.calendar.slot_duration">
<source>label.calendar.slot_duration</source>
<target>Slotdauer für Wochen- und Tagesansicht (Format: hh:mm:ss)</target>
</trans-unit>
<trans-unit id="branding"> <trans-unit id="branding">
<source>branding</source> <source>branding</source>
<target>Markendarstellung</target> <target>Markendarstellung</target>

4
translations/system-configuration.en.xliff
View File

@@ -98,6 +98,10 @@
<source>label.calendar.visibleHours.end</source> <source>label.calendar.visibleHours.end</source>
<target>End of visible time range</target> <target>End of visible time range</target>
</trans-unit> </trans-unit>
<trans-unit id="label.calendar.slot_duration">
<source>label.calendar.slot_duration</source>
<target>Slot duration for week- and day view (format: hh:mm:ss)</target>
</trans-unit>
<trans-unit id="branding"> <trans-unit id="branding">
<source>branding</source> <source>branding</source>
<target>Branding</target> <target>Branding</target>