5 Commits

7 changed files with 61 additions and 16 deletions

View File

@@ -2,13 +2,27 @@
* FinanceBuddy styles.
*/
/* Per-column net total in the column header (its own line, subtle pill). */
/* The column header (.board-column-expanded-header) is a flex row, so the total is a flex item. To
drop it onto its own line under the title, let that header wrap (scoped with :has to headers that
actually contain the total -- i.e. enabled boards only) and give the total full width. No
background (dropped per request); "Total:" stays black, only the amount span is colored by sign. */
.board-column-expanded-header:has(.fb-column-total) {
flex-wrap: wrap;
}
.fb-column-total {
flex-basis: 100%;
margin-top: 2px;
text-align: right;
}
/* The visible pill hugs the text (not the full width) and is right-justified on its line. */
.fb-total-pill {
display: inline-block;
margin-top: 3px;
padding: 0 5px;
font-weight: bold;
font-size: 0.95em;
color: #000;
background: rgba(0, 0, 0, 0.05);
border-radius: 3px;
}

View File

@@ -190,9 +190,12 @@ class FinancePersistence extends Base
}
/**
* Advance a task's current installment by one, in place. A finite plan clamps at the total
* (p10/10 stays p10/10); an open-ended one (no total) increments unbounded (p2 -> p3). Cards
* with no numeric current installment are left alone.
* Advance a task's current installment by one, in place. A finite plan clamps at total+1, one
* past the last installment: that overflow is the "plan complete" tombstone (p4/3) that RecoReco
* reads to stop a following recurrence, and it caps runaway when nothing follows. Clones still
* read p1/total .. pTotal/total because a clone snapshots current BEFORE this advance. An
* open-ended plan (no total) increments unbounded (p2 -> p3); cards with no numeric current
* installment are left alone.
*/
private function advanceInstallment($task_id)
{
@@ -205,8 +208,8 @@ class FinancePersistence extends Base
$total = $this->taskMetadataModel->get($task_id, FinanceHelper::INSTALLMENT_TOTAL_KEY, '');
$next = (int) $current + 1;
if ($total !== '' && ctype_digit((string) $total) && $next > (int) $total) {
$next = (int) $total;
if ($total !== '' && ctype_digit((string) $total) && $next > (int) $total + 1) {
$next = (int) $total + 1;
}
$this->taskMetadataModel->save($task_id, array(

View File

@@ -77,7 +77,7 @@ class Plugin extends Base
public function getPluginVersion()
{
return '1.0.3';
return '1.1.2';
}
public function getPluginHomepage()

View File

@@ -51,6 +51,15 @@ Each column header shows a **`Total:`** of its cards -- credits positive, debits
net): red when negative (what you owe), green when positive, gray at zero. It is shown for every
column, including `Total: R$0,00`.
### Installments and recurrence
FinanceBuddy carries the money across copies. Kanboard's built-in recurrence and RecoReco's
calendar recurrence advance the installment on the next occurrence (`p2/10 -> p3/10`); a manual
duplicate copies it as-is. When a RecoReco-followed plan finishes, the parked template is left one
past the last installment (`p3/3 -> p4/3`) as a "plan complete" marker that RecoReco reads to stop
recurring; the copies themselves still read `p1/3 .. p3/3`. Open-ended plans (blank total) keep
counting.
## Money format
Amounts show in R$ with a comma decimal and no thousand separator (for example `R$1234,56`).
@@ -78,3 +87,20 @@ Settings -> Integrations and tick "Enable FinanceBuddy on this board".
## 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. Pairs directly with FinanceBuddy: recurring
bills spawn on schedule and their installments count down until the plan is paid off.
- **[OrganonTweaks](https://code.beco.cc/beco/OrganonTweaks)** -- an umbrella of small
quality-of-life board tweaks: remove an empty column, always show the comment icon, emphasize due
dates, extra search keywords and shared board filters, and more.
- **[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.

View File

@@ -1,7 +1,8 @@
<?php
// Per-column net total in the column header (credits - debits). Shown in every column of an
// enabled board, including "total R$0,00" -- never hidden on zero. Server-side, re-renders on
// every board refresh.
// enabled board, including "Total: R$0,00" -- never hidden on zero. Server-side, re-renders on
// every board refresh. Rendered on its own full-width line under the title; "Total:" stays the
// default (black) and only the amount is colored by sign.
if (empty($column['project_id']) || ! $this->FinanceHelper->isEnabled($column['project_id'])) {
return;
}
@@ -9,16 +10,16 @@ if (empty($column['project_id']) || ! $this->FinanceHelper->isEnabled($column['p
$net = $this->FinanceHelper->columnNet($column);
if ($net > 0) {
$class = 'fb-column-total fb-total-credit';
$amount_class = 'fb-total-credit';
$sign = '+';
} elseif ($net < 0) {
$class = 'fb-column-total fb-total-debit';
$amount_class = 'fb-total-debit';
$sign = '-';
} else {
$class = 'fb-column-total fb-total-zero';
$amount_class = 'fb-total-zero';
$sign = '';
}
?>
<div class="<?= $class ?>">
<?= t('Total') ?>: <span class="fb-amount"><?= $sign ?>R$<?= \Kanboard\Plugin\FinanceBuddy\Helper\FinanceHelper::money(abs($net)) ?></span>
<div class="fb-column-total">
<span class="fb-total-pill"><?= t('Total') ?>: <span class="fb-amount <?= $amount_class ?>"><?= $sign ?>R$<?= \Kanboard\Plugin\FinanceBuddy\Helper\FinanceHelper::money(abs($net)) ?></span></span>
</div>

View File

@@ -18,3 +18,4 @@
<div class="form-actions">
<button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
</div>
<hr>

View File

@@ -1 +1 @@
FinanceBuddy v1.0.3
FinanceBuddy v1.1.2