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

* TimeSheet: allow to update times in events tab rows by clicking on the time

Browse Source 
@todo nathan: setting min/max values on Et2DateTime loaded via a template into dialog does NOT work, as widget has not instantiated Flatpicker,
when the dialog.getUpdateComplete promise returns and the widget then simply ignores the set min/max time :(
This commit is contained in:
ralf 2023-02-06 14:42:02 +01:00
parent 28d8a73ace
commit ab6338f13f
3 changed files with 73 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -376,6 +376,7 @@ class timesheet_ui extends timesheet_bo
'start_time' => isset($this->data['start_time']) ? $this->data['start_time'] : $this->data['ts_start'],
'pm_integration' => $this->pm_integration,
'no_ts_status' => !$this->status_labels && ($this->data['ts_status'] != self::DELETED_STATUS),
'tabs' => $_GET['tabs'] ?? 'general',
));
$links = array();
// create links specified in the REQUEST (URL)

65
timesheet/js/app.ts
View File

@ -15,6 +15,10 @@ import '../../api/js/jsapi/egw_global';
import {EgwApp} from '../../api/js/jsapi/egw_app';
import {egw} from "../../api/js/jsapi/egw_global";
import {Et2DateTimeReadonly} from "../../api/js/etemplate/Et2Date/Et2DateTimeReadonly";
import {Et2Dialog} from "../../api/js/etemplate/Et2Dialog/Et2Dialog";
import {Et2DateTime} from "../../api/js/etemplate/Et2Date/Et2DateTime";
import {et2_grid} from "../../api/js/etemplate/et2_widget_grid";
/**
* UI for timesheet
@ -213,6 +217,67 @@ class TimesheetApp extends EgwApp
}
egw.json("timesheet.timesheet_ui.ajax_action",[_action.id, ids, all]).sendRequest(true);
}
/**
* Edit time of an event in events tab of edit timesheet
*
* @param MouseEvent _ev
* @param Et2DateTimeReadonly _widget
*/
editEventTime(_ev : MouseEvent, _widget : Et2DateTimeReadonly)
{
_ev.stopPropagation(); // tab-panel somehow also gets the event
if (this.et2.getInstanceManager().isDirty())
{
Et2Dialog.alert(this.egw.lang('You have unsaved changes, you need save them before editing events!'), this.egw.lang('Unsaved changes'));
return;
}
const tse_id = _widget.closest('tr')?.id?.replace('timesheet-events::', '');
const grid = <et2_grid>_widget.getParent();
const tse_type = parseInt(grid.getWidgetById(_widget.id.replace('[tse_time]', '[tse_type]')).value[0]);
const dialog = new Et2Dialog(this.egw);
dialog.getUpdateComplete().then(() =>
{
const time = <Et2DateTime><any>dialog.template.widgetContainer.getWidgetById('time');
// start-time set end-time as max
if (0+tse_type & 1)
{
time.set_max((<Et2DateTimeReadonly><any>grid.getWidgetById(_widget.id.replace(/^(\d+)/,
n => (parseInt(n)+1).toString()))).value);
}
// stop- or pause-time, set start-time as min
else
{
time.set_min((<Et2DateTimeReadonly><any>grid.getWidgetById(_widget.id.replace(/^(\d+)/,
n => (parseInt(n)-1).toString()))).value);
}
});
// Set attributes. They can be set in any way, but this is convenient.
dialog.transformAttributes({
callback: (_button, _values) => {
const change = (new Date(_widget.value)).valueOf() - (new Date(_values.time)).valueOf();
if (_button === Et2Dialog.OK_BUTTON && change)
{
_widget.value = _values.time;
egw.request('timesheet.EGroupware\\Timesheet\\Events.ajax_updateTime',
[tse_id, new Date((new Date(_values.time)).valueOf() + egw.getTimezoneOffset() * 60000)])
.then(_data =>
{
// reload the whole dialog
window.location.href = window.location.href+'&tabs=events';
});
}
},
title: egw.lang('Change time'),
template: 'timesheet.edit.events.change',
buttons: Et2Dialog.BUTTONS_OK_CANCEL,
value: {
content: { time: _widget.value }
}
});
// Add to DOM, dialog will auto-open
document.body.appendChild(dialog);
}
}
app.classes.timesheet = TimesheetApp;

7
timesheet/templates/default/edit.xet
View File

@ -98,8 +98,8 @@
<et2-description value="Duration"></et2-description>
<et2-description value="Sum"></et2-description>
</row>
<row>
<et2-date-time id="${row}[tse_time]" readonly="true"></et2-date-time>
<row id="timesheet-events::$row_cont[tse_id]">
<et2-date-time id="${row}[tse_time]" readonly="true" class="et2_clickable" onclick="app.timesheet.editEventTime"></et2-date-time>
<et2-date-time id="${row}[tse_timestamp]" readonly="true"></et2-date-time>
<et2-select id="${row}[tse_type]" readonly="true"></et2-select>
<et2-date-duration id="${row}[time]" readonly="true" displayFormat="h:m" dataFormat="s"></et2-date-duration>
@ -108,6 +108,9 @@
</rows>
</grid>
</template>
<template id="timesheet.edit.events.change" template="" lang="" group="0" version="1.7.002">
<et2-date-time id="time" required="true"/>
</template>
<template id="timesheet.edit" template="" lang="" group="0" version="1.9.002">
<grid width="100%">
<columns>