Merge Sherlock's 'non-aligned-periods' into stable

Author: jralls

bindings/guile/gnc-optiondb.i

@@ -591,6 +591,10 @@ gnc_option_test_book_destroy(QofBook* book)
       $1 = rdp;
 }
 
+%typecheck(SWIG_TYPECHECK_INTEGER) RelativeDatePeriod {
+    $1 = scm_is_integer($input) || scm_is_symbol($input) ? 1 : 0;
+}
+
 %typemap(in) RelativeDatePeriodVec& (RelativeDatePeriodVec period_set)
 {
     for (SCM node = $input; !scm_is_null (node); node = scm_cdr (node))

libgnucash/engine/gnc-option-date.cpp

@@ -427,6 +427,26 @@ days_in_month(int month, int year)
     return gnc_date_get_last_mday(month, year + 1900);
 }
 
+static int
+get_last_day_of_month(struct tm& now)
+{
+    /* Ensure that the month is between 0 and 11*/
+    auto year_delta = (now.tm_mon / 12) + (now.tm_mon < 0 ? -1 : 0);
+    return days_in_month(now.tm_mon - (12 * year_delta), now.tm_year + year_delta);
+}
+
+static void
+set_last_day_in_month(struct tm& now)
+{
+    now.tm_mday = get_last_day_of_month(now);
+}
+
+static bool
+is_last_day_in_month(struct tm& now)
+{
+    return now.tm_mday == get_last_day_of_month(now);
+}
+
 /* Normalize the modified struct tm computed in gnc_relative_date_to_time64
  * before setting the time and perhaps beginning/end of the month. Using the
  * gnc_date API would involve multiple conversions to and from struct tm.
@@ -464,27 +484,39 @@ normalize_reldate_tm(struct tm& now)
 }
 
 static void
-reldate_set_day_and_time(struct tm& now, RelativeDateType type)
+reldate_set_day_and_time(
+        struct tm& now,
+        RelativeDateType type,
+        bool is_offset_quarter,
+        struct tm& acct_per)
 {
     if (type == RelativeDateType::START)
     {
-        gnc_tm_set_day_start(&now);
         now.tm_mday = 1;
+        if (is_offset_quarter)
+        {
+            set_last_day_in_month(now);
+            if (!is_last_day_in_month(acct_per) && now.tm_mday > acct_per.tm_mday)
+                now.tm_mday = acct_per.tm_mday;
+        }
+        gnc_tm_set_day_start(&now);
     }
     else if (type == RelativeDateType::END)
     {
-        /* Ensure that the month is between 0 and 11*/
-        auto year_delta = (now.tm_mon / 12) + (now.tm_mon < 0 ? -1 : 0);
-        auto month = now.tm_mon - (12 * year_delta);
-        auto year = now.tm_year + year_delta;
-        now.tm_mday = days_in_month(month, year);
+        set_last_day_in_month(now);
+        if (is_offset_quarter)
+        {
+            if (!is_last_day_in_month(acct_per) && now.tm_mday > acct_per.tm_mday)
+                now.tm_mday = acct_per.tm_mday;
+            --now.tm_mday;
+        }
         gnc_tm_set_day_end(&now);
     }
     // Do nothing for LAST and NEXT.
 };
 
 time64
-gnc_relative_date_to_time64(RelativeDatePeriod period)
+gnc_relative_date_to_time64(RelativeDatePeriod period, time64 now_t)
 {
     if (period == RelativeDatePeriod::TODAY)
         return static_cast<time64>(GncDateTime());
@@ -493,19 +525,19 @@ gnc_relative_date_to_time64(RelativeDatePeriod period)
     if (period == RelativeDatePeriod::END_ACCOUNTING_PERIOD)
         return gnc_accounting_period_fiscal_end();
 
-    GncDateTime now_t;
     if (period == RelativeDatePeriod::TODAY)
-        return static_cast<time64>(now_t);
-    auto now{static_cast<tm>(now_t)};
-    struct tm acct_per{};
-    if (gnc_prefs_get_bool (GNC_PREFS_GROUP_ACCT_SUMMARY,
-                            GNC_PREF_START_CHOICE_ABS))
-        acct_per = static_cast<tm>(GncDateTime(gnc_accounting_period_fiscal_start()));
+        return now_t;
+    auto now{static_cast<tm>(GncDateTime(now_t))};
+    struct tm acct_per =
+        static_cast<tm>(GncDateTime(gnc_accounting_period_fiscal_start()));
+    auto offset = reldate_offset(period);
+    bool is_offset_quarter =
+        offset == RelativeDateOffset::QUARTER && acct_per.tm_mday > 1;
 
-    switch(reldate_offset(period))
+    switch(offset)
     {
         case RelativeDateOffset::NONE:
-// Report on today so nothing to do
+            // Report on today so nothing to do
             break;
         case RelativeDateOffset::YEAR:
             if (reldate_is_prev(period))
@@ -517,14 +549,26 @@ gnc_relative_date_to_time64(RelativeDatePeriod period)
             else if (gnc_relative_date_is_ending(period))
                 now.tm_mon = 11;
             break;
-       case RelativeDateOffset::SIX:
+        case RelativeDateOffset::SIX:
             if (reldate_is_prev(period))
                 now.tm_mon -= 6;
             else if (reldate_is_next(period))
                 now.tm_mon += 6;
             break;
         case RelativeDateOffset::QUARTER:
-            now.tm_mon -= (12 + now.tm_mon - acct_per.tm_mon) % 3;
+        {
+            auto delta = (12 + now.tm_mon - acct_per.tm_mon) % 3;
+            if (is_offset_quarter)
+            {
+                if (delta == 0 && !is_last_day_in_month(now) && 
+                    (is_last_day_in_month(acct_per) ||
+                     now.tm_mday < acct_per.tm_mday))
+                    delta = 3;
+                if (gnc_relative_date_is_ending(period))
+                    --delta;
+            }
+            now.tm_mon -= delta;
+        }
             [[fallthrough]];
         case RelativeDateOffset::THREE:
             if (reldate_is_prev(period))
@@ -534,7 +578,7 @@ gnc_relative_date_to_time64(RelativeDatePeriod period)
             if (gnc_relative_date_is_ending(period))
                 now.tm_mon += 2;
             break;
-       case RelativeDateOffset::MONTH:
+        case RelativeDateOffset::MONTH:
             if (reldate_is_prev(period))
                 --now.tm_mon;
             else if (reldate_is_next(period))
@@ -546,7 +590,10 @@ gnc_relative_date_to_time64(RelativeDatePeriod period)
             else if (reldate_is_next(period))
                 now.tm_mday += 7;
     }
-    reldate_set_day_and_time(now, checked_reldate(period).m_type);
+    reldate_set_day_and_time( now,
+                              checked_reldate(period).m_type,
+                              is_offset_quarter,
+                              acct_per);
     normalize_reldate_tm(now);
     return static_cast<time64>(GncDateTime(now));
 }

libgnucash/engine/gnc-option-date.hpp

@@ -32,7 +32,7 @@
 #define GNC_OPTION_DATE_HPP_
 
 #include "gnc-date.h"
-
+#include "gnc-datetime.hpp"
 #include <vector>
 #include <iostream>
 /**
@@ -167,9 +167,11 @@ RelativeDatePeriod gnc_relative_date_from_storage_string(const char*);
  * both in the current time zone.
  *
  * @param period The relative date period to use to calculate the concrete date.
+ * @param now_t Optional "now" date. Primarily for testing.
  * @return a time64.
  */
-time64 gnc_relative_date_to_time64(RelativeDatePeriod);
+time64 gnc_relative_date_to_time64(RelativeDatePeriod,
+                                   time64 now_t = static_cast<time64>(GncDateTime()));
 
 /**
  * Add the display string to the provided std::ostream.