FinanceBuddy: separate the Integrations section with a trailing rule (v1.1.2)

Asset/css/finance.css

@@ -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;
 }

Model/FinancePersistence.php

@@ -48,6 +48,41 @@ class FinancePersistence extends Base
         if ($this->pending !== null) {
             $this->persist((int) $task_id, $this->pending['project_id'], $this->pending['fields']);
             $this->pending = null;
+            return;
+        }
+
+        // Not a form submission. Native recurrence builds the next occurrence with a plain task
+        // create (which copies no metadata) after setting recurrence_parent to the source task, so
+        // carry the finance metadata across -- otherwise the recurring card loses its money.
+        $task = $this->taskFinderModel->getById((int) $task_id);
+
+        if (! empty($task['recurrence_parent'])) {
+            // A recurrence is the NEXT occurrence, so advance the installment (p2/30 -> p3/30).
+            $this->copyMetadata((int) $task['recurrence_parent'], (int) $task_id, true);
+        }
+    }
+
+    /**
+     * model:task:duplication:aftersave -- the manual "Duplicate" action. TaskDuplicationModel does
+     * not copy metadata, so carry the finance fields to the new task.
+     */
+    public function onDuplication(array &$hook_values)
+    {
+        if (! empty($hook_values['source_task_id']) && ! empty($hook_values['destination_task_id'])) {
+            $this->copyMetadata((int) $hook_values['source_task_id'], (int) $hook_values['destination_task_id']);
+        }
+    }
+
+    /**
+     * recoreco:task:spawned -- RecoReco (calendar recurrence) just spawned a copy. Its ongoing card
+     * is the TEMPLATE that stays (unlike native recurrence, whose ongoing card is the new child), so
+     * advance the SOURCE template's installment. The clone already copied the current installment
+     * verbatim via onDuplication during RecoReco's duplicate() call.
+     */
+    public function onRecoRecoSpawn(array &$payload)
+    {
+        if (! empty($payload['source_task_id'])) {
+            $this->advanceInstallment((int) $payload['source_task_id']);
         }
     }
 
@@ -114,6 +149,74 @@ class FinancePersistence extends Base
         ));
     }
 
+    /**
+     * Copy the finance metadata from one task to another (recurrence next occurrence, or a manual
+     * duplicate). When $advance is true, bump the current installment by one -- clamped at the
+     * total so a finite plan stops at its last installment (e.g. p30/30 stays p30/30).
+     */
+    private function copyMetadata($source_id, $dest_id, $advance = false)
+    {
+        if ($source_id <= 0 || $dest_id <= 0) {
+            return;
+        }
+
+        $amount = $this->taskMetadataModel->get($source_id, FinanceHelper::AMOUNT_KEY, '');
+
+        // Nothing to carry over if the source has no money set.
+        if ($amount === '' || (float) $amount <= 0) {
+            return;
+        }
+
+        $direction = $this->taskMetadataModel->get($source_id, FinanceHelper::DIRECTION_KEY, 'debit');
+        $current = $this->taskMetadataModel->get($source_id, FinanceHelper::INSTALLMENT_CURRENT_KEY, '');
+        $total = $this->taskMetadataModel->get($source_id, FinanceHelper::INSTALLMENT_TOTAL_KEY, '');
+
+        if ($advance && $current !== '' && ctype_digit((string) $current)) {
+            $next = (int) $current + 1;
+
+            if ($total !== '' && ctype_digit((string) $total) && $next > (int) $total) {
+                $next = (int) $total;
+            }
+
+            $current = (string) $next;
+        }
+
+        $this->taskMetadataModel->save($dest_id, array(
+            FinanceHelper::AMOUNT_KEY => $amount,
+            FinanceHelper::DIRECTION_KEY => $direction === 'credit' ? 'credit' : 'debit',
+            FinanceHelper::INSTALLMENT_CURRENT_KEY => $current,
+            FinanceHelper::INSTALLMENT_TOTAL_KEY => $total,
+        ));
+    }
+
+    /**
+     * 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)
+    {
+        $current = $this->taskMetadataModel->get($task_id, FinanceHelper::INSTALLMENT_CURRENT_KEY, '');
+
+        if ($current === '' || ! ctype_digit((string) $current)) {
+            return;
+        }
+
+        $total = $this->taskMetadataModel->get($task_id, FinanceHelper::INSTALLMENT_TOTAL_KEY, '');
+        $next = (int) $current + 1;
+
+        if ($total !== '' && ctype_digit((string) $total) && $next > (int) $total + 1) {
+            $next = (int) $total + 1;
+        }
+
+        $this->taskMetadataModel->save($task_id, array(
+            FinanceHelper::INSTALLMENT_CURRENT_KEY => (string) $next,
+        ));
+    }
+
     private function intOrBlank($raw)
     {
         $raw = trim((string) $raw);

Plugin.php

@@ -29,6 +29,16 @@ class Plugin extends Base
         $this->hook->on('model:task:creation:aftersave', array($persistence, 'onCreationAfterSave'));
         $this->hook->on('model:task:modification:prepare', array($persistence, 'onModificationPrepare'));
 
+        // Carry the finance metadata onto copies (which Kanboard does not copy): native recurrence
+        // advances the installment for the next occurrence (creation:aftersave via recurrence_parent),
+        // and a manual Duplicate copies it verbatim.
+        $this->hook->on('model:task:duplication:aftersave', array($persistence, 'onDuplication'));
+
+        // RecoReco (calendar recurrence) spawns a copy and emits this signal. The clone already got
+        // the finance verbatim (via onDuplication above); here we advance the SOURCE template's
+        // installment, since RecoReco's ongoing card is the template that stays.
+        $this->hook->on('recoreco:task:spawned', array($persistence, 'onRecoRecoSpawn'));
+
         // The line-3 money badge on each board card, rendered directly under the title. Two hooks:
         // "private" is the normal board, "public" is the read-only board shared by token.
         $this->template->hook->attach('template:board:private:task:after-title', 'financeBuddy:board/task_money');
@@ -67,7 +77,7 @@ class Plugin extends Base
 
     public function getPluginVersion()
     {
-        return '1.0.0';
+        return '1.1.2';
     }
 
     public function getPluginHomepage()

README.md

@@ -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.

Template/board/column_total.php

@@ -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>

Template/board/task_money.php

@@ -15,13 +15,18 @@ if ($fb['amount'] === '' || (float) $fb['amount'] <= 0) {
 $credit = $fb['direction'] === 'credit';
 $sign = $credit ? '+' : '-';
 $total = $fb['installment_total'];
-$current = $fb['installment_current'] !== '' ? $fb['installment_current'] : '1';
+$current = $fb['installment_current'];
+
+// Installments: "p2/10" when a total is set; "p2" (open-ended) when only the current is set;
+// nothing when neither is set. Default the current to 1 if only a total was entered.
+$show_installments = $current !== '' || $total !== '';
+$current_display = $current !== '' ? $current : '1';
 ?>
 <div class="fb-line">
     <span class="fb-badge <?= $credit ? 'fb-badge-credit' : 'fb-badge-debit' ?>">
         <?= $sign ?>R$<?= \Kanboard\Plugin\FinanceBuddy\Helper\FinanceHelper::money($fb['amount']) ?>
     </span>
-    <?php if ($total !== ''): ?>
-        <span class="fb-installments">p<?= $this->text->e($current) ?>/<?= $this->text->e($total) ?></span>
+    <?php if ($show_installments): ?>
+        <span class="fb-installments">p<?= $this->text->e($current_display) ?><?= $total !== '' ? '/'.$this->text->e($total) : '' ?></span>
     <?php endif ?>
 </div>

Template/project/integration.php

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

Template/task/form_fields.php

@@ -24,6 +24,6 @@
         <span><?= t('of') ?></span>
         <input type="number" min="1" name="financebuddy_installment_total" value="<?= $this->text->e($fb['installment_total']) ?>" class="fb-form-num">
     </div>
-    <p class="form-help"><?= t('Leave the total blank for an open-ended recurring bill.') ?></p>
+    <p class="form-help"><?= t('Set a total for a finite plan (shows p2/10); leave it blank for an open-ended count (shows p2).') ?></p>
 </div>
 <?php endif ?>

VERSION

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