From 90bc7f4b23c205491176d793439094b9bb0f2aa9 Mon Sep 17 00:00:00 2001
From: sebu06 <github@prebtec.de>
Date: Sun, 18 Jul 2021 21:42:53 +0200
Subject: [PATCH] Fixed rendering of countdown columns

Countdown columns were counting up days instead of down.
---
 ChangeLog                   | 2 ++
 src/columns/ColTypeDate.cpp | 2 +-
 test/columns.t              | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b3f2aa8c0..7932e746a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,8 @@
 - TW #2536 Feature: inclusive range-end attribute modifier 'by' so 'end of'
            named dates can be filtered inclusively
            Thanks to Scott Mcdermott
+- TW #1824 Fixed countdown formatting
+           Thanks to Sebastian Uharek
 
 ------ current release ---------------------------
 
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index 1eb11d638..81f9b32ea 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -161,7 +161,7 @@ void ColumnTypeDate::render (
     else if (_style == "countdown")
     {
       Datetime now;
-      renderStringRight (lines, width, color, Duration (now - date).formatVague (true));
+      renderStringRight (lines, width, color, Duration (date - now).formatVague (true));
     }
     else if (_style == "julian")
       renderStringRight (lines, width, color, format (date.toJulian (), 13, 12));
diff --git a/test/columns.t b/test/columns.t
index 150238254..59fdfb6e6 100755
--- a/test/columns.t
+++ b/test/columns.t
@@ -390,8 +390,8 @@ class TestDateFormats(TestCase):
     def test_date_format_countdown(self):
         """Verify due.countdown formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,due.countdown")
-        self.assertRegex(out, r'1\s+\d+\S+')
-        self.assertRegex(out, r'2\s+')
+        self.assertRegex(out, r'1\s+')
+        self.assertRegex(out, r'2\s+\d+\S+')
 
     def test_date_format_unrecognized(self):
         """Verify due.donkey formatting fails"""