Skip to content

Commit

Permalink
Preview schedules in the overview
Browse files Browse the repository at this point in the history
  • Loading branch information
raviks789 committed Jun 18, 2024
1 parent ba627b4 commit bf63fda
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 17 deletions.
4 changes: 4 additions & 0 deletions application/controllers/ScheduleController.php
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,17 @@ public function editRotationAction(): void
$form->setSuggestionUrl(Url::fromPath('notifications/schedule/suggest-recipient'));
$form->on(RotationConfigForm::ON_SUCCESS, function (RotationConfigForm $form) use ($id, $scheduleId) {
$form->editRotation($id);
$this->sendExtraUpdates(['#col1']);
$this->closeModalAndRefreshRelatedView(Links::schedule($scheduleId));
});
$form->on(RotationConfigForm::ON_SENT, function (RotationConfigForm $form) use ($id, $scheduleId) {
if ($form->hasBeenRemoved()) {
$form->removeRotation($id);
$this->sendExtraUpdates(['#col1']);
$this->closeModalAndRefreshRelatedView(Links::schedule($scheduleId));
} elseif ($form->hasBeenWiped()) {
$form->wipeRotation();
$this->sendExtraUpdates(['#col1']);
$this->closeModalAndRefreshRelatedView(Links::schedule($scheduleId));
} elseif (! $form->hasBeenSubmitted()) {
foreach ($form->getPartUpdates() as $update) {
Expand All @@ -188,6 +191,7 @@ public function moveRotationAction(): void

$form = new MoveRotationForm(Database::get());
$form->on(MoveRotationForm::ON_SUCCESS, function (MoveRotationForm $form) {
$this->sendExtraUpdates(['#col1']);
$this->redirectNow(Links::schedule($form->getScheduleId()));
});

Expand Down
21 changes: 20 additions & 1 deletion library/Notifications/Widget/ItemList/ScheduleListItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@

namespace Icinga\Module\Notifications\Widget\ItemList;

use DateTime;
use Icinga\Module\Notifications\Common\Links;
use Icinga\Module\Notifications\Model\Schedule;
use Icinga\Module\Notifications\Widget\Timeline;
use Icinga\Module\Notifications\Widget\Timeline\Rotation;
use Icinga\Util\Csp;
use ipl\Html\BaseHtmlElement;
use ipl\Web\Common\BaseListItem;
use ipl\Web\Style;
use ipl\Web\Widget\Link;

/**
Expand Down Expand Up @@ -43,6 +48,20 @@ protected function assembleHeader(BaseHtmlElement $header): void

protected function assembleMain(BaseHtmlElement $main): void
{
$main->addHtml($this->createHeader());
// Number of days is set to 7, since default mode for schedule is week
// and the start day should be the current day
$timeline = (new Timeline((new DateTime())->setTime(0, 0), 7))
->setIgnoreRotations()
->setStyle(
(new Style())
->setNonce(Csp::getStyleNonce())
->setModule('notifications')
);

foreach ($this->item->rotation->with('timeperiod')->orderBy('first_handoff', SORT_DESC) as $rotation) {
$timeline->addRotation(new Rotation($rotation));
}

$main->addHtml($this->createHeader(), $timeline);
}
}
75 changes: 59 additions & 16 deletions library/Notifications/Widget/Timeline.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ class Timeline extends BaseHtmlElement implements EntryProvider
/** @var ?DynamicGrid */
protected $grid;

/** @var bool Whether to ignore creating rotations */
protected $ignoreRotations = false;

/**
* Set the style object to register inline styles in
*
Expand Down Expand Up @@ -80,13 +83,38 @@ public function getStyle(): Style
*
* @param DateTime $start The day the grid should start on
* @param int $days Number of days to show on the grid
* @param bool $ignoreRotations Whether to ignore creating rotations
*/
public function __construct(DateTime $start, int $days)
{
$this->start = $start;
$this->days = $days;
}

/**
* Set whether creating rotations should be ignored
*
* @param bool $ignoreRotations
*
* @return $this
*/
public function setIgnoreRotations(bool $ignoreRotations = true): self
{
$this->ignoreRotations = $ignoreRotations;

return $this;
}

/**
* Get whether creating rotations should be ignored
*
* @return bool
*/
public function getIgnoreRotations(): bool
{
return $this->ignoreRotations;
}

/**
* Add a rotation to the timeline
*
Expand Down Expand Up @@ -145,13 +173,22 @@ public function getEntries(): Traversable
}, 0);

$occupiedCells = [];
$resultPosition = $maxPriority + 1;

$ignoreRotations = $this->getIgnoreRotations();
if ($ignoreRotations) {
$resultPosition = 0;
} else {
$resultPosition = $maxPriority + 1;
}

foreach ($rotations as $rotation) {
$rotationPosition = $maxPriority - $rotation->getPriority();
foreach ($rotation->fetchTimeperiodEntries($this->start, $this->getGrid()->getGridEnd()) as $entry) {
$entry->setPosition($rotationPosition);

yield $entry;
if (! $ignoreRotations) {
yield $entry;
}

$occupiedCells += $getDesiredCells($entry);
}
Expand Down Expand Up @@ -221,15 +258,17 @@ protected function getGrid(): DynamicGrid
$this->grid = new DynamicGrid($this, $this->getStyle(), $this->start);
$this->grid->setDays($this->days);

$rotations = $this->rotations;
usort($rotations, function (Rotation $a, Rotation $b) {
return $b->getPriority() <=> $a->getPriority();
});
$occupiedPriorities = [];
foreach ($rotations as $rotation) {
if (! isset($occupiedPriorities[$rotation->getPriority()])) {
$occupiedPriorities[$rotation->getPriority()] = true;
$this->grid->addToSideBar($this->assembleSidebarEntry($rotation));
if (! $this->getIgnoreRotations()) {
$rotations = $this->rotations;
usort($rotations, function (Rotation $a, Rotation $b) {
return $b->getPriority() <=> $a->getPriority();
});
$occupiedPriorities = [];
foreach ($rotations as $rotation) {
if (! isset($occupiedPriorities[$rotation->getPriority()])) {
$occupiedPriorities[$rotation->getPriority()] = true;
$this->grid->addToSideBar($this->assembleSidebarEntry($rotation));
}
}
}
}
Expand Down Expand Up @@ -259,6 +298,11 @@ protected function assembleSidebarEntry(Rotation $rotation): BaseHtmlElement

protected function assemble()
{
$this->addHtml(
$this->getGrid(),
$this->getStyle()
);

if (empty($this->rotations)) {
$this->getGrid()->addToSideBar(
new HtmlElement(
Expand All @@ -267,6 +311,10 @@ protected function assemble()
Text::create($this->translate('No rotations configured'))
)
);

if ($this->getIgnoreRotations()) {
return;
}
}

$this->getGrid()->addToSideBar(
Expand All @@ -276,10 +324,5 @@ protected function assemble()
Text::create($this->translate('Result'))
)
);

$this->addHtml(
$this->getGrid(),
$this->getStyle()
);
}
}
19 changes: 19 additions & 0 deletions public/css/list/schedule-list.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* Icinga Notifications Web | (c) 2024 Icinga GmbH | GPLv2 */
.item-list.schedule-list {
.list-item {
.main {
.header {
background: none;
}

.entry {
pointer-events: none;
}
}

.timeline {
margin-left: 5em;
height: auto;
}
}
}

0 comments on commit bf63fda

Please sign in to comment.