Use agenda item real date and time when applying sort. Closes #337.

Author: kristijanhusak

lua/orgmode/agenda/agenda_item.lua

@@ -12,6 +12,7 @@ end
 ---@class AgendaItem
 ---@field date Date
 ---@field headline_date Date
+---@field real_date Date
 ---@field headline Section
 ---@field is_valid boolean
 ---@field is_today boolean
@@ -29,6 +30,7 @@ local AgendaItem = {}
 function AgendaItem:new(headline_date, headline, date, index)
   local opts = {}
   opts.headline_date = headline_date
+  opts.real_date = headline_date:apply_repeater_until(date)
   opts.headline = headline
   opts.date = date
   opts.index = index or 1

lua/orgmode/agenda/views/agenda.lua

@@ -11,8 +11,8 @@ local function sort_by_date_or_priority_or_category(a, b)
   if a.headline:get_priority_sort_value() ~= b.headline:get_priority_sort_value() then
     return a.headline:get_priority_sort_value() > b.headline:get_priority_sort_value()
   end
-  if not a.headline_date:is_same(b.headline_date, 'day') then
-    return a.headline_date:is_before(b.headline_date)
+  if not a.real_date:is_same(b.real_date, 'day') then
+    return a.real_date:is_before(b.real_date)
   end
   return a.index < b.index
 end
@@ -22,26 +22,26 @@ end
 local function sort_agenda_items(agenda_items)
   table.sort(agenda_items, function(a, b)
     if a.is_same_day and b.is_same_day then
-      if not a.headline_date.date_only and b.headline_date.date_only then
+      if not a.real_date.date_only and b.real_date.date_only then
         return true
       end
-      if not b.headline_date.date_only and a.headline_date.date_only then
+      if not b.real_date.date_only and a.real_date.date_only then
         return false
       end
-      if not a.headline_date.date_only and not b.headline_date.date_only then
-        return a.headline_date:is_before(b.headline_date)
+      if not a.real_date.date_only and not b.real_date.date_only then
+        return a.real_date:is_before(b.real_date)
       end
       return sort_by_date_or_priority_or_category(a, b)
     end
 
     if a.is_same_day and not b.is_same_day then
-      if not a.headline_date.date_only or (b.headline_date:is_none() and not a.headline_date:is_none()) then
+      if not a.real_date.date_only or (b.real_date:is_none() and not a.real_date:is_none()) then
         return true
       end
     end
 
     if not a.is_same_day and b.is_same_day then
-      if not b.headline_date.date_only or (a.headline_date:is_none() and not b.headline_date:is_none()) then
+      if not b.real_date.date_only or (a.real_date:is_none() and not b.real_date:is_none()) then
         return false
       end
     end