column total on its own full-width line; Total: black (v1.0.4)

Asset/css/finance.css

@@ -2,13 +2,17 @@
  * FinanceBuddy styles.
  */
 
-/* Per-column net total in the column header (its own line, subtle pill). */
+/* Per-column net total: its own full-width line under the column title (clears the right-floated
+   task count), so a wide amount never overflows the column. Keep the background pill (theme-safe
+   contrast). "Total:" is black; only the amount span is colored by sign. */
 .fb-column-total {
-    display: inline-block;
+    display: block;
+    clear: both;
     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

@@ -73,6 +73,19 @@ class FinancePersistence extends Base
         }
     }
 
+    /**
+     * 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']);
+        }
+    }
+
     /**
      * model:task:modification:prepare -- fires before UPDATE, $values by reference. The task id is
      * removed from $values by core, but it is the route parameter of the modification request.
@@ -176,6 +189,31 @@ 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.
+     */
+    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) {
+            $next = (int) $total;
+        }
+
+        $this->taskMetadataModel->save($task_id, array(
+            FinanceHelper::INSTALLMENT_CURRENT_KEY => (string) $next,
+        ));
+    }
+
     private function intOrBlank($raw)
     {
         $raw = trim((string) $raw);

Plugin.php

@@ -34,6 +34,11 @@ class Plugin extends Base
         // 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');
@@ -72,7 +77,7 @@ class Plugin extends Base
 
     public function getPluginVersion()
     {
-        return '1.0.2';
+        return '1.0.4';
     }
 
     public function getPluginHomepage()

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">
+    <?= t('Total') ?>: <span class="fb-amount <?= $amount_class ?>"><?= $sign ?>R$<?= \Kanboard\Plugin\FinanceBuddy\Helper\FinanceHelper::money(abs($net)) ?></span>
 </div>

VERSION

@@ -1 +1 @@
-FinanceBuddy v1.0.2
+FinanceBuddy v1.0.4