Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d02f49e293 | |||
| 85432401ea | |||
| 873df71ed0 | |||
| 18b31e6d62 | |||
| d64986d2ee | |||
| 1fa3acae74 | |||
| d0d32db177 | |||
| dc63a031e1 | |||
| 5bcaea3022 | |||
| dea624a72d |
1
Asset/css/skeleton.css
vendored
1
Asset/css/skeleton.css
vendored
@@ -1 +0,0 @@
|
|||||||
/* Skeleton plugin styles -- add CSS here. Loaded via template:layout:css. */
|
|
||||||
56
Asset/js/recoreco-modal.js
Normal file
56
Asset/js/recoreco-modal.js
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
/*
|
||||||
|
* RecoReco -- keep the "days before" field within one period of the selected frequency.
|
||||||
|
*
|
||||||
|
* The Recurring schedule modal is injected by AJAX, so we react to the frequency <select> both when
|
||||||
|
* it appears (MutationObserver) and when it changes (delegated event). Daily -> field disabled (0);
|
||||||
|
* weekly -> max 6; monthly -> max 27; yearly -> max 364. The server clamps too, so this is only the
|
||||||
|
* UI guard.
|
||||||
|
*/
|
||||||
|
(function () {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var CAPS = { daily: 0, weekly: 6, monthly_day: 27, monthly_dow: 27, yearly: 364 };
|
||||||
|
|
||||||
|
function apply(select) {
|
||||||
|
// "days before" ceiling / disable by frequency.
|
||||||
|
var input = document.querySelector('input[name="recoreco_days_before"]');
|
||||||
|
if (input) {
|
||||||
|
var max = CAPS.hasOwnProperty(select.value) ? CAPS[select.value] : 27;
|
||||||
|
|
||||||
|
if (max === 0) {
|
||||||
|
input.value = 0;
|
||||||
|
input.setAttribute("max", "0");
|
||||||
|
input.disabled = true;
|
||||||
|
} else {
|
||||||
|
input.disabled = false;
|
||||||
|
input.setAttribute("max", String(max));
|
||||||
|
if (parseInt(input.value, 10) > max) {
|
||||||
|
input.value = max;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The last-day/weekday checkbox only means something for monthly and yearly.
|
||||||
|
var lastday = document.querySelector(".recoreco-lastday");
|
||||||
|
if (lastday) {
|
||||||
|
var monthlyOrYearly = select.value === "monthly_day" || select.value === "monthly_dow" || select.value === "yearly";
|
||||||
|
lastday.style.display = monthlyOrYearly ? "" : "none";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
document.addEventListener("change", function (e) {
|
||||||
|
if (e.target && e.target.name === "recoreco_frequency") {
|
||||||
|
apply(e.target);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (window.MutationObserver) {
|
||||||
|
new MutationObserver(function () {
|
||||||
|
var select = document.querySelector('select[name="recoreco_frequency"]:not([data-recoreco-init])');
|
||||||
|
if (select) {
|
||||||
|
select.setAttribute("data-recoreco-init", "1");
|
||||||
|
apply(select);
|
||||||
|
}
|
||||||
|
}).observe(document.body, { childList: true, subtree: true });
|
||||||
|
}
|
||||||
|
})();
|
||||||
@@ -1 +0,0 @@
|
|||||||
// Skeleton plugin script -- add JS here. Loaded via template:layout:js.
|
|
||||||
32
Console/RecoRecoCommand.php
Normal file
32
Console/RecoRecoCommand.php
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Kanboard\Plugin\RecoReco\Console;
|
||||||
|
|
||||||
|
use Kanboard\Console\BaseCommand;
|
||||||
|
use Kanboard\Plugin\RecoReco\Model\RecoRecoModel;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* CLI entry point for the RecoReco engine. Run by cron (four times a day from v1.0). Can be run by
|
||||||
|
* hand to test: ./cli recoreco:run
|
||||||
|
*/
|
||||||
|
class RecoRecoCommand extends BaseCommand
|
||||||
|
{
|
||||||
|
protected function configure()
|
||||||
|
{
|
||||||
|
$this
|
||||||
|
->setName('recoreco:run')
|
||||||
|
->setDescription('Spawn RecoReco calendar-scheduled cards whose occurrence is due');
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function execute(InputInterface $input, OutputInterface $output): int
|
||||||
|
{
|
||||||
|
$model = new RecoRecoModel($this->container);
|
||||||
|
$count = $model->run();
|
||||||
|
|
||||||
|
$output->writeln('RecoReco: spawned '.$count.' card(s).');
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
155
Controller/RecurrenceController.php
Normal file
155
Controller/RecurrenceController.php
Normal file
@@ -0,0 +1,155 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Kanboard\Plugin\RecoReco\Controller;
|
||||||
|
|
||||||
|
use Kanboard\Controller\BaseController;
|
||||||
|
use Kanboard\Model\TaskModel;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The "Recurring schedule" modal: configure a card's calendar recurrence and store it in task
|
||||||
|
* metadata. The CLI engine (RecoRecoModel) does the actual spawning.
|
||||||
|
*
|
||||||
|
* Gate: a card can only be enabled when it has a due date (the recurrence anchor), is not already a
|
||||||
|
* native-recurring card (mutually exclusive), and the board has a column other than the card's own
|
||||||
|
* (the copy must land elsewhere).
|
||||||
|
*/
|
||||||
|
class RecurrenceController extends BaseController
|
||||||
|
{
|
||||||
|
public function edit(array $values = array(), array $errors = array())
|
||||||
|
{
|
||||||
|
$task = $this->getTask();
|
||||||
|
$columns = $this->targetColumns($task);
|
||||||
|
$meta = $this->taskMetadataModel->getAll($task['id']);
|
||||||
|
|
||||||
|
if (empty($values)) {
|
||||||
|
$values = $this->getStoredValues($meta, $task, $columns);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->response->html($this->template->render('recoReco:recurrence/edit', array(
|
||||||
|
'task' => $task,
|
||||||
|
'values' => $values,
|
||||||
|
'errors' => $errors,
|
||||||
|
'columns_list' => $columns,
|
||||||
|
'frequency_list' => $this->getFrequencyList(),
|
||||||
|
'has_due_date' => ! empty($task['date_due']),
|
||||||
|
'is_native' => $task['recurrence_status'] != TaskModel::RECURRING_STATUS_NONE,
|
||||||
|
'has_target' => ! empty($columns),
|
||||||
|
'is_clone' => isset($meta['recoreco_clone']) && $meta['recoreco_clone'] == 1,
|
||||||
|
'source_id' => isset($meta['recoreco_source']) ? (int) $meta['recoreco_source'] : 0,
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function save()
|
||||||
|
{
|
||||||
|
$task = $this->getTask();
|
||||||
|
$input = $this->request->getValues();
|
||||||
|
$columns = $this->targetColumns($task);
|
||||||
|
|
||||||
|
// A clone can never be made recurring (that would recurse). Guard even though the modal
|
||||||
|
// hides the form for clones.
|
||||||
|
$is_clone = (int) $this->taskMetadataModel->get($task['id'], 'recoreco_clone', 0) === 1;
|
||||||
|
|
||||||
|
// Only a plain card (a due date, not native-recurring, not a clone, a valid target) may enable.
|
||||||
|
$can_recur = ! empty($task['date_due'])
|
||||||
|
&& $task['recurrence_status'] == TaskModel::RECURRING_STATUS_NONE
|
||||||
|
&& ! $is_clone
|
||||||
|
&& ! empty($columns);
|
||||||
|
$enabled = ($can_recur && isset($input['recoreco_enabled']) && $input['recoreco_enabled'] == 1) ? 1 : 0;
|
||||||
|
|
||||||
|
$frequency = isset($input['recoreco_frequency']) && array_key_exists($input['recoreco_frequency'], $this->getFrequencyList())
|
||||||
|
? $input['recoreco_frequency']
|
||||||
|
: 'monthly_day';
|
||||||
|
|
||||||
|
// Keep the lead time under one period (else a copy's fire time crosses the prior occurrence).
|
||||||
|
$daysBefore = isset($input['recoreco_days_before']) && ctype_digit((string) $input['recoreco_days_before']) ? (int) $input['recoreco_days_before'] : 0;
|
||||||
|
$daysBefore = min($daysBefore, $this->maxDaysBefore($frequency));
|
||||||
|
|
||||||
|
$values = array(
|
||||||
|
'recoreco_enabled' => $enabled,
|
||||||
|
'recoreco_target_column' => $this->resolveTarget(isset($input['recoreco_target_column']) ? $input['recoreco_target_column'] : 0, $columns),
|
||||||
|
'recoreco_frequency' => $frequency,
|
||||||
|
'recoreco_last_day' => isset($input['recoreco_last_day']) ? 1 : 0,
|
||||||
|
'recoreco_days_before' => $daysBefore,
|
||||||
|
'recoreco_link_copies' => isset($input['recoreco_link_copies']) ? 1 : 0,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Capture the anchor (the due date at enable time) -- the drift-free pattern.
|
||||||
|
if ($enabled) {
|
||||||
|
$values['recoreco_anchor'] = (int) $task['date_due'];
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->taskMetadataModel->save($task['id'], $values);
|
||||||
|
|
||||||
|
// Reconcile the template's duplicate links with the setting right away.
|
||||||
|
$model = new \Kanboard\Plugin\RecoReco\Model\RecoRecoModel($this->container);
|
||||||
|
$model->syncCloneLinks($task['id'], $values['recoreco_link_copies'] == 1);
|
||||||
|
|
||||||
|
$this->flash->success(t('Recurring schedule saved.'));
|
||||||
|
|
||||||
|
return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Columns the copy can land in: every column except the template's own (the copy must move).
|
||||||
|
private function targetColumns(array $task)
|
||||||
|
{
|
||||||
|
$columns = $this->columnModel->getList($task['project_id']);
|
||||||
|
unset($columns[$task['column_id']]);
|
||||||
|
|
||||||
|
return $columns;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A stored/posted target, if still a valid non-current column; otherwise the first one (or 0).
|
||||||
|
private function resolveTarget($candidate, array $columns)
|
||||||
|
{
|
||||||
|
$candidate = (int) $candidate;
|
||||||
|
|
||||||
|
if (array_key_exists($candidate, $columns)) {
|
||||||
|
return $candidate;
|
||||||
|
}
|
||||||
|
|
||||||
|
$keys = array_keys($columns);
|
||||||
|
|
||||||
|
return empty($keys) ? 0 : (int) $keys[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getStoredValues(array $meta, array $task, array $columns)
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
'recoreco_enabled' => isset($meta['recoreco_enabled']) ? (int) $meta['recoreco_enabled'] : 0,
|
||||||
|
'recoreco_target_column' => $this->resolveTarget(isset($meta['recoreco_target_column']) ? $meta['recoreco_target_column'] : 0, $columns),
|
||||||
|
'recoreco_frequency' => isset($meta['recoreco_frequency']) ? $meta['recoreco_frequency'] : 'monthly_day',
|
||||||
|
'recoreco_last_day' => isset($meta['recoreco_last_day']) ? (int) $meta['recoreco_last_day'] : 0,
|
||||||
|
'recoreco_days_before' => isset($meta['recoreco_days_before']) ? (int) $meta['recoreco_days_before'] : 0,
|
||||||
|
'recoreco_link_copies' => isset($meta['recoreco_link_copies']) ? (int) $meta['recoreco_link_copies'] : 0,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getFrequencyList()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
'yearly' => t('Yearly'),
|
||||||
|
'monthly_day' => t('Monthly by day'),
|
||||||
|
'monthly_dow' => t('Monthly by weekday'),
|
||||||
|
'weekly' => t('Weekly'),
|
||||||
|
'daily' => t('Daily'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The largest allowed "days before" for a frequency -- kept strictly under one period so a
|
||||||
|
* copy's fire time never crosses the previous occurrence. Daily = 0 (disabled).
|
||||||
|
*/
|
||||||
|
private function maxDaysBefore($frequency)
|
||||||
|
{
|
||||||
|
switch ($frequency) {
|
||||||
|
case 'daily':
|
||||||
|
return 0;
|
||||||
|
case 'weekly':
|
||||||
|
return 6;
|
||||||
|
case 'yearly':
|
||||||
|
return 364;
|
||||||
|
default: // monthly_day, monthly_dow
|
||||||
|
return 27;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
38
Helper/RecoRecoHelper.php
Normal file
38
Helper/RecoRecoHelper.php
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Kanboard\Plugin\RecoReco\Helper;
|
||||||
|
|
||||||
|
use Kanboard\Core\Base;
|
||||||
|
use Kanboard\Model\TaskModel;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Board helper: which RecoReco icon a card should show.
|
||||||
|
*
|
||||||
|
* Single-icon rule -- RecoReco only renders when the card is NOT native-recurring
|
||||||
|
* (recurrence_status == NONE), so native's icon and RecoReco's icon can never appear together.
|
||||||
|
*/
|
||||||
|
class RecoRecoHelper extends Base
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param array $task A board task row (has recurrence_status and id).
|
||||||
|
* @return string 'template', 'clone', or '' (no RecoReco icon).
|
||||||
|
*/
|
||||||
|
public function iconType(array $task)
|
||||||
|
{
|
||||||
|
if ((int) $task['recurrence_status'] !== TaskModel::RECURRING_STATUS_NONE) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$meta = $this->taskMetadataModel->getAll($task['id']);
|
||||||
|
|
||||||
|
if (isset($meta['recoreco_enabled']) && $meta['recoreco_enabled'] == 1) {
|
||||||
|
return 'template';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($meta['recoreco_clone']) && $meta['recoreco_clone'] == 1) {
|
||||||
|
return 'clone';
|
||||||
|
}
|
||||||
|
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
}
|
||||||
206
Model/OccurrenceCalculator.php
Normal file
206
Model/OccurrenceCalculator.php
Normal file
@@ -0,0 +1,206 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Kanboard\Plugin\RecoReco\Model;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pure calendar math for RecoReco.
|
||||||
|
*
|
||||||
|
* Given an anchor due date (the drift-free pattern: it carries the day-of-month, the weekday, and
|
||||||
|
* the time), a frequency, and the "last day" flag, it computes occurrence datetimes. It has NO
|
||||||
|
* container dependencies, so it is unit-testable in isolation (Test/OccurrenceCalculatorTest.php).
|
||||||
|
*
|
||||||
|
* Occurrences are always computed from the anchor, never by marching a clamped date forward, so a
|
||||||
|
* "30th" schedule goes 30, 28/29, 30, 30... and never drifts.
|
||||||
|
*/
|
||||||
|
class OccurrenceCalculator
|
||||||
|
{
|
||||||
|
const MAX_MONTHS = 120;
|
||||||
|
const MAX_YEARS = 20;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The earliest occurrence at/after $reference (when $inclusive) or strictly after it.
|
||||||
|
*
|
||||||
|
* @param int $anchor Unix timestamp: the pattern.
|
||||||
|
* @param string $frequency daily | weekly | monthly_day | monthly_dow | yearly
|
||||||
|
* @param bool $lastDay
|
||||||
|
* @param int $reference Unix timestamp.
|
||||||
|
* @param bool $inclusive
|
||||||
|
* @return int|null Occurrence timestamp, or null for an unknown frequency.
|
||||||
|
*/
|
||||||
|
public function occurrenceFrom($anchor, $frequency, $lastDay, $reference, $inclusive = false)
|
||||||
|
{
|
||||||
|
$anchor = (int) $anchor;
|
||||||
|
$reference = (int) $reference;
|
||||||
|
$lastDay = (bool) $lastDay;
|
||||||
|
$inclusive = (bool) $inclusive;
|
||||||
|
|
||||||
|
switch ($frequency) {
|
||||||
|
case 'daily':
|
||||||
|
return $this->daily($anchor, $reference, $inclusive);
|
||||||
|
case 'weekly':
|
||||||
|
return $this->weekly($anchor, $reference, $inclusive);
|
||||||
|
case 'monthly_day':
|
||||||
|
return $this->monthlyByDay($anchor, $lastDay, $reference, $inclusive);
|
||||||
|
case 'monthly_dow':
|
||||||
|
return $this->monthlyByWeekday($anchor, $lastDay, $reference, $inclusive);
|
||||||
|
case 'yearly':
|
||||||
|
return $this->yearly($anchor, $lastDay, $reference, $inclusive);
|
||||||
|
default:
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function daily($anchor, $reference, $inclusive)
|
||||||
|
{
|
||||||
|
$h = (int) date('G', $anchor);
|
||||||
|
$i = (int) date('i', $anchor);
|
||||||
|
$s = (int) date('s', $anchor);
|
||||||
|
$y = (int) date('Y', $reference);
|
||||||
|
$m = (int) date('n', $reference);
|
||||||
|
$d = (int) date('j', $reference);
|
||||||
|
|
||||||
|
for ($k = 0; $k < 3; $k++) {
|
||||||
|
$o = mktime($h, $i, $s, $m, $d + $k, $y);
|
||||||
|
|
||||||
|
if ($this->matches($o, $reference, $inclusive)) {
|
||||||
|
return $o;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function weekly($anchor, $reference, $inclusive)
|
||||||
|
{
|
||||||
|
$h = (int) date('G', $anchor);
|
||||||
|
$i = (int) date('i', $anchor);
|
||||||
|
$s = (int) date('s', $anchor);
|
||||||
|
$w = (int) date('w', $anchor);
|
||||||
|
$y = (int) date('Y', $reference);
|
||||||
|
$m = (int) date('n', $reference);
|
||||||
|
$d = (int) date('j', $reference);
|
||||||
|
|
||||||
|
for ($k = 0; $k < 8; $k++) {
|
||||||
|
$o = mktime($h, $i, $s, $m, $d + $k, $y);
|
||||||
|
|
||||||
|
if ((int) date('w', $o) === $w && $this->matches($o, $reference, $inclusive)) {
|
||||||
|
return $o;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function monthlyByDay($anchor, $lastDay, $reference, $inclusive)
|
||||||
|
{
|
||||||
|
$anchorDay = (int) date('j', $anchor);
|
||||||
|
$h = (int) date('G', $anchor);
|
||||||
|
$i = (int) date('i', $anchor);
|
||||||
|
$s = (int) date('s', $anchor);
|
||||||
|
|
||||||
|
$y = (int) date('Y', $reference);
|
||||||
|
$m = (int) date('n', $reference);
|
||||||
|
|
||||||
|
for ($k = 0; $k < self::MAX_MONTHS; $k++) {
|
||||||
|
$lastDom = (int) date('t', mktime(0, 0, 0, $m, 1, $y));
|
||||||
|
$day = $lastDay ? $lastDom : min($anchorDay, $lastDom);
|
||||||
|
$o = mktime($h, $i, $s, $m, $day, $y);
|
||||||
|
|
||||||
|
if ($this->matches($o, $reference, $inclusive)) {
|
||||||
|
return $o;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->nextMonth($m, $y);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function monthlyByWeekday($anchor, $lastDay, $reference, $inclusive)
|
||||||
|
{
|
||||||
|
$h = (int) date('G', $anchor);
|
||||||
|
$i = (int) date('i', $anchor);
|
||||||
|
$s = (int) date('s', $anchor);
|
||||||
|
$w = (int) date('w', $anchor);
|
||||||
|
$k = intdiv((int) date('j', $anchor) - 1, 7) + 1; // 1..5: which occurrence of $w in the month
|
||||||
|
|
||||||
|
$y = (int) date('Y', $reference);
|
||||||
|
$m = (int) date('n', $reference);
|
||||||
|
|
||||||
|
for ($j = 0; $j < self::MAX_MONTHS; $j++) {
|
||||||
|
$day = $lastDay ? $this->lastWeekdayOfMonth($y, $m, $w) : $this->nthWeekdayOfMonth($y, $m, $w, $k);
|
||||||
|
|
||||||
|
if ($day !== null) {
|
||||||
|
$o = mktime($h, $i, $s, $m, $day, $y);
|
||||||
|
|
||||||
|
if ($this->matches($o, $reference, $inclusive)) {
|
||||||
|
return $o;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->nextMonth($m, $y);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function yearly($anchor, $lastDay, $reference, $inclusive)
|
||||||
|
{
|
||||||
|
$month = (int) date('n', $anchor);
|
||||||
|
$anchorDay = (int) date('j', $anchor);
|
||||||
|
$h = (int) date('G', $anchor);
|
||||||
|
$i = (int) date('i', $anchor);
|
||||||
|
$s = (int) date('s', $anchor);
|
||||||
|
|
||||||
|
$y = (int) date('Y', $reference);
|
||||||
|
|
||||||
|
for ($j = 0; $j < self::MAX_YEARS; $j++) {
|
||||||
|
$lastDom = (int) date('t', mktime(0, 0, 0, $month, 1, $y));
|
||||||
|
$day = $lastDay ? $lastDom : min($anchorDay, $lastDom);
|
||||||
|
$o = mktime($h, $i, $s, $month, $day, $y);
|
||||||
|
|
||||||
|
if ($this->matches($o, $reference, $inclusive)) {
|
||||||
|
return $o;
|
||||||
|
}
|
||||||
|
|
||||||
|
$y++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The day-of-month of the k-th weekday $w in month $m/$y, or null if that month has no k-th one.
|
||||||
|
private function nthWeekdayOfMonth($y, $m, $w, $k)
|
||||||
|
{
|
||||||
|
$firstDow = (int) date('w', mktime(0, 0, 0, $m, 1, $y));
|
||||||
|
$firstW = 1 + (($w - $firstDow + 7) % 7);
|
||||||
|
$day = $firstW + ($k - 1) * 7;
|
||||||
|
$lastDom = (int) date('t', mktime(0, 0, 0, $m, 1, $y));
|
||||||
|
|
||||||
|
return $day <= $lastDom ? $day : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The day-of-month of the last weekday $w in month $m/$y.
|
||||||
|
private function lastWeekdayOfMonth($y, $m, $w)
|
||||||
|
{
|
||||||
|
$lastDom = (int) date('t', mktime(0, 0, 0, $m, 1, $y));
|
||||||
|
$lastDow = (int) date('w', mktime(0, 0, 0, $m, $lastDom, $y));
|
||||||
|
|
||||||
|
return $lastDom - (($lastDow - $w + 7) % 7);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function matches($occurrence, $reference, $inclusive)
|
||||||
|
{
|
||||||
|
return $inclusive ? $occurrence >= $reference : $occurrence > $reference;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function nextMonth(&$m, &$y)
|
||||||
|
{
|
||||||
|
$m++;
|
||||||
|
|
||||||
|
if ($m > 12) {
|
||||||
|
$m = 1;
|
||||||
|
$y++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
222
Model/RecoRecoModel.php
Normal file
222
Model/RecoRecoModel.php
Normal file
@@ -0,0 +1,222 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Kanboard\Plugin\RecoReco\Model;
|
||||||
|
|
||||||
|
use Kanboard\Core\Base;
|
||||||
|
use Kanboard\Model\TaskModel;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The RecoReco engine: find enabled templates and spawn their due occurrences.
|
||||||
|
*
|
||||||
|
* Called by the recoreco:run CLI command. v0.3 handles monthly-by-day and fires everything whose
|
||||||
|
* fire time has arrived (fire time = occurrence - days_before); v1.0 adds the 4-window cron horizon.
|
||||||
|
*
|
||||||
|
* Per template: the native-recurrence yield (decision 13), first-run init / manual-edit re-anchor,
|
||||||
|
* then a catch-up loop that duplicates the card into the target column and advances the cursor.
|
||||||
|
*/
|
||||||
|
class RecoRecoModel extends Base
|
||||||
|
{
|
||||||
|
const CATCHUP_CAP = 24;
|
||||||
|
|
||||||
|
private $calc;
|
||||||
|
|
||||||
|
public function run($now = null)
|
||||||
|
{
|
||||||
|
$now = $now ?: time();
|
||||||
|
$horizon = $this->horizon($now);
|
||||||
|
$spawned = 0;
|
||||||
|
|
||||||
|
$task_ids = $this->db->table('task_has_metadata')
|
||||||
|
->eq('name', 'recoreco_enabled')
|
||||||
|
->eq('value', '1')
|
||||||
|
->findAllByColumn('task_id');
|
||||||
|
|
||||||
|
foreach ($task_ids as $task_id) {
|
||||||
|
$spawned += $this->processTemplate((int) $task_id, $now, $horizon);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $spawned;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The look-ahead horizon for this run: fire everything whose fire time is before it. Computed as
|
||||||
|
* "ceil now to the next 6h boundary, then +12h", which lands on the four daily runs:
|
||||||
|
* 05:58 -> 18:00, 11:58 -> 00:00, 17:58 -> 06:00, 23:58 -> 12:00. Gives a 12h look-ahead with a
|
||||||
|
* 6h overlap between runs, so a missed run is covered by its neighbour. Past-due occurrences are
|
||||||
|
* naturally included (their fire time is < now < horizon) -- that is the catch-up.
|
||||||
|
*
|
||||||
|
* @param int $now
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
private function horizon($now)
|
||||||
|
{
|
||||||
|
$startOfDay = mktime(0, 0, 0, (int) date('n', $now), (int) date('j', $now), (int) date('Y', $now));
|
||||||
|
$boundaryHour = (intdiv((int) date('G', $now), 6) + 1) * 6;
|
||||||
|
|
||||||
|
return $startOfDay + $boundaryHour * 3600 + 12 * 3600;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function processTemplate($task_id, $now, $horizon)
|
||||||
|
{
|
||||||
|
$task = $this->taskFinderModel->getById($task_id);
|
||||||
|
|
||||||
|
if (empty($task)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Native wins: if the card became native-recurring, RecoReco yields (decision 13).
|
||||||
|
if ($task['recurrence_status'] != TaskModel::RECURRING_STATUS_NONE) {
|
||||||
|
$this->taskMetadataModel->save($task_id, array('recoreco_enabled' => 0));
|
||||||
|
$this->logger->info('RecoReco: disabled on task '.$task_id.' (now native-recurring)');
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
$meta = $this->taskMetadataModel->getAll($task_id);
|
||||||
|
$frequency = isset($meta['recoreco_frequency']) ? $meta['recoreco_frequency'] : '';
|
||||||
|
|
||||||
|
// All five frequencies are supported since v1.1; skip anything unknown.
|
||||||
|
if (! in_array($frequency, array('daily', 'weekly', 'monthly_day', 'monthly_dow', 'yearly'), true)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
$anchor = isset($meta['recoreco_anchor']) ? (int) $meta['recoreco_anchor'] : 0;
|
||||||
|
|
||||||
|
if ($anchor <= 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
$lastDay = isset($meta['recoreco_last_day']) && $meta['recoreco_last_day'] == 1;
|
||||||
|
$daysBefore = isset($meta['recoreco_days_before']) ? (int) $meta['recoreco_days_before'] : 0;
|
||||||
|
$targetColumn = isset($meta['recoreco_target_column']) ? (int) $meta['recoreco_target_column'] : (int) $task['column_id'];
|
||||||
|
// Default off: only keep the duplicate link when explicitly turned on.
|
||||||
|
$linkCopies = isset($meta['recoreco_link_copies']) && $meta['recoreco_link_copies'] == 1;
|
||||||
|
|
||||||
|
$cursor = (int) $task['date_due'];
|
||||||
|
$synced = isset($meta['recoreco_synced_due']) ? (int) $meta['recoreco_synced_due'] : null;
|
||||||
|
|
||||||
|
if ($synced === null) {
|
||||||
|
// First run after enabling: place the cursor on the first occurrence.
|
||||||
|
$cursor = $this->firstCursor($anchor, $frequency, $lastDay, $now);
|
||||||
|
$this->setDue($task_id, $cursor);
|
||||||
|
} elseif ($cursor !== $synced) {
|
||||||
|
// The user hand-edited the due date -> re-anchor to it (a reschedule).
|
||||||
|
$anchor = $cursor;
|
||||||
|
$this->taskMetadataModel->save($task_id, array('recoreco_anchor' => $anchor));
|
||||||
|
$this->setDue($task_id, $cursor);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fire every occurrence whose fire time is before this run's horizon (this includes
|
||||||
|
// past-due ones -> catch-up), advancing the cursor each time.
|
||||||
|
$spawned = 0;
|
||||||
|
$fireTime = $cursor - $daysBefore * 86400;
|
||||||
|
|
||||||
|
while ($fireTime < $horizon && $spawned < self::CATCHUP_CAP) {
|
||||||
|
$this->spawn($task, $targetColumn);
|
||||||
|
|
||||||
|
$next = $this->calculator()->occurrenceFrom($anchor, $frequency, $lastDay, $cursor, false);
|
||||||
|
|
||||||
|
if ($next === null || $next <= $cursor) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
$cursor = $next;
|
||||||
|
$this->setDue($task_id, $cursor);
|
||||||
|
$fireTime = $cursor - $daysBefore * 86400;
|
||||||
|
$spawned++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reconcile the duplicate links with the setting (removes both new and old ones when off).
|
||||||
|
$this->syncCloneLinks($task_id, $linkCopies);
|
||||||
|
|
||||||
|
return $spawned;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reconcile a template's "is a duplicate of" links with the link-copies setting. When off, remove
|
||||||
|
* the links to THIS template's own RecoReco clones (identified by recoreco_source, so manual
|
||||||
|
* links are left untouched). When on, do nothing -- new spawns already carry the link.
|
||||||
|
*
|
||||||
|
* @param int $template_id
|
||||||
|
* @param bool $linkCopies
|
||||||
|
*/
|
||||||
|
public function syncCloneLinks($template_id, $linkCopies)
|
||||||
|
{
|
||||||
|
if ($linkCopies) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($this->taskLinkModel->getAll($template_id) as $link) {
|
||||||
|
$opposite = (int) $link['task_id'];
|
||||||
|
|
||||||
|
if ((int) $this->taskMetadataModel->get($opposite, 'recoreco_source', 0) === (int) $template_id) {
|
||||||
|
$this->taskLinkModel->remove($link['id']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The first occurrence: respect an explicitly future anchor (the due date the user set) as the
|
||||||
|
* first one; otherwise jump to the next occurrence on/after now.
|
||||||
|
*/
|
||||||
|
private function firstCursor($anchor, $frequency, $lastDay, $now)
|
||||||
|
{
|
||||||
|
if ($anchor >= $now) {
|
||||||
|
return $anchor;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->calculator()->occurrenceFrom($anchor, $frequency, $lastDay, $now, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function setDue($task_id, $cursor)
|
||||||
|
{
|
||||||
|
// Advance the template's due date directly (no task events) + mirror it for edit detection.
|
||||||
|
$this->db->table(TaskModel::TABLE)->eq('id', $task_id)->update(array('date_due' => $cursor));
|
||||||
|
$this->taskMetadataModel->save($task_id, array('recoreco_synced_due' => $cursor));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function spawn(array $template, $targetColumn)
|
||||||
|
{
|
||||||
|
// The template's date_due is already the occurrence (setDue), so duplicate() copies it onto
|
||||||
|
// the clone. duplicate() copies fields + tags + links + subtasks, but NO metadata, so the
|
||||||
|
// clone is not a template.
|
||||||
|
$newId = $this->taskDuplicationModel->duplicate($template['id']);
|
||||||
|
|
||||||
|
if ($newId === false) {
|
||||||
|
$this->logger->error('RecoReco: duplicate failed for task '.$template['id']);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// duplicate() lands the clone in the source column; move it to the chosen target (top).
|
||||||
|
if ($targetColumn > 0 && $targetColumn != $template['column_id']) {
|
||||||
|
$this->taskPositionModel->movePosition($template['project_id'], $newId, $targetColumn, 1, $template['swimlane_id']);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset the "[DUPLICATE]" prefix back to the source title (no events).
|
||||||
|
$this->taskModificationModel->update(array('id' => $newId, 'title' => $template['title']), false);
|
||||||
|
|
||||||
|
// Kanboard's duplicate() adds an "is a duplicate of" task link between the template and the
|
||||||
|
// clone. It is reconciled with the recoreco_link_copies setting by syncCloneLinks() after
|
||||||
|
// the spawn loop (kept when on, removed when off).
|
||||||
|
|
||||||
|
// Mark the clone: white icon + cannot itself be made recurring; record its source template.
|
||||||
|
$this->taskMetadataModel->save($newId, array(
|
||||||
|
'recoreco_clone' => 1,
|
||||||
|
'recoreco_source' => $template['id'],
|
||||||
|
));
|
||||||
|
|
||||||
|
// Signal FinanceBuddy (advance the installment). Harmless no-op if nothing listens.
|
||||||
|
$payload = array('source_task_id' => (int) $template['id'], 'new_task_id' => (int) $newId);
|
||||||
|
$this->hook->reference('recoreco:task:spawned', $payload);
|
||||||
|
|
||||||
|
return $newId;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function calculator()
|
||||||
|
{
|
||||||
|
if ($this->calc === null) {
|
||||||
|
$this->calc = new OccurrenceCalculator();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->calc;
|
||||||
|
}
|
||||||
|
}
|
||||||
40
Plugin.php
40
Plugin.php
@@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Kanboard\Plugin\Skeleton;
|
namespace Kanboard\Plugin\RecoReco;
|
||||||
|
|
||||||
use Kanboard\Core\Plugin\Base;
|
use Kanboard\Core\Plugin\Base;
|
||||||
|
|
||||||
@@ -8,28 +8,40 @@ class Plugin extends Base
|
|||||||
{
|
{
|
||||||
public function initialize()
|
public function initialize()
|
||||||
{
|
{
|
||||||
// 1. Render a visible word at the top of every page (the demo output).
|
// "Recurring schedule" entry in the task Actions sidebar, right after the basic actions
|
||||||
$this->template->hook->attach('template:layout:top', 'skeleton:layout/header');
|
// (next to native "Edit recurrence"). Opens the RecoReco config modal.
|
||||||
|
$this->template->hook->attach('template:task:sidebar:after-basic-actions', 'recoReco:task/sidebar_action');
|
||||||
|
|
||||||
// 2. Load the plugin stylesheet (currently empty -- proves the CSS hook fires).
|
// Modal JS: keep "days before" within one period of the selected frequency.
|
||||||
$this->hook->on('template:layout:css', array(
|
|
||||||
'template' => 'plugins/Skeleton/Asset/css/skeleton.css',
|
|
||||||
));
|
|
||||||
|
|
||||||
// 3. Load the plugin script (currently empty -- proves the JS hook fires).
|
|
||||||
$this->hook->on('template:layout:js', array(
|
$this->hook->on('template:layout:js', array(
|
||||||
'template' => 'plugins/Skeleton/Asset/js/skeleton.js',
|
'template' => 'plugins/RecoReco/Asset/js/recoreco-modal.js',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
// Board card icon: black on a recurring template, white (inverse) on a generated copy.
|
||||||
|
$this->template->hook->attach('template:board:task:icons', 'recoReco:board/task_icon');
|
||||||
|
|
||||||
|
// The scheduling engine runs from the CLI (cron). Registered CLI-only so web requests do
|
||||||
|
// not build the console app.
|
||||||
|
if (php_sapi_name() === 'cli') {
|
||||||
|
$this->container['cli']->add(new \Kanboard\Plugin\RecoReco\Console\RecoRecoCommand($this->container));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getHelpers()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
'Plugin\RecoReco\Helper' => array('RecoRecoHelper'),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getPluginName()
|
public function getPluginName()
|
||||||
{
|
{
|
||||||
return 'Skeleton';
|
return 'RecoReco';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getPluginDescription()
|
public function getPluginDescription()
|
||||||
{
|
{
|
||||||
return t('Reusable skeleton/template for building Kanboard plugins.');
|
return t('Calendar-scheduled recurring cards: a template card spawns a copy on a date (yearly, monthly, weekly, daily), driven by the card due date.');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getPluginAuthor()
|
public function getPluginAuthor()
|
||||||
@@ -39,12 +51,12 @@ class Plugin extends Base
|
|||||||
|
|
||||||
public function getPluginVersion()
|
public function getPluginVersion()
|
||||||
{
|
{
|
||||||
return '0.1.0';
|
return '1.2.0';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getPluginHomepage()
|
public function getPluginHomepage()
|
||||||
{
|
{
|
||||||
return 'https://code.beco.cc/beco/kanboard-plugin-skeleton';
|
return 'https://code.beco.cc/beco/RecoReco';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getCompatibleVersion()
|
public function getCompatibleVersion()
|
||||||
|
|||||||
95
README.md
95
README.md
@@ -1,65 +1,56 @@
|
|||||||
# Skeleton -- a Kanboard plugin template
|
# RecoReco -- calendar-scheduled recurring cards
|
||||||
|
|
||||||
A minimal, working Kanboard plugin that you copy and rename as the starting point for a
|
Kanboard's built-in recurrence is event-triggered (a card recurs when you move or close it).
|
||||||
real plugin. By itself it does only one trivial thing: it renders the word "Skeleton" at
|
RecoReco adds **calendar-triggered** recurrence: a card fires on a date, on its own, via cron --
|
||||||
the top of every page. It changes no data and runs no database migration.
|
made for bills, rent, and subscriptions.
|
||||||
|
|
||||||
## What it demonstrates
|
A card marked recurring **stays** as a template; on schedule, RecoReco spawns a plain
|
||||||
|
(non-recurring) copy into a column you choose. The template advances to the next date; the copy
|
||||||
|
keeps the fired date.
|
||||||
|
|
||||||
- A complete `Plugin.php` registration class with all the metadata Kanboard shows in
|
RecoReco is opt-in per card and inert until you mark a card, so it needs no per-board setting. It
|
||||||
Settings -> Plugins (name, description, author, version, homepage, compatible version).
|
leaves native recurrence untouched (the two are mutually exclusive per card).
|
||||||
- A template hook (`template:layout:top`) that injects a template into the page.
|
|
||||||
- Asset hooks (`template:layout:css` and `template:layout:js`) that load a stylesheet and
|
## The idea
|
||||||
a script. They are empty for now but prove the injection path works -- handy when a real
|
|
||||||
plugin needs custom CSS or JS.
|
- **The due date is the anchor.** All timing (day, month, weekday, time) is read from the card's
|
||||||
- The standard plugin directory layout, with stub folders (`Controller/`, `Model/`,
|
due date -- there are no separate date inputs. A card without a due date cannot be made recurring.
|
||||||
`Schema/`, `Locale/`, `Test/`) ready to grow into.
|
- **Frequencies:** yearly, monthly by day, monthly by weekday, weekly, daily.
|
||||||
|
- **Last day of the month:** an explicit checkbox (honored only when the due date is the last day,
|
||||||
|
or the last such weekday, of its month).
|
||||||
|
- **Lead time:** "create the copy N days before the due date", so the card shows up early enough
|
||||||
|
to act on; the copy is still due on the real day.
|
||||||
|
|
||||||
|
## Scheduling (cron)
|
||||||
|
|
||||||
|
The engine runs from the CLI command `recoreco:run`. Add it to cron **four times a day** -- at
|
||||||
|
05:58, 11:58, 17:58 and 23:58:
|
||||||
|
|
||||||
|
```
|
||||||
|
58 5,11,17,23 * * * cd /path/to/kanboard && php cli recoreco:run >> /var/log/recoreco.log 2>&1
|
||||||
|
```
|
||||||
|
|
||||||
|
(Point the path at your install and run it as the user that owns Kanboard's data.) Each run looks
|
||||||
|
ahead 12 hours; the runs overlap by 6 hours, so a single missed run is covered by the next one, and
|
||||||
|
any occurrence whose time is already past is still caught up. `days before` shifts a copy earlier
|
||||||
|
within that lead. You can also run it by hand any time: `php cli recoreco:run`.
|
||||||
|
|
||||||
|
## Status
|
||||||
|
|
||||||
|
Working for **monthly by day** (with the last-day rule), driven by cron. The remaining frequencies
|
||||||
|
(yearly, weekly, daily, monthly by weekday), the recurrence icons, and the FinanceBuddy
|
||||||
|
installment hand-off arrive in the following versions.
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
- Kanboard >= 1.2.0
|
- Kanboard >= 1.2.0
|
||||||
|
- cron (to run `recoreco:run`)
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
No build step and no dependencies.
|
Copy this folder into your Kanboard installation as `plugins/RecoReco/`. The directory name must be
|
||||||
|
exactly `RecoReco` (Kanboard derives the plugin namespace from the folder name). No build step and
|
||||||
1. Copy this folder into your Kanboard installation as `plugins/Skeleton/`.
|
no database migration. Then add the cron entry above.
|
||||||
2. Reload any page. The word "Skeleton" appears at the top.
|
|
||||||
3. Confirm it under Settings -> Plugins.
|
|
||||||
|
|
||||||
To uninstall, delete `plugins/Skeleton/`. Nothing else is left behind.
|
|
||||||
|
|
||||||
## Directory layout
|
|
||||||
|
|
||||||
```
|
|
||||||
Skeleton/
|
|
||||||
Plugin.php Registration and hook wiring (the only required file).
|
|
||||||
README.md
|
|
||||||
LICENSE AGPL-3.0.
|
|
||||||
Template/
|
|
||||||
layout/header.php The visible "Skeleton" word.
|
|
||||||
Asset/
|
|
||||||
css/skeleton.css Loaded via template:layout:css.
|
|
||||||
js/skeleton.js Loaded via template:layout:js.
|
|
||||||
Controller/ Stub for future request handlers.
|
|
||||||
Model/ Stub for future business logic / DB access.
|
|
||||||
Schema/ Stub for future database migrations.
|
|
||||||
Locale/ Stub for future translations (e.g. pt_BR/, fr_FR/).
|
|
||||||
Test/ Stub for future unit tests.
|
|
||||||
```
|
|
||||||
|
|
||||||
## How to fork this into a new plugin
|
|
||||||
|
|
||||||
1. Copy the folder and rename it, e.g. `plugins/MyPlugin/`. The folder name must match the
|
|
||||||
namespace and start with a capital letter.
|
|
||||||
2. In `Plugin.php`, change the namespace from `Kanboard\Plugin\Skeleton` to
|
|
||||||
`Kanboard\Plugin\MyPlugin`.
|
|
||||||
3. Update the metadata methods (`getPluginName`, `getPluginDescription`, `getPluginAuthor`,
|
|
||||||
`getPluginVersion`, `getPluginHomepage`, `getCompatibleVersion`).
|
|
||||||
4. Update the hook target paths: the lowercase prefix in `'skeleton:layout/header'` and the
|
|
||||||
`plugins/Skeleton/Asset/...` asset paths must match the new plugin name.
|
|
||||||
5. Replace `Template/layout/header.php` with your real template, or attach to a different
|
|
||||||
hook. See the Kanboard plugin hooks documentation for the full list of hook points.
|
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|||||||
10
Template/board/task_icon.php
Normal file
10
Template/board/task_icon.php
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
<?php $type = $this->RecoRecoHelper->iconType($task) ?>
|
||||||
|
<?php if ($type === 'template'): ?>
|
||||||
|
<span title="<?= t('RecoReco: recurring template') ?>">
|
||||||
|
<i class="fa fa-refresh fa-rotate-90" role="img" aria-label="<?= t('RecoReco: recurring template') ?>"></i>
|
||||||
|
</span>
|
||||||
|
<?php elseif ($type === 'clone'): ?>
|
||||||
|
<span title="<?= t('RecoReco: generated copy') ?>">
|
||||||
|
<i class="fa fa-refresh fa-rotate-90 fa-inverse" role="img" aria-label="<?= t('RecoReco: generated copy') ?>"></i>
|
||||||
|
</span>
|
||||||
|
<?php endif ?>
|
||||||
@@ -1 +0,0 @@
|
|||||||
<div class="skeleton-plugin-marker">Skeleton</div>
|
|
||||||
68
Template/recurrence/edit.php
Normal file
68
Template/recurrence/edit.php
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
<div class="page-header">
|
||||||
|
<h2>
|
||||||
|
<?= t('Recurring schedule') ?>
|
||||||
|
<?php if ($has_due_date): ?>
|
||||||
|
<small>(<?= $this->url->link(date('Y-m-d H:i', $task['date_due']), 'TaskModificationController', 'edit', array('task_id' => $task['id']), false, 'js-modal-large') ?>)</small>
|
||||||
|
<?php else: ?>
|
||||||
|
<small>-- <?= $this->url->link(t('set a due date'), 'TaskModificationController', 'edit', array('task_id' => $task['id']), false, 'js-modal-large') ?></small>
|
||||||
|
<?php endif ?>
|
||||||
|
</h2>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<?php if ($is_clone): ?>
|
||||||
|
|
||||||
|
<p class="alert alert-info">
|
||||||
|
<?= t('This card is a copy generated by RecoReco, so it cannot itself be made recurring.') ?>
|
||||||
|
<?php if ($source_id): ?>
|
||||||
|
<?= $this->url->link(t('Open the recurring template'), 'TaskViewController', 'show', array('task_id' => $source_id)) ?>
|
||||||
|
<?php endif ?>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<?php else: ?>
|
||||||
|
|
||||||
|
<?php $can_recur = $has_due_date && ! $is_native && $has_target ?>
|
||||||
|
|
||||||
|
<?php if (! $has_due_date): ?>
|
||||||
|
<p class="alert alert-info"><?= t('Please set a due date first. RecoReco uses the card due date as the recurrence anchor.') ?></p>
|
||||||
|
<?php elseif ($is_native): ?>
|
||||||
|
<p class="alert alert-info">
|
||||||
|
<?= t('This card uses Kanboard built-in recurrence.') ?>
|
||||||
|
<?= $this->url->link(t('Edit built-in recurrence'), 'TaskRecurrenceController', 'edit', array('task_id' => $task['id']), false, 'js-modal-medium') ?>
|
||||||
|
</p>
|
||||||
|
<?php elseif (! $has_target): ?>
|
||||||
|
<p class="alert alert-info"><?= t('Add a target column first.') ?></p>
|
||||||
|
<?php endif ?>
|
||||||
|
|
||||||
|
<form method="post" action="<?= $this->url->href('RecurrenceController', 'save', array('plugin' => 'RecoReco', 'task_id' => $task['id'])) ?>" autocomplete="off">
|
||||||
|
<?= $this->form->csrf() ?>
|
||||||
|
|
||||||
|
<?= $this->form->label(t('Make recurring'), 'recoreco_enabled') ?>
|
||||||
|
<div class="recoreco-radios">
|
||||||
|
<label style="display:inline-block; margin-right:16px;">
|
||||||
|
<input type="radio" name="recoreco_enabled" value="0" <?= $values['recoreco_enabled'] == 1 ? '' : 'checked="checked"' ?>> <?= t('No') ?>
|
||||||
|
</label>
|
||||||
|
<label style="display:inline-block; margin-right:16px;">
|
||||||
|
<input type="radio" name="recoreco_enabled" value="1" <?= $values['recoreco_enabled'] == 1 ? 'checked="checked"' : '' ?> <?= $can_recur ? '' : 'disabled="disabled"' ?>> <?= t('Yes') ?>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<?= $this->form->label(t('Target column (where the copy appears)'), 'recoreco_target_column') ?>
|
||||||
|
<?= $this->form->select('recoreco_target_column', $columns_list, $values) ?>
|
||||||
|
|
||||||
|
<?= $this->form->label(t('Frequency'), 'recoreco_frequency') ?>
|
||||||
|
<?= $this->form->select('recoreco_frequency', $frequency_list, $values) ?>
|
||||||
|
|
||||||
|
<div class="recoreco-lastday">
|
||||||
|
<?= $this->form->checkbox('recoreco_last_day', t('Fires on last day/weekday of the month'), 1, $values['recoreco_last_day'] == 1) ?>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<?= $this->form->label(t('Create the copy this many days before the due date'), 'recoreco_days_before') ?>
|
||||||
|
<input type="number" name="recoreco_days_before" min="0" value="<?= $this->text->e($values['recoreco_days_before']) ?>">
|
||||||
|
|
||||||
|
<?= $this->form->checkbox('recoreco_link_copies', t('Link copies to the template'), 1, $values['recoreco_link_copies'] == 1) ?>
|
||||||
|
<p class="form-help"><?= t('Links each copy back to the template (a count and quick navigation). Off by default.') ?></p>
|
||||||
|
|
||||||
|
<?= $this->modal->submitButtons() ?>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<?php endif ?>
|
||||||
3
Template/task/sidebar_action.php
Normal file
3
Template/task/sidebar_action.php
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
<li>
|
||||||
|
<?= $this->modal->medium('calendar', t('Recurring schedule'), 'RecurrenceController', 'edit', array('plugin' => 'RecoReco', 'task_id' => $task['id'])) ?>
|
||||||
|
</li>
|
||||||
165
Test/OccurrenceCalculatorTest.php
Normal file
165
Test/OccurrenceCalculatorTest.php
Normal file
@@ -0,0 +1,165 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Standalone test for the RecoReco date math -- no Kanboard / PHPUnit harness needed.
|
||||||
|
* Run with: php Test/OccurrenceCalculatorTest.php
|
||||||
|
*
|
||||||
|
* OccurrenceCalculator is pure, so this exercises the highest-risk correctness surface (month
|
||||||
|
* lengths, leap years, the last-day rule, the drift-free clamp).
|
||||||
|
*/
|
||||||
|
|
||||||
|
require __DIR__.'/../Model/OccurrenceCalculator.php';
|
||||||
|
|
||||||
|
use Kanboard\Plugin\RecoReco\Model\OccurrenceCalculator;
|
||||||
|
|
||||||
|
date_default_timezone_set('UTC');
|
||||||
|
|
||||||
|
$calc = new OccurrenceCalculator();
|
||||||
|
$failures = 0;
|
||||||
|
|
||||||
|
function ts($str)
|
||||||
|
{
|
||||||
|
return strtotime($str.' UTC');
|
||||||
|
}
|
||||||
|
|
||||||
|
function check($label, $got, $expected, &$failures)
|
||||||
|
{
|
||||||
|
$ok = $got === $expected;
|
||||||
|
$g = $got === null ? 'null' : date('Y-m-d H:i', $got);
|
||||||
|
$e = $expected === null ? 'null' : date('Y-m-d H:i', $expected);
|
||||||
|
echo ($ok ? 'PASS' : 'FAIL').' '.$label.' got='.$g.' expected='.$e."\n";
|
||||||
|
if (! $ok) {
|
||||||
|
$failures++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1. Plain day-of-month: the 15th, every month.
|
||||||
|
check(
|
||||||
|
'monthly 15th, next after Jan 20',
|
||||||
|
$calc->occurrenceFrom(ts('2023-01-15 10:30'), 'monthly_day', false, ts('2023-01-20 00:00'), false),
|
||||||
|
ts('2023-02-15 10:30'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
|
||||||
|
// 2. Drift-free clamp: the 30th -> Feb clamps to 28 -> back to 30 in March (NOT 28).
|
||||||
|
check(
|
||||||
|
'30th -> Feb (non-leap) clamps to 28',
|
||||||
|
$calc->occurrenceFrom(ts('2023-01-30 09:00'), 'monthly_day', false, ts('2023-01-30 09:00'), false),
|
||||||
|
ts('2023-02-28 09:00'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
check(
|
||||||
|
'30th -> March returns to 30 (no drift)',
|
||||||
|
$calc->occurrenceFrom(ts('2023-01-30 09:00'), 'monthly_day', false, ts('2023-02-28 09:00'), false),
|
||||||
|
ts('2023-03-30 09:00'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
|
||||||
|
// 3. Last-day rule: last day of each month.
|
||||||
|
check(
|
||||||
|
'last-day: Jan 31 -> Feb 28 (non-leap)',
|
||||||
|
$calc->occurrenceFrom(ts('2023-01-31 08:00'), 'monthly_day', true, ts('2023-01-31 08:00'), false),
|
||||||
|
ts('2023-02-28 08:00'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
check(
|
||||||
|
'last-day: Feb -> March 31',
|
||||||
|
$calc->occurrenceFrom(ts('2023-01-31 08:00'), 'monthly_day', true, ts('2023-02-28 08:00'), false),
|
||||||
|
ts('2023-03-31 08:00'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
|
||||||
|
// 4. Leap year: last day of Feb 2024 is the 29th.
|
||||||
|
check(
|
||||||
|
'last-day: Feb 2024 -> 29th (leap)',
|
||||||
|
$calc->occurrenceFrom(ts('2024-01-31 08:00'), 'monthly_day', true, ts('2024-02-01 00:00'), false),
|
||||||
|
ts('2024-02-29 08:00'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
|
||||||
|
// 5. Inclusive vs exclusive at an exact occurrence.
|
||||||
|
check(
|
||||||
|
'inclusive returns the same instant',
|
||||||
|
$calc->occurrenceFrom(ts('2023-03-10 12:00'), 'monthly_day', false, ts('2023-03-10 12:00'), true),
|
||||||
|
ts('2023-03-10 12:00'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
check(
|
||||||
|
'exclusive skips to next month',
|
||||||
|
$calc->occurrenceFrom(ts('2023-03-10 12:00'), 'monthly_day', false, ts('2023-03-10 12:00'), false),
|
||||||
|
ts('2023-04-10 12:00'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
|
||||||
|
// 6. Daily: same time every day.
|
||||||
|
check(
|
||||||
|
'daily -> next day same time',
|
||||||
|
$calc->occurrenceFrom(ts('2023-03-10 09:30'), 'daily', false, ts('2023-03-10 12:00'), false),
|
||||||
|
ts('2023-03-11 09:30'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
|
||||||
|
// 7. Weekly: same weekday every 7 days (2023-03-07 is a Tuesday).
|
||||||
|
check(
|
||||||
|
'weekly -> +7 days on the same weekday',
|
||||||
|
$calc->occurrenceFrom(ts('2023-03-07 08:00'), 'weekly', false, ts('2023-03-07 08:00'), false),
|
||||||
|
ts('2023-03-14 08:00'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
|
||||||
|
// 8. Monthly by weekday: 2nd Tuesday (2023-03-14) -> 2nd Tuesday of April (2023-04-11).
|
||||||
|
check(
|
||||||
|
'monthly-by-weekday: 2nd Tuesday -> next month 2nd Tuesday',
|
||||||
|
$calc->occurrenceFrom(ts('2023-03-14 07:00'), 'monthly_dow', false, ts('2023-03-14 07:00'), false),
|
||||||
|
ts('2023-04-11 07:00'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
|
||||||
|
// 9. Monthly by weekday, last: last Tuesday of March (2023-03-28) -> last Tuesday of April (04-25).
|
||||||
|
check(
|
||||||
|
'monthly-by-weekday last: last Tue -> next month last Tue',
|
||||||
|
$calc->occurrenceFrom(ts('2023-03-28 07:00'), 'monthly_dow', true, ts('2023-03-28 07:00'), false),
|
||||||
|
ts('2023-04-25 07:00'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
|
||||||
|
// 10. Yearly: same month/day next year.
|
||||||
|
check(
|
||||||
|
'yearly -> next year same date',
|
||||||
|
$calc->occurrenceFrom(ts('2023-03-15 10:00'), 'yearly', false, ts('2023-03-15 10:00'), false),
|
||||||
|
ts('2024-03-15 10:00'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
|
||||||
|
// 11. Yearly last-day on Feb 29 (leap) -> next year Feb 28.
|
||||||
|
check(
|
||||||
|
'yearly last-day: 2024-02-29 -> 2025-02-28',
|
||||||
|
$calc->occurrenceFrom(ts('2024-02-29 08:00'), 'yearly', true, ts('2024-02-29 08:00'), false),
|
||||||
|
ts('2025-02-28 08:00'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
|
||||||
|
// 12. Yearly numeric Feb 29 -> clamps to 28 in a non-leap year, back to 29 in the next leap year.
|
||||||
|
check(
|
||||||
|
'yearly numeric 29-Feb -> 2025 clamps to 28',
|
||||||
|
$calc->occurrenceFrom(ts('2024-02-29 08:00'), 'yearly', false, ts('2024-02-29 08:00'), false),
|
||||||
|
ts('2025-02-28 08:00'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
check(
|
||||||
|
'yearly numeric 29-Feb -> 2028 back to 29 (leap)',
|
||||||
|
$calc->occurrenceFrom(ts('2024-02-29 08:00'), 'yearly', false, ts('2027-03-01 00:00'), false),
|
||||||
|
ts('2028-02-29 08:00'),
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
|
||||||
|
// 13. Unknown frequency returns null.
|
||||||
|
check(
|
||||||
|
'unknown frequency -> null',
|
||||||
|
$calc->occurrenceFrom(ts('2023-03-10 12:00'), 'nope', false, ts('2023-03-10 12:00'), false),
|
||||||
|
null,
|
||||||
|
$failures
|
||||||
|
);
|
||||||
|
|
||||||
|
echo "\n".($failures === 0 ? 'ALL PASSED' : $failures.' FAILURE(S)')."\n";
|
||||||
|
exit($failures === 0 ? 0 : 1);
|
||||||
Reference in New Issue
Block a user