Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b63d366296 | |||
| 89888235d1 | |||
| 4ebebd5ffb | |||
| 9b637160b2 | |||
| e85d5d71f9 | |||
| ce3205646f | |||
| 4ce18d9e5f | |||
| 4d7f88aa94 | |||
| bc266ff969 | |||
| 8a97c5cb94 | |||
| d1178bc463 | |||
| c747d33491 | |||
| 850127e712 | |||
| 70f42352b0 | |||
| d57544ebfd | |||
| c3896e1962 | |||
| 065825269e | |||
| 6726dfa456 |
@@ -13,7 +13,7 @@
|
|||||||
(function () {
|
(function () {
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
var THRESHOLD = 100; // ms; a press on a card held longer than this is a drag, not a click
|
var THRESHOLD = 120; // ms; a press on a card held longer than this is a drag, not a click
|
||||||
var pressStart = 0;
|
var pressStart = 0;
|
||||||
|
|
||||||
function onDown(e) {
|
function onDown(e) {
|
||||||
|
|||||||
@@ -18,24 +18,35 @@
|
|||||||
var group = document.createElement("span");
|
var group = document.createElement("span");
|
||||||
group.className = "ot-recurrence-status";
|
group.className = "ot-recurrence-status";
|
||||||
|
|
||||||
|
var radios = [];
|
||||||
|
|
||||||
for (var i = 0; i < select.options.length; i++) {
|
for (var i = 0; i < select.options.length; i++) {
|
||||||
var opt = select.options[i];
|
var opt = select.options[i];
|
||||||
|
|
||||||
var label = document.createElement("label");
|
var label = document.createElement("label");
|
||||||
|
// Kanboard styles form labels as display:block; force inline so Yes/No sit
|
||||||
|
// side by side instead of stacked.
|
||||||
|
label.style.display = "inline-block";
|
||||||
label.style.marginRight = "14px";
|
label.style.marginRight = "14px";
|
||||||
label.style.cursor = "pointer";
|
label.style.cursor = "pointer";
|
||||||
|
|
||||||
var radio = document.createElement("input");
|
var radio = document.createElement("input");
|
||||||
radio.type = "radio";
|
radio.type = "radio";
|
||||||
radio.name = "ot-recurrence-status";
|
// No name attribute on purpose: a named radio would be SUBMITTED with the form,
|
||||||
|
// and Kanboard rejects the extra key ("invalid identifier"). These are display
|
||||||
|
// only -- the hidden <select> carries the value -- so we enforce the mutual
|
||||||
|
// exclusivity ourselves.
|
||||||
radio.value = opt.value;
|
radio.value = opt.value;
|
||||||
radio.checked = opt.value === select.value;
|
radio.checked = opt.value === select.value;
|
||||||
radio.style.marginRight = "4px";
|
radio.style.marginRight = "4px";
|
||||||
|
radios.push(radio);
|
||||||
|
|
||||||
radio.addEventListener("change", function () {
|
radio.addEventListener("change", function () {
|
||||||
if (this.checked) {
|
for (var k = 0; k < radios.length; k++) {
|
||||||
|
radios[k].checked = (radios[k] === this);
|
||||||
|
}
|
||||||
select.value = this.value;
|
select.value = this.value;
|
||||||
select.dispatchEvent(new Event("change", { bubbles: true }));
|
select.dispatchEvent(new Event("change", { bubbles: true }));
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
label.appendChild(radio);
|
label.appendChild(radio);
|
||||||
|
|||||||
@@ -18,6 +18,10 @@ class ConfigController extends BaseController
|
|||||||
'organon_tweaks_keep_scroll' => (int) $this->configModel->get('organon_tweaks_keep_scroll', 1),
|
'organon_tweaks_keep_scroll' => (int) $this->configModel->get('organon_tweaks_keep_scroll', 1),
|
||||||
'organon_tweaks_quick_click_only' => (int) $this->configModel->get('organon_tweaks_quick_click_only', 1),
|
'organon_tweaks_quick_click_only' => (int) $this->configModel->get('organon_tweaks_quick_click_only', 1),
|
||||||
'organon_tweaks_enhance_recurrence' => (int) $this->configModel->get('organon_tweaks_enhance_recurrence', 1),
|
'organon_tweaks_enhance_recurrence' => (int) $this->configModel->get('organon_tweaks_enhance_recurrence', 1),
|
||||||
|
'organon_tweaks_emphasize_duedate_default' => (int) $this->configModel->get('organon_tweaks_emphasize_duedate_default', 0),
|
||||||
|
'organon_tweaks_show_all_filter' => (int) $this->configModel->get('organon_tweaks_show_all_filter', 1),
|
||||||
|
'organon_tweaks_month_filters' => (int) $this->configModel->get('organon_tweaks_month_filters', 1),
|
||||||
|
'organon_tweaks_recurring_filters' => (int) $this->configModel->get('organon_tweaks_recurring_filters', 1),
|
||||||
),
|
),
|
||||||
'errors' => array(),
|
'errors' => array(),
|
||||||
)));
|
)));
|
||||||
@@ -30,17 +34,49 @@ class ConfigController extends BaseController
|
|||||||
$alwaysCommentIcon = isset($values['organon_tweaks_always_comment_icon']) ? 1 : 0;
|
$alwaysCommentIcon = isset($values['organon_tweaks_always_comment_icon']) ? 1 : 0;
|
||||||
$keepScroll = isset($values['organon_tweaks_keep_scroll']) ? 1 : 0;
|
$keepScroll = isset($values['organon_tweaks_keep_scroll']) ? 1 : 0;
|
||||||
$quickClickOnly = isset($values['organon_tweaks_quick_click_only']) ? 1 : 0;
|
$quickClickOnly = isset($values['organon_tweaks_quick_click_only']) ? 1 : 0;
|
||||||
|
$enhanceRecurrence = isset($values['organon_tweaks_enhance_recurrence']) ? 1 : 0;
|
||||||
|
$emphasizeDueDateDefault = isset($values['organon_tweaks_emphasize_duedate_default']) ? 1 : 0;
|
||||||
|
$showAllFilter = isset($values['organon_tweaks_show_all_filter']) ? 1 : 0;
|
||||||
|
$monthFilters = isset($values['organon_tweaks_month_filters']) ? 1 : 0;
|
||||||
|
$recurringFilters = isset($values['organon_tweaks_recurring_filters']) ? 1 : 0;
|
||||||
|
|
||||||
if ($this->configModel->save(array(
|
if ($this->configModel->save(array(
|
||||||
'organon_tweaks_always_comment_icon' => $alwaysCommentIcon,
|
'organon_tweaks_always_comment_icon' => $alwaysCommentIcon,
|
||||||
'organon_tweaks_keep_scroll' => $keepScroll,
|
'organon_tweaks_keep_scroll' => $keepScroll,
|
||||||
'organon_tweaks_quick_click_only' => $quickClickOnly,
|
'organon_tweaks_quick_click_only' => $quickClickOnly,
|
||||||
|
'organon_tweaks_enhance_recurrence' => $enhanceRecurrence,
|
||||||
|
'organon_tweaks_emphasize_duedate_default' => $emphasizeDueDateDefault,
|
||||||
|
'organon_tweaks_show_all_filter' => $showAllFilter,
|
||||||
|
'organon_tweaks_month_filters' => $monthFilters,
|
||||||
|
'organon_tweaks_recurring_filters' => $recurringFilters,
|
||||||
))) {
|
))) {
|
||||||
$this->flash->success(t('Settings saved successfully.'));
|
$this->flash->success(t('Settings saved successfully.'));
|
||||||
} else {
|
} else {
|
||||||
$this->flash->failure(t('Unable to save your settings.'));
|
$this->flash->failure(t('Unable to save your settings.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Apply each filter-group toggle across all boards immediately: on -> (re)create the group's
|
||||||
|
// reserved-name filters everywhere, off -> remove them (they are plugin-managed).
|
||||||
|
$projectHelper = new \Kanboard\Plugin\OrganonTweaks\Helper\OrganonProjectHelper($this->container);
|
||||||
|
|
||||||
|
if ($showAllFilter === 1) {
|
||||||
|
$projectHelper->addGroupToAllProjects($projectHelper::GROUP_SHOW_ALL);
|
||||||
|
} else {
|
||||||
|
$projectHelper->removeGroup($projectHelper::GROUP_SHOW_ALL);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($monthFilters === 1) {
|
||||||
|
$projectHelper->addGroupToAllProjects($projectHelper::GROUP_MONTH);
|
||||||
|
} else {
|
||||||
|
$projectHelper->removeGroup($projectHelper::GROUP_MONTH);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($recurringFilters === 1) {
|
||||||
|
$projectHelper->addGroupToAllProjects($projectHelper::GROUP_RECURRING);
|
||||||
|
} else {
|
||||||
|
$projectHelper->removeGroup($projectHelper::GROUP_RECURRING);
|
||||||
|
}
|
||||||
|
|
||||||
$this->response->redirect($this->helper->url->to('ConfigController', 'show', array('plugin' => 'OrganonTweaks')));
|
$this->response->redirect($this->helper->url->to('ConfigController', 'show', array('plugin' => 'OrganonTweaks')));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
92
Filter/TaskMonthRangeFilter.php
Normal file
92
Filter/TaskMonthRangeFilter.php
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Kanboard\Plugin\OrganonTweaks\Filter;
|
||||||
|
|
||||||
|
use Kanboard\Core\Filter\FilterInterface;
|
||||||
|
use Kanboard\Filter\BaseFilter;
|
||||||
|
use Kanboard\Model\TaskModel;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Filter tasks by a whole calendar month, optionally padded.
|
||||||
|
*
|
||||||
|
* Registered twice by the plugin (via $container->extend('taskLexer', ...)):
|
||||||
|
* - `duemonth:VALUE` -- padDays 0: due within the target month.
|
||||||
|
* - `aroundmonth:VALUE` -- padDays 10: the month minus 10 days .. plus 10 days (i.e. the last
|
||||||
|
* 10 days of the previous month, the whole month, and the first 10 days of the next month).
|
||||||
|
*
|
||||||
|
* VALUE is `this` (also `next` / `last`) or an explicit month such as `2026-01` or `january-2026`
|
||||||
|
* (anything strtotime() can parse). Bounds are computed with mktime (correct for any month length)
|
||||||
|
* at search time, so the filter auto-rolls.
|
||||||
|
*
|
||||||
|
* Both bounds (gte start, lte end) are added inside this single apply() on the single-value path,
|
||||||
|
* so they AND -- the range Kanboard's saved-filter string syntax cannot express (repeating the
|
||||||
|
* same attribute ORs via OrCriteria, and there is no AND keyword).
|
||||||
|
*/
|
||||||
|
class TaskMonthRangeFilter extends BaseFilter implements FilterInterface
|
||||||
|
{
|
||||||
|
private $attribute = 'duemonth';
|
||||||
|
private $padDays = 0;
|
||||||
|
|
||||||
|
public function setAttribute($attribute)
|
||||||
|
{
|
||||||
|
$this->attribute = $attribute;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setPadDays($days)
|
||||||
|
{
|
||||||
|
$this->padDays = (int) $days;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getAttributes()
|
||||||
|
{
|
||||||
|
return array($this->attribute);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function apply()
|
||||||
|
{
|
||||||
|
$reference = $this->resolveMonthTimestamp((string) $this->value);
|
||||||
|
|
||||||
|
if ($reference === false) {
|
||||||
|
return $this; // unknown/typo value -> no-op (matches nothing added)
|
||||||
|
}
|
||||||
|
|
||||||
|
$month = (int) date('n', $reference);
|
||||||
|
$year = (int) date('Y', $reference);
|
||||||
|
$first = mktime(0, 0, 0, $month, 1, $year);
|
||||||
|
$last = mktime(23, 59, 59, $month + 1, 0, $year); // day 0 of next month = last day of this
|
||||||
|
$pad = $this->padDays * 86400;
|
||||||
|
|
||||||
|
$this->query->neq(TaskModel::TABLE.'.date_due', 0);
|
||||||
|
$this->query->gte(TaskModel::TABLE.'.date_due', $first - $pad);
|
||||||
|
$this->query->lte(TaskModel::TABLE.'.date_due', $last + $pad);
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolve the filter value to any timestamp inside the target month (or false if unparseable).
|
||||||
|
*
|
||||||
|
* @param string $value
|
||||||
|
* @return int|false
|
||||||
|
*/
|
||||||
|
private function resolveMonthTimestamp($value)
|
||||||
|
{
|
||||||
|
$value = strtolower(trim($value));
|
||||||
|
|
||||||
|
if ($value === '' || $value === 'this') {
|
||||||
|
return strtotime('first day of this month');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($value === 'next') {
|
||||||
|
return strtotime('first day of next month');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($value === 'last' || $value === 'prev' || $value === 'previous') {
|
||||||
|
return strtotime('first day of last month');
|
||||||
|
}
|
||||||
|
|
||||||
|
return strtotime($value); // 2026-01, january-2026, "last day of january 2026", ...
|
||||||
|
}
|
||||||
|
}
|
||||||
100
Filter/TaskRecurringFilter.php
Normal file
100
Filter/TaskRecurringFilter.php
Normal file
@@ -0,0 +1,100 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Kanboard\Plugin\OrganonTweaks\Filter;
|
||||||
|
|
||||||
|
use Kanboard\Core\Filter\FilterInterface;
|
||||||
|
use Kanboard\Filter\BaseFilter;
|
||||||
|
use Kanboard\Model\TaskModel;
|
||||||
|
use PicoDb\Database;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Filter tasks by recurrence: `recurring:XY`, one attribute with one composite value so it can
|
||||||
|
* INTERSECT the two axes (stacking two values of the same attribute would only OR them).
|
||||||
|
*
|
||||||
|
* X = system : evt (event-triggered = Kanboard native) | cal (calendar = RecoReco) | any
|
||||||
|
* Y = role : ori (original/template) | dup (duplicate/copy) | all
|
||||||
|
*
|
||||||
|
* Conditions are authoritative -- taken straight from how core classifies these cards:
|
||||||
|
* - evtori = recurrence_status PENDING, evtdup = recurrence_status PROCESSED. This is exactly how
|
||||||
|
* core colors the board refresh icon (app/Template/board/task_footer.php: normal icon = PENDING,
|
||||||
|
* fa-inverse = PROCESSED), so the filter matches what the board shows.
|
||||||
|
* - calori = RecoReco metadata recoreco_enabled=1, caldup = recoreco_clone=1.
|
||||||
|
* - *all / any* = the OR-unions of the above.
|
||||||
|
*
|
||||||
|
* Cross-plugin: the calendar side reads RecoReco metadata keys. If RecoReco is not installed the
|
||||||
|
* metadata sets are empty, so `cal*` matches nothing and `evt*` still works (event-only degrade).
|
||||||
|
*
|
||||||
|
* One attribute + one value -> single-value path, so the predicates below are grouped in a scoped
|
||||||
|
* beginOr/closeOr and the whole group still ANDs with any other search attribute.
|
||||||
|
*/
|
||||||
|
class TaskRecurringFilter extends BaseFilter implements FilterInterface
|
||||||
|
{
|
||||||
|
private $db;
|
||||||
|
|
||||||
|
public function setDatabase(Database $db)
|
||||||
|
{
|
||||||
|
$this->db = $db;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getAttributes()
|
||||||
|
{
|
||||||
|
return array('recurring');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function apply()
|
||||||
|
{
|
||||||
|
$value = strtolower(trim((string) $this->value));
|
||||||
|
$system = substr($value, 0, 3); // evt | cal | any
|
||||||
|
$role = substr($value, 3, 3); // ori | dup | all
|
||||||
|
|
||||||
|
if (! in_array($system, array('evt', 'cal', 'any'), true) ||
|
||||||
|
! in_array($role, array('ori', 'dup', 'all'), true)) {
|
||||||
|
return $this; // unknown/typo value -> no-op
|
||||||
|
}
|
||||||
|
|
||||||
|
$wantEvt = $system === 'evt' || $system === 'any';
|
||||||
|
$wantCal = $system === 'cal' || $system === 'any';
|
||||||
|
$wantOri = $role === 'ori' || $role === 'all';
|
||||||
|
$wantDup = $role === 'dup' || $role === 'all';
|
||||||
|
|
||||||
|
$this->query->beginOr();
|
||||||
|
|
||||||
|
if ($wantEvt && $wantOri) {
|
||||||
|
$this->query->eq(TaskModel::TABLE.'.recurrence_status', TaskModel::RECURRING_STATUS_PENDING);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($wantEvt && $wantDup) {
|
||||||
|
$this->query->eq(TaskModel::TABLE.'.recurrence_status', TaskModel::RECURRING_STATUS_PROCESSED);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($wantCal && $wantOri) {
|
||||||
|
$this->query->in(TaskModel::TABLE.'.id', $this->metaIds('recoreco_enabled'));
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($wantCal && $wantDup) {
|
||||||
|
$this->query->in(TaskModel::TABLE.'.id', $this->metaIds('recoreco_clone'));
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->query->closeOr();
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Task ids carrying a RecoReco metadata flag set to 1. Returns a non-matching sentinel when the
|
||||||
|
* set is empty so the IN clause matches nothing (RecoReco absent -> event-only degrade).
|
||||||
|
*
|
||||||
|
* @param string $name
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
private function metaIds($name)
|
||||||
|
{
|
||||||
|
$ids = $this->db->table('task_has_metadata')
|
||||||
|
->eq('name', $name)
|
||||||
|
->eq('value', '1')
|
||||||
|
->findAllByColumn('task_id');
|
||||||
|
|
||||||
|
return ! empty($ids) ? $ids : array(-1);
|
||||||
|
}
|
||||||
|
}
|
||||||
189
Helper/OrganonProjectHelper.php
Normal file
189
Helper/OrganonProjectHelper.php
Normal file
@@ -0,0 +1,189 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Kanboard\Plugin\OrganonTweaks\Helper;
|
||||||
|
|
||||||
|
use Kanboard\Core\Base;
|
||||||
|
use Kanboard\Model\CustomFilterModel;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Per-board helper for OrganonTweaks.
|
||||||
|
*
|
||||||
|
* Resolves the 3-state "emphasize due date" setting for the CURRENT board (read from the route
|
||||||
|
* project_id, which the router populates for pretty URLs before the layout renders):
|
||||||
|
* per-board 'on' -> on, 'off' -> off, 'default'/absent -> follow the LIVE global default.
|
||||||
|
*
|
||||||
|
* The stored values are the non-falsy strings 'on'/'off' (not '1'/'0'): Kanboard's
|
||||||
|
* MetadataModel::get() uses `?:`, and PHP treats the string "0" as falsy, so a stored "0" would
|
||||||
|
* come back as the 'default' fallback and "Always off" would never be honored.
|
||||||
|
*
|
||||||
|
* Also maintains shared, reserved-name custom filters on every board (v1.5 "Show all tasks", v1.6
|
||||||
|
* "Due this month" / "Around this month"), each group gated by its own config toggle.
|
||||||
|
*/
|
||||||
|
class OrganonProjectHelper extends Base
|
||||||
|
{
|
||||||
|
const EMPHASIZE_KEY = 'organon_tweaks_emphasize_duedate';
|
||||||
|
const EMPHASIZE_DEFAULT_KEY = 'organon_tweaks_emphasize_duedate_default';
|
||||||
|
|
||||||
|
// Config toggles for the auto-managed custom-filter groups.
|
||||||
|
const SHOW_ALL_FILTER_KEY = 'organon_tweaks_show_all_filter';
|
||||||
|
const MONTH_FILTERS_KEY = 'organon_tweaks_month_filters';
|
||||||
|
const RECURRING_FILTERS_KEY = 'organon_tweaks_recurring_filters';
|
||||||
|
|
||||||
|
// Reserved custom-filter groups: each row is [name, query, append]. The NAME is reserved by the
|
||||||
|
// plugin (fixed, non-translated strings so dedup is stable across locales); a user's own filter
|
||||||
|
// with a reserved name is absorbed into the canonical form. "Show all tasks" is a REPLACE filter
|
||||||
|
// (append 0) so it clears; the rest are APPEND (1) so clicks stack (distinct attributes AND).
|
||||||
|
// Names are prefixed by group so the dropdown -- which core sorts alphabetically by name
|
||||||
|
// (CustomFilterModel::getAll -> asc(name)) -- clusters them: Board < Month < Recurring.
|
||||||
|
const GROUP_SHOW_ALL = array(
|
||||||
|
array('Board: show all tasks', '', 0),
|
||||||
|
);
|
||||||
|
const GROUP_MONTH = array(
|
||||||
|
array('Month: due this month', 'duemonth:this', 1),
|
||||||
|
array('Month: around this month', 'aroundmonth:this', 1),
|
||||||
|
);
|
||||||
|
const GROUP_RECURRING = array(
|
||||||
|
array('Recurring: all', 'recurring:anyall', 1),
|
||||||
|
array('Recurring: event', 'recurring:evtall', 1),
|
||||||
|
array('Recurring: calendar', 'recurring:calall', 1),
|
||||||
|
array('Recurring: templates', 'recurring:anyori', 1),
|
||||||
|
array('Recurring: duplicates', 'recurring:anydup', 1),
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Should the current board emphasize the due date? Board pages only (project_id in the route).
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function isEmphasizeDueDate()
|
||||||
|
{
|
||||||
|
$project_id = $this->request->getIntegerParam('project_id');
|
||||||
|
|
||||||
|
if ($project_id <= 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$value = $this->projectMetadataModel->get($project_id, self::EMPHASIZE_KEY, 'default');
|
||||||
|
|
||||||
|
if ($value === 'on') {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($value === 'off') {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 'default' (or absent) -> follow the live global default.
|
||||||
|
return (int) $this->configModel->get(self::EMPHASIZE_DEFAULT_KEY, 0) === 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ensure one canonical reserved custom filter on a board (shared). Idempotent: create when
|
||||||
|
* absent, force a same-named one back to the canonical form (query + shared + append) since the
|
||||||
|
* name is reserved, and drop duplicates. No-op without a real project and a real owner
|
||||||
|
* (custom_filters.user_id has a FK to users, so a system id like 0 would fail the insert).
|
||||||
|
*
|
||||||
|
* @param int $project_id
|
||||||
|
* @param string $name
|
||||||
|
* @param string $query
|
||||||
|
* @param int $append
|
||||||
|
*/
|
||||||
|
public function ensureReservedFilter($project_id, $name, $query, $append)
|
||||||
|
{
|
||||||
|
$project_id = (int) $project_id;
|
||||||
|
$user_id = (int) $this->userSession->getId();
|
||||||
|
|
||||||
|
if ($project_id <= 0 || $user_id <= 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$append = $append ? 1 : 0;
|
||||||
|
|
||||||
|
$existing = $this->db->table(CustomFilterModel::TABLE)
|
||||||
|
->eq('project_id', $project_id)
|
||||||
|
->eq('name', $name)
|
||||||
|
->findAll();
|
||||||
|
|
||||||
|
if (empty($existing)) {
|
||||||
|
$this->db->table(CustomFilterModel::TABLE)->insert(array(
|
||||||
|
'filter' => $query,
|
||||||
|
'project_id' => $project_id,
|
||||||
|
'user_id' => $user_id,
|
||||||
|
'name' => $name,
|
||||||
|
'is_shared' => 1,
|
||||||
|
'append' => $append,
|
||||||
|
));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reserved name: keep one, force it to the canonical form, drop the rest.
|
||||||
|
$keep = array_shift($existing);
|
||||||
|
|
||||||
|
if ($keep['filter'] !== $query || (int) $keep['is_shared'] !== 1 || (int) $keep['append'] !== $append) {
|
||||||
|
$this->db->table(CustomFilterModel::TABLE)
|
||||||
|
->eq('id', $keep['id'])
|
||||||
|
->update(array('filter' => $query, 'is_shared' => 1, 'append' => $append));
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($existing as $duplicate) {
|
||||||
|
$this->db->table(CustomFilterModel::TABLE)->eq('id', $duplicate['id'])->remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ensure every ENABLED group's filters on a board. Called lazily on each project-header render,
|
||||||
|
* so it covers old and new boards alike.
|
||||||
|
*
|
||||||
|
* @param int $project_id
|
||||||
|
*/
|
||||||
|
public function ensureBoardFilters($project_id)
|
||||||
|
{
|
||||||
|
if ((int) $this->configModel->get(self::SHOW_ALL_FILTER_KEY, 1) === 1) {
|
||||||
|
$this->ensureGroup($project_id, self::GROUP_SHOW_ALL);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((int) $this->configModel->get(self::MONTH_FILTERS_KEY, 1) === 1) {
|
||||||
|
$this->ensureGroup($project_id, self::GROUP_MONTH);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((int) $this->configModel->get(self::RECURRING_FILTERS_KEY, 1) === 1) {
|
||||||
|
$this->ensureGroup($project_id, self::GROUP_RECURRING);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function ensureGroup($project_id, array $rows)
|
||||||
|
{
|
||||||
|
foreach ($rows as $row) {
|
||||||
|
$this->ensureReservedFilter($project_id, $row[0], $row[1], $row[2]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Toggle turned ON: eagerly (re)create a group's filters on every existing board.
|
||||||
|
* ensureBoardFilters() keeps covering boards created afterwards.
|
||||||
|
*
|
||||||
|
* @param array $rows
|
||||||
|
*/
|
||||||
|
public function addGroupToAllProjects(array $rows)
|
||||||
|
{
|
||||||
|
foreach ($this->projectModel->getAll() as $project) {
|
||||||
|
$this->ensureGroup((int) $project['id'], $rows);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Toggle turned OFF: remove a group's filters across all boards (by their reserved names).
|
||||||
|
*
|
||||||
|
* @param array $rows
|
||||||
|
*/
|
||||||
|
public function removeGroup(array $rows)
|
||||||
|
{
|
||||||
|
$names = array();
|
||||||
|
|
||||||
|
foreach ($rows as $row) {
|
||||||
|
$names[] = $row[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->db->table(CustomFilterModel::TABLE)->in('name', $names)->remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
37
Plugin.php
37
Plugin.php
@@ -20,6 +20,13 @@ class Plugin extends Base
|
|||||||
// Settings page for the plugin's tweaks.
|
// Settings page for the plugin's tweaks.
|
||||||
$this->template->hook->attach('template:config:sidebar', 'organonTweaks:config/sidebar');
|
$this->template->hook->attach('template:config:sidebar', 'organonTweaks:config/sidebar');
|
||||||
|
|
||||||
|
// Per-board tweak: emphasize the due date on the board. Configured with 3-state radios on the
|
||||||
|
// board's Settings -> Integrations (Use default / Always on / Always off); the global default
|
||||||
|
// (for "Use default" boards) lives in the plugin settings above. The emphasis <style> is
|
||||||
|
// emitted into the head only on enabled board pages (gated by OrganonProjectHelper).
|
||||||
|
$this->template->hook->attach('template:project:integrations', 'organonTweaks:project/integration');
|
||||||
|
$this->template->hook->attach('template:layout:head', 'organonTweaks:layout/emphasize_duedate');
|
||||||
|
|
||||||
// Tweak: always show a comment icon on board cards. When a card has no comments
|
// Tweak: always show a comment icon on board cards. When a card has no comments
|
||||||
// yet, add a bubble "+" that opens the same comment modal (add the first comment
|
// yet, add a bubble "+" that opens the same comment modal (add the first comment
|
||||||
// straight from the board). Cards with comments already show the native count.
|
// straight from the board). Cards with comments already show the native count.
|
||||||
@@ -50,12 +57,38 @@ class Plugin extends Base
|
|||||||
'template' => 'plugins/OrganonTweaks/Asset/js/enhance-recurrence.js',
|
'template' => 'plugins/OrganonTweaks/Asset/js/enhance-recurrence.js',
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Auto-managed shared custom filters (v1.5 "Show all tasks", v1.6 month filters, v1.7
|
||||||
|
// recurring filters). Ensured lazily whenever a project header renders (covers old + new
|
||||||
|
// boards); each group is gated by its own config toggle inside
|
||||||
|
// OrganonProjectHelper::ensureBoardFilters(). The toggles also bulk add/remove the filters.
|
||||||
|
$showAllFilters = (int) $this->configModel->get('organon_tweaks_show_all_filter', 1) === 1;
|
||||||
|
$monthFilters = (int) $this->configModel->get('organon_tweaks_month_filters', 1) === 1;
|
||||||
|
$recurringFilters = (int) $this->configModel->get('organon_tweaks_recurring_filters', 1) === 1;
|
||||||
|
if ($showAllFilters || $monthFilters || $recurringFilters) {
|
||||||
|
$this->template->hook->attach('template:project:header:before', 'organonTweaks:project_header/board_filters');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Custom board-search keywords, registered into the task lexer by extending its factory
|
||||||
|
// service (Pimple preserves factory status on extend, so the lexer stays per-request fresh).
|
||||||
|
// `duemonth:VALUE` / `aroundmonth:VALUE` = a calendar month (padded by 10 days for around);
|
||||||
|
// `recurring:XY` = classify recurrence (X system evt/cal/any, Y role ori/dup/all). Always
|
||||||
|
// available to type, independent of the bookmark toggles above. Guarded so a future Kanboard
|
||||||
|
// service rename no-ops (keyword absent) instead of breaking.
|
||||||
|
if (isset($this->container['taskLexer'])) {
|
||||||
|
$this->container->extend('taskLexer', function ($builder, $c) {
|
||||||
|
return $builder
|
||||||
|
->withFilter((new \Kanboard\Plugin\OrganonTweaks\Filter\TaskMonthRangeFilter())->setAttribute('duemonth')->setPadDays(0))
|
||||||
|
->withFilter((new \Kanboard\Plugin\OrganonTweaks\Filter\TaskMonthRangeFilter())->setAttribute('aroundmonth')->setPadDays(10))
|
||||||
|
->withFilter((new \Kanboard\Plugin\OrganonTweaks\Filter\TaskRecurringFilter())->setDatabase($c['db']));
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getHelpers()
|
public function getHelpers()
|
||||||
{
|
{
|
||||||
return array(
|
return array(
|
||||||
'Plugin\OrganonTweaks\Helper' => array('OrganonColumnHelper'),
|
'Plugin\OrganonTweaks\Helper' => array('OrganonColumnHelper', 'OrganonProjectHelper'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,7 +109,7 @@ class Plugin extends Base
|
|||||||
|
|
||||||
public function getPluginVersion()
|
public function getPluginVersion()
|
||||||
{
|
{
|
||||||
return '1.3.0';
|
return '1.7.2';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getPluginHomepage()
|
public function getPluginHomepage()
|
||||||
|
|||||||
15
README.md
15
README.md
@@ -93,3 +93,18 @@ name). No build step and no database migration.
|
|||||||
## License
|
## License
|
||||||
|
|
||||||
AGPL-3.0. See LICENSE.
|
AGPL-3.0. See LICENSE.
|
||||||
|
|
||||||
|
## More Kanboard plugins by Ruben (drbeco)
|
||||||
|
|
||||||
|
All free and AGPL-3.0, at [code.beco.cc](https://code.beco.cc/beco):
|
||||||
|
|
||||||
|
- **[RecoReco](https://code.beco.cc/beco/RecoReco)** -- calendar-scheduled recurring cards (yearly,
|
||||||
|
monthly, weekly, daily), driven by the card due date.
|
||||||
|
- **[FinanceBuddy](https://code.beco.cc/beco/FinanceBuddy)** -- attach a money value (debit/credit
|
||||||
|
and installments) to cards, shown on the card and totalled per column.
|
||||||
|
- **[BulkMoveTasks](https://code.beco.cc/beco/BulkMoveTasks)** -- move every task from one board
|
||||||
|
column to another in a single action.
|
||||||
|
- **[ShrinkVertically](https://code.beco.cc/beco/ShrinkVertically)** -- shrink vertically-collapsed
|
||||||
|
board columns so the horizontal scrollbar stays within reach.
|
||||||
|
- **[TweakDrag](https://code.beco.cc/beco/TweakDrag)** -- board drag and touch niceties:
|
||||||
|
drag-to-scroll, a wider column gap, and smoother card dragging.
|
||||||
|
|||||||
@@ -6,10 +6,13 @@
|
|||||||
<?= $this->form->csrf() ?>
|
<?= $this->form->csrf() ?>
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
|
<legend><?= t('Board card readability') ?></legend>
|
||||||
|
|
||||||
<?= $this->form->checkbox('organon_tweaks_always_comment_icon', t('Always show the comment icon on board cards'), 1, isset($values['organon_tweaks_always_comment_icon']) && $values['organon_tweaks_always_comment_icon'] == 1) ?>
|
<?= $this->form->checkbox('organon_tweaks_always_comment_icon', t('Always show the comment icon on board cards'), 1, isset($values['organon_tweaks_always_comment_icon']) && $values['organon_tweaks_always_comment_icon'] == 1) ?>
|
||||||
<p class="form-help">
|
<p class="form-help"><?= t('A "+" bubble on cards with no comments yet, to add the first one from the board.') ?></p>
|
||||||
<?= t('Show a comment bubble with a "+" on cards that have no comments yet, so you can add the first comment straight from the board. Cards that already have comments keep showing the count as usual.') ?>
|
|
||||||
</p>
|
<?= $this->form->checkbox('organon_tweaks_emphasize_duedate_default', t('Emphasize due date by default'), 1, isset($values['organon_tweaks_emphasize_duedate_default']) && $values['organon_tweaks_emphasize_duedate_default'] == 1) ?>
|
||||||
|
<p class="form-help"><?= t('Enlarge and bold the due date; the default for boards set to "Use default" (overridable per board under Settings -> Integrations).') ?></p>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
@@ -22,17 +25,30 @@
|
|||||||
<fieldset>
|
<fieldset>
|
||||||
<?= $this->form->checkbox('organon_tweaks_quick_click_only', t('Open a card only on a quick click'), 1, isset($values['organon_tweaks_quick_click_only']) && $values['organon_tweaks_quick_click_only'] == 1) ?>
|
<?= $this->form->checkbox('organon_tweaks_quick_click_only', t('Open a card only on a quick click'), 1, isset($values['organon_tweaks_quick_click_only']) && $values['organon_tweaks_quick_click_only'] == 1) ?>
|
||||||
<p class="form-help">
|
<p class="form-help">
|
||||||
<?= t('A press on a card held longer than 100 ms is treated as a drag, so releasing it does not open the card. Fixes a drag sometimes opening the card on release. Normal clicks are well under 100 ms.') ?>
|
<?= t('A press held longer than 120 ms is treated as a drag, so releasing it does not open the card. Fixes a drag sometimes opening the card on release.') ?>
|
||||||
</p>
|
</p>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<?= $this->form->checkbox('organon_tweaks_enhance_recurrence', t('Enhance the recurrence dialog'), 1, isset($values['organon_tweaks_enhance_recurrence']) && $values['organon_tweaks_enhance_recurrence'] == 1) ?>
|
<?= $this->form->checkbox('organon_tweaks_enhance_recurrence', t('Enhance the native recurrence dialog'), 1, isset($values['organon_tweaks_enhance_recurrence']) && $values['organon_tweaks_enhance_recurrence'] == 1) ?>
|
||||||
<p class="form-help">
|
<p class="form-help">
|
||||||
<?= t('In the native "Edit recurrence" dialog, replace the Generate recurrent task dropdown with Yes/No radio buttons (one click), and add a [+7] button next to the factor that adds 7 (one week of days).') ?>
|
<?= t('In the native "Edit recurrence" dialog, replace the Generate recurrent task dropdown with Yes/No radios, and add a [+7] button on the factor to add a week at once.') ?>
|
||||||
</p>
|
</p>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
|
<fieldset>
|
||||||
|
<legend><?= t('Board filters') ?></legend>
|
||||||
|
|
||||||
|
<?= $this->form->checkbox('organon_tweaks_show_all_filter', t('Add a "Show all tasks" filter to every board'), 1, isset($values['organon_tweaks_show_all_filter']) && $values['organon_tweaks_show_all_filter'] == 1) ?>
|
||||||
|
<p class="form-help"><?= t('One-click clear that shows open and closed tasks.') ?></p>
|
||||||
|
|
||||||
|
<?= $this->form->checkbox('organon_tweaks_month_filters', t('Add month filters to every board'), 1, isset($values['organon_tweaks_month_filters']) && $values['organon_tweaks_month_filters'] == 1) ?>
|
||||||
|
<p class="form-help"><?= t('"Due this month" and "Around this month" (duemonth: / aroundmonth: keywords).') ?></p>
|
||||||
|
|
||||||
|
<?= $this->form->checkbox('organon_tweaks_recurring_filters', t('Add recurring filters to every board'), 1, isset($values['organon_tweaks_recurring_filters']) && $values['organon_tweaks_recurring_filters'] == 1) ?>
|
||||||
|
<p class="form-help"><?= t('Adds recurrence bookmarks. Also a recurring:XY search keyword -- X = evt/cal/any (native/calendar/both), Y = ori/dup/all (template/duplicate/both). Example: recurring:evtori.') ?></p>
|
||||||
|
</fieldset>
|
||||||
|
|
||||||
<div class="form-actions">
|
<div class="form-actions">
|
||||||
<button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
|
<button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
3
Template/layout/emphasize_duedate.php
Normal file
3
Template/layout/emphasize_duedate.php
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
<?php if ($this->OrganonProjectHelper->isEmphasizeDueDate()): ?>
|
||||||
|
<style>.task-date { font-size: 1.375em; font-weight: bold; }</style>
|
||||||
|
<?php endif ?>
|
||||||
24
Template/project/integration.php
Normal file
24
Template/project/integration.php
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
<?php $choice = isset($values['organon_tweaks_emphasize_duedate']) && in_array($values['organon_tweaks_emphasize_duedate'], array('on', 'off'), true) ? $values['organon_tweaks_emphasize_duedate'] : 'default' ?>
|
||||||
|
|
||||||
|
<h3><i class="fa fa-umbrella fa-fw" aria-hidden="true"></i> <?= t('OrganonTweaks') ?></h3>
|
||||||
|
<div class="listing">
|
||||||
|
<p><strong><?= t('Emphasize due date on the board') ?></strong></p>
|
||||||
|
|
||||||
|
<label style="display:inline-block; margin-right:16px;">
|
||||||
|
<input type="radio" name="organon_tweaks_emphasize_duedate" value="default" <?= $choice === 'default' ? 'checked="checked"' : '' ?>> <?= t('Use default') ?>
|
||||||
|
</label>
|
||||||
|
<label style="display:inline-block; margin-right:16px;">
|
||||||
|
<input type="radio" name="organon_tweaks_emphasize_duedate" value="on" <?= $choice === 'on' ? 'checked="checked"' : '' ?>> <?= t('Always on') ?>
|
||||||
|
</label>
|
||||||
|
<label style="display:inline-block; margin-right:16px;">
|
||||||
|
<input type="radio" name="organon_tweaks_emphasize_duedate" value="off" <?= $choice === 'off' ? 'checked="checked"' : '' ?>> <?= t('Always off') ?>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<p class="form-help">
|
||||||
|
<?= t('Enlarge and bold the due date on this board. "Use default" follows the global OrganonTweaks setting.') ?>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-actions">
|
||||||
|
<button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
|
||||||
|
</div>
|
||||||
1
Template/project_header/board_filters.php
Normal file
1
Template/project_header/board_filters.php
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<?php $this->OrganonProjectHelper->ensureBoardFilters($project['id']) ?>
|
||||||
Reference in New Issue
Block a user