extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-30 06:30:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

WIP timesheet timer: allow to start timer as alternative to add a timesheet directly

Browse Source 
timesheet will be added on stopping the timer
This commit is contained in:
ralf
2022-10-09 15:30:46 +02:00
parent a0471e1ad1
commit 65c1233ced
7 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
api/js/jsapi/egw_timer.js
View File

@ -93,9 +93,10 @@ egw.extend('timer', egw.MODULE_GLOBAL, function()
*
* @param {string} _action
* @param {string} _time
* @param {string} _app_id
* @throws string error-message
*/
function timerAction(_action, _time)
function timerAction(_action, _time, _app_id)
{
switch(_action)
{
@ -126,9 +127,14 @@ egw.extend('timer', egw.MODULE_GLOBAL, function()
stopTimer(specific, false, _time);
break;
}
// set _app_id on timer, if specified
if (_app_id && _action.substring(0, 8) === 'specific')
{
specific.app_id = _app_id;
}
// persist state
egw.request('timesheet.EGroupware\\Timesheet\\Events.ajax_event', [getState(_action, _time)]).then((tse_id) => {
if (_action.substring(8) === 'specific')
if (_action.substring(0, 8) === 'specific')
{
specific.id = tse_id;
}
@ -247,9 +253,8 @@ egw.extend('timer', egw.MODULE_GLOBAL, function()
* @param object _timer
* @param string|Date|undefined _start to initialise with time different from current time
* @param number|undefined _offset to set an offset
* @param string|undefined _app_id
*/
function startTimer(_timer, _start, _offset, _app_id)
function startTimer(_timer, _start, _offset)
{
// update _timer state object
if (_start)
@ -266,7 +271,7 @@ egw.extend('timer', egw.MODULE_GLOBAL, function()
}
_timer.offset = 0; // it's now set in start-time
_timer.paused = false;
_timer.app_id = _app_id;
_timer.app_id = undefined;
// update now
update();
@ -350,7 +355,7 @@ egw.extend('timer', egw.MODULE_GLOBAL, function()
{
if (specific.paused)
{
startTimer(specific, undefined, undefined, _senders[0].id);
timerAction('specific-start', undefined, _senders[0].id);
}
else
{
@ -364,7 +369,7 @@ egw.extend('timer', egw.MODULE_GLOBAL, function()
Et2Dialog.BUTTONS_OK_CANCEL, Et2Dialog.QUESTION_MESSAGE, undefined, egw);
return;
}
startTimer(specific, undefined, undefined, _senders[0].id);
timerAction('specific-start', undefined, _senders[0].id);
},
/**