extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: fix editing recurring events of type RDATE/explicit dates

Browse Source 
changing time and giving error "duration longer than interval", and now also displaying the explicit times
This commit is contained in:
ralf 2024-06-11 15:49:17 +02:00
parent dddf1db7bc
commit 6760ad8a0b
8 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_bo.inc.php
View File

@ -1028,7 +1028,7 @@ class calendar_bo
// same with the recur exceptions and rdates
foreach(['recur_exception', 'recur_rdates'] as $name)
{
if (is_array($event[$name] ?? null)) continue;
if (!is_array($event[$name] ?? null)) continue;
foreach($event[$name] as &$date)
{
if ($event['whole_day'] && $date_format != 'server')

1
calendar/inc/class.calendar_rrule.inc.php
View File

@ -375,6 +375,7 @@ class calendar_rrule implements Iterator
{
switch($type)
{
default:
case self::DAILY:
$duration = 24*3600;
break;

1
calendar/lang/egw_de.lang
View File

@ -247,6 +247,7 @@ exclude weekend calendar de Wochenende ausschließen
execute a further action for this entry calendar de Führt einen weiteren Befehl für diesen Eintrag aus
existing links calendar de Bestehende Verknüpfungen
exists calendar de Existiert
explicit dates calendar de Explizite Termine
export definition to use for nextmatch export calendar de Export Profil der Listenansicht (Disketten Symbol)
exports events from your calendar in ical format. calendar de Exportiert Termine im iCal-Format
exports events from your calendar into a csv file. calendar de Exportiert Termine im CSV-Format

1
calendar/lang/egw_en.lang
View File

@ -247,6 +247,7 @@ exclude weekend calendar en Exclude Weekend
execute a further action for this entry calendar en Execute a further action for this entry
existing links calendar en Existing links
exists calendar en Exists
explicit dates calendar en Explicit dates
export definition to use for nextmatch export calendar en Export definition to use for nextmatch export
exports events from your calendar in ical format. calendar en Exports events from your calendar in iCal format.
exports events from your calendar into a csv file. calendar en Exports events from your calendar into a CSV file.

14
calendar/templates/default/edit.xet
View File

@ -120,8 +120,20 @@
</row>
<row valign="top">
<et2-description for="recur_data" value="Repeat days"></et2-description>
<et2-select-dow statustext="Days of the week for a weekly repeated event" id="recur_data" rows="6"
<et2-vbox>
<et2-select-dow statustext="Days of the week for a weekly repeated event" id="recur_data" rows="6"
multiple="true" placeholder=""></et2-select-dow>
<grid id="recur_rdates" class="recur_rdates">
<columns>
<column/>
</columns>
<rows>
<row>
<et2-date-time id="$row" readonly="true"></et2-date-time>
</row>
</rows>
</grid>
</et2-vbox>
<et2-vbox>
<et2-description value="Exceptions"></et2-description>
<et2-button statustext="Create an exception for the given date" label="@exception_label"

5
calendar/templates/mobile/app.css
View File

@ -2046,6 +2046,11 @@ div.calendar {
width: 100%;
line-height: 30px;
}
#calendar-edit #calendar-edit_calendar-edit-recurrence table.recur_rdates tbody {
display: table;
width: 100%;
line-height: normal;
}
#calendar-edit #calendar-edit_calendar-edit-custom tbody {
display: table;
width: 100%;

5
calendar/templates/pixelegg/app.css
View File

@ -2034,6 +2034,11 @@ div.calendar {
width: 100%;
line-height: 30px;
}
#calendar-edit #calendar-edit_calendar-edit-recurrence table.recur_rdates tbody {
display: table;
width: 100%;
line-height: normal;
}
#calendar-edit #calendar-edit_calendar-edit-custom tbody {
display: table;
width: 100%;

7
calendar/templates/pixelegg/app.less
View File

@ -489,6 +489,13 @@ div.calendar { position: relative; }
line-height: 30px;
}
}
#calendar-edit_calendar-edit-recurrence{
table.recur_rdates tbody {
display: table;
width: 100%;
line-height: normal;
}
}
/*###########################################*/
// Benutzerdefiniert