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

* Calendar: New preference for changing resource status when event is moved

Browse Source
This commit is contained in:
nathan 2024-11-20 14:27:18 -07:00
parent a5bbfc627a
commit 7301a90f82
3 changed files with 95 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -3338,10 +3338,21 @@ class calendar_boupdate extends calendar_bo
$preferences = new Api\Preferences($event['owner']);
}
$part_prefs = $preferences->read_repository();
switch($part_prefs['calendar']['reset_stati'])
$reset_pref = !str_starts_with($uid, 'r') ? 'reset_stati' : 'reset_resource_status';
switch($part_prefs['calendar'][$reset_pref])
{
case 'no':
break;
case 'unavailable':
// Check new time, see if resource is available
static $resource_bo = new resources_bo();
$available = $resource_bo->checkUseable(substr($uid, 1), $event['start'], $event['end']);
if(!$available['useable'] || $available['useable'] < $q)
{
$status_reset = true;
$event['participants'][$uid] = calendar_so::combine_status('U', $q, $r);
}
break;
case 'startday':
if($sameday)
{

13
calendar/inc/class.calendar_hooks.inc.php
View File

@ -235,6 +235,9 @@ class calendar_hooks
'all' => lang('Always'),
'startday' => lang('If start day differs'),
);
$reset_resource_stati_on_shifts = array_merge($reset_stati_on_shifts, array(
'unavailable' => lang("If resource is unavailable"),
));
$freebusy_values = array(
0 => lang('No'),
1 => lang('Yes'),
@ -455,6 +458,16 @@ class calendar_hooks
'xmlrpc' => True,
'admin' => False,
),
'reset_resource_status' => array(
'type' => 'select',
'label' => 'Reset resource status on event shifts',
'name' => 'reset_resource_status',
'help' => 'Select whether you want the resource status reset to unknown, if an event is shifted later on.',
'values' => $reset_resource_stati_on_shifts,
'default' => 'all',
'xmlrpc' => True,
'admin' => False,
),
'no_category_custom_color' => array(
'type' => 'color',
'label' => 'Custom event color',

74
calendar/tests/ResetParticipantStatusTest.php
View File

@ -24,6 +24,9 @@ class ResetParticipantStatusTest extends \EGroupware\Api\AppTest
// Method under test with modified access
private $check_method = null;
// Events that need deleting
protected $event_ids = [];
public static function setUpBeforeClass() : void
{
parent::setUpBeforeClass();
@ -49,6 +52,12 @@ class ResetParticipantStatusTest extends \EGroupware\Api\AppTest
protected function tearDown() : void
{
foreach($this->event_ids as $event_id)
{
$this->bo->delete($event_id, 0, true);
// Once again if keep deleted is on
$this->bo->delete($event_id, 0, true);
}
// Clean up user
$GLOBALS['egw']->accounts->delete($this->account_id);
@ -107,7 +116,7 @@ class ResetParticipantStatusTest extends \EGroupware\Api\AppTest
'account' => $this->account_id,
'pref' => 'user',
'app' => 'calendar',
'set' => array('reset_stati' => 'startday')
'set' => array('reset_stati' => 'startday', 'reset_resource_status', 'startday')
);
$pref_command = new \admin_cmd_edit_preferences($pref);
$pref_command->run();
@ -124,9 +133,9 @@ class ResetParticipantStatusTest extends \EGroupware\Api\AppTest
// Current user, no change
$this->assertEquals($participant[$id], $status, "Participant $id was changed");
}
if(is_int($id))
if(is_int($id) || str_starts_with($id, 'c'))
{
// Users respect preference, in this case no change
// Users & resources respect preference, in this case no change
$this->assertEquals($participant[$id], $status, "Participant $id was changed");
}
else
@ -161,7 +170,7 @@ class ResetParticipantStatusTest extends \EGroupware\Api\AppTest
'account' => $this->account_id,
'pref' => 'user',
'app' => 'calendar',
'set' => array('reset_stati' => $change_preference)
'set' => array('reset_stati' => $change_preference, 'reset_resource_status' => $change_preference)
);
$pref_command = new \admin_cmd_edit_preferences($pref);
$pref_command->run();
@ -191,6 +200,51 @@ class ResetParticipantStatusTest extends \EGroupware\Api\AppTest
}
}
/**
* Test that moving the event to a different day resets or keeps status for
* resources according to if the resource is available for the new time.
* Other preference options are tested by testChangeUsesPreference.
*/
public function testResourceAvailability()
{
// Get test event
$event = $old_event = $this->get_event();
$participant = $event['participants'] = $old_event['participants'] = array(
'r1' => 'A1',
'r2' => 'A1',
);
// Set a conflict on r2 - need a real event in the DB
$conflict = $this->get_event();
$conflict['start'] += 24 * 3600;
$conflict['end'] += 24 * 3600;
$conflict['participants']['r2'] = 'A1';
$this->event_ids[] = $this->bo->save($conflict);
// Set preference
$pref = array(
'account' => $event['owner'],
'pref' => 'user',
'app' => 'calendar',
'set' => array('reset_resource_status' => 'unavailable')
);
$pref_command = new \admin_cmd_edit_preferences($pref);
$pref_command->run();
// Forward 1 day
$event['start'] += 24 * 3600;
$event['end'] += 24 * 3600;
// Check & reset status
$reset = $this->check_method->invokeArgs($this->bo, array(&$event, $old_event));
$this->assertTrue($reset, "Resource status was not reset");
$this->assertEquals($event['participants']['r1'], 'A1', "Resource status was changed");
$this->assertEquals($event['participants']['r2'], 'U', "Resource status was not changed, should have been reset");
}
protected function get_event()
{
return array(
@ -247,6 +301,18 @@ class ResetParticipantStatusTest extends \EGroupware\Api\AppTest
);
}
/**
* Different values for the status change on event change preference
*
* @see calendar_hooks::settings()
*/
public function resouceStatusPreferenceProvider()
{
return array(
array('unavailable') // Change status if resouce is unavailable
);
}
public function participantProvider()
{
return array(