extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Allow any value for minutes, lets full day events end at 23:59

Browse Source
This commit is contained in:
nathan 2022-10-20 15:30:32 -06:00
parent 19bbea7aca
commit e2b833de67
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/js/app.ts
View File

@ -56,6 +56,7 @@ import Sortable from 'sortablejs/modular/sortable.complete.esm.js';
import {tapAndSwipe} from "../../api/js/tapandswipe";
import {CalendarOwner} from "./CalendarOwner";
import {et2_IInput} from "../../api/js/etemplate/et2_core_interfaces";
import {Et2DateTime} from "../../api/js/etemplate/Et2Date/Et2DateTime";
/**
* UI for calendar
@ -1455,12 +1456,12 @@ export class CalendarApp extends EgwApp
*/
set_enddate_visibility()
{
var duration = <et2_selectbox> this.et2.getWidgetById('duration');
var start = <et2_date> this.et2.getWidgetById('start');
var end = <et2_date> this.et2.getWidgetById('end');
var content = this.et2.getArrayMgr('content').data;
let duration = <Et2Select>this.et2.getWidgetById('duration');
let start = <Et2DateTime>this.et2.getWidgetById('start');
let end = <Et2DateTime>this.et2.getWidgetById('end');
let content = this.et2.getArrayMgr('content').data;
if (typeof duration != 'undefined' && typeof end != 'undefined')
if(duration != null && end != null)
{
end.set_disabled(duration.get_value()!=='');
@ -3446,7 +3447,7 @@ export class CalendarApp extends EgwApp
}
return label;
};
if (typeof content['alarm'][1]['default'] == 'undefined')
if(content['alarm'] && typeof content['alarm'] && typeof content['alarm'][1]['default'] == 'undefined')
{
// user deleted alarm --> nothing to do
}

2
calendar/templates/default/add.xet
View File

@ -24,7 +24,7 @@
<menupopup statustext="Duration of the meeting" class="et2_fullWidth" id="duration" no_lang="1"
onchange="app.calendar.set_enddate_visibility" options="Use end date,,,,,,,false"/>
</menulist>
<date-time id="end" onchange="app.calendar.edit_update_participant"/>
<date-time id="end" onchange="app.calendar.edit_update_participant" freeMinuteEntry="true"/>
</row>
</rows>
</grid>

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

@ -221,7 +221,7 @@
<menupopup statustext="Duration of the meeting" id="duration" no_lang="1"
onchange="app.calendar.set_enddate_visibility" options="Use end date,,,,,,,false"/>
</menulist>
<date-time id="end" onchange="app.calendar.edit_update_participant"/>
<date-time id="end" onchange="app.calendar.edit_update_participant" freeMinuteEntry="true"/>
</row>
<row class="dialogHeader2">
<label value="Options"/>