From 26581143a8c28d6d71ab39e35d4158cb76afd2aa Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Thu, 13 Oct 2022 11:40:55 +0000 Subject: [PATCH] tvplanit: Fix double-click in MonthView not working any more for events beginning in previous month git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8551 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../examples/printing/dayview/data.ini | 28 ++++++++++--------- components/tvplanit/source/vpmonthview.pas | 4 ++- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/components/tvplanit/examples/printing/dayview/data.ini b/components/tvplanit/examples/printing/dayview/data.ini index a9415f238..59f62d632 100644 --- a/components/tvplanit/examples/printing/dayview/data.ini +++ b/components/tvplanit/examples/printing/dayview/data.ini @@ -2,18 +2,20 @@ Version=v105 [Resources] -1178568021={Description:Test}|{ResourceActive:true} +1178568021={Description:Organizer}|{ResourceActive:true} [Events of resource 1178568021] -1273124118={StartTime:2022/10/01 10:00:00}|{EndTime:2022/10/01 12:30:00}|{ResourceID:1178568021}|{Description:Test event 1}|{Category:0}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} -1535857465={StartTime:2022/10/02 13:00:00}|{EndTime:2022/10/02 16:00:00}|{ResourceID:1178568021}|{Description:Test event 2}|{Category:1}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} -1842424188={StartTime:2022/10/02 18:00:00}|{EndTime:2022/10/02 19:00:00}|{ResourceID:1178568021}|{Description:Test event 2a}|{Category:2}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} -1813046879={StartTime:2022/10/03 10:00:00}|{EndTime:2022/10/03 13:00:00}|{ResourceID:1178568021}|{Description:Test event 3}|{Category:3}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} -1294424480={StartTime:2022/10/04 08:00:00}|{EndTime:2022/10/04 08:30:00}|{ResourceID:1178568021}|{Description:All-day event}|{Category:2}|{AllDayEvent:true}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} -1819459250={StartTime:2022/10/05 09:30:00}|{EndTime:2022/10/05 13:45:00}|{ResourceID:1178568021}|{Description:Test 4a}|{Category:4}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} -1170127712={StartTime:2022/10/05 10:30:00}|{EndTime:2022/10/05 19:00:00}|{ResourceID:1178568021}|{Description:Test 4}|{Category:0}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} -909791748={StartTime:2022/10/06 08:30:00}|{EndTime:2022/10/06 09:00:00}|{ResourceID:1178568021}|{Description:All-day}|{Category:3}|{AllDayEvent:true}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} -1339092840={StartTime:2022/10/06 10:30:00}|{EndTime:2022/10/06 14:00:00}|{ResourceID:1178568021}|{Category:1}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} -1387047049={StartTime:2022/10/07 09:00:00}|{EndTime:2022/10/07 13:00:00}|{ResourceID:1178568021}|{Description:Test 6}|{Category:0}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} -825453432={StartTime:2022/10/07 12:30:00}|{EndTime:2022/10/07 19:00:00}|{ResourceID:1178568021}|{Description:Test 6a}|{Category:2}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} -939711377={StartTime:2022/10/08 10:00:00}|{EndTime:2022/10/08 10:30:00}|{ResourceID:1178568021}|{Description:Test}|{Category:3}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:15}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} +330056003={StartTime:2022/09/30 14:30:00}|{EndTime:2022/09/30 15:30:00}|{ResourceID:1178568021}|{Description:Personal Income / Non Farm Payroll 14:30:00}|{Category:4}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:0}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} +1885906112={StartTime:2022/10/01 11:00:00}|{EndTime:2022/10/01 12:00:00}|{ResourceID:1178568021}|{Description:auf Tagstrom umschalten}|{Category:3}|{AllDayEvent:true}|{AlarmSet:false}|{AlarmAdvance:0}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{RepeatRangeEnd:2080/12/31}|{CustomInterval:0} +715423775={StartTime:2022/10/03}|{EndTime:2022/10/03 23:59:59}|{ResourceID:1178568021}|{Description:Tag der Deutschen Einheit }|{Category:7}|{AllDayEvent:true}|{AlarmSet:false}|{AlarmAdvance:0}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} +803523910={StartTime:2022/10/03 16:00:00}|{EndTime:2022/10/03 17:00:00}|{ResourceID:1178568021}|{Description:PMI}|{Category:4}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:0}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} +1568612637={StartTime:2022/10/03 22:00:00}|{EndTime:2022/10/03 23:00:00}|{ResourceID:1178568021}|{Description:US Crop Rep.}|{Category:4}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:0}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} +2055475041={StartTime:2022/10/04 10:00:00}|{EndTime:2022/10/04 11:00:00}|{ResourceID:1178568021}|{Description: DREI Telefon läuft ab am 16.10.2022, Aufladen via Internet}|{Category:1}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:0}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} +790792679={StartTime:2022/10/04 20:00:00}|{EndTime:2022/10/04 21:00:00}|{ResourceID:1178568021}|{Description:04.10.2022 20:00:00 Bibelrunde}|{Category:5}|{AllDayEvent:false}|{AlarmSet:true}|{AlarmAdvance:30}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} +1662654180={StartTime:2022/10/05 10:00:00}|{EndTime:2022/10/05 11:00:00}|{ResourceID:1178568021}|{Description: Papier}|{Category:2}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:0}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} +995520639={StartTime:2022/10/05 14:30:00}|{EndTime:2022/10/05 15:30:00}|{ResourceID:1178568021}|{Description:US Trade Balance}|{Category:4}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:0}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} +1387842305={StartTime:2022/10/05 16:30:00}|{EndTime:2022/10/05 17:30:00}|{ResourceID:1178568021}|{Description:CL Storage Report}|{Category:4}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:0}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} +928030865={StartTime:2022/10/05 20:30:00}|{EndTime:2022/10/05 21:30:00}|{ResourceID:1178568021}|{Description:05.10.2022 Richter anrufen}|{Category:1}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:0}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} +461452867={StartTime:2022/10/06 14:30:00}|{EndTime:2022/10/06 15:30:00}|{ResourceID:1178568021}|{Description:Week.Exp.Sales}|{Category:4}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:0}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} +596203111={StartTime:2022/10/06 16:30:00}|{EndTime:2022/10/06 17:30:00}|{ResourceID:1178568021}|{Description:NG Storage Report}|{Category:4}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:0}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} +311058201={StartTime:2022/10/25 16:00:00}|{EndTime:2022/10/25 17:00:00}|{ResourceID:1178568021}|{Description:Cons.Conf.}|{Category:4}|{AllDayEvent:false}|{AlarmSet:false}|{AlarmAdvance:0}|{AlarmAdvanceType:atMinutes}|{RepeatCode:rtNone}|{CustomInterval:0} diff --git a/components/tvplanit/source/vpmonthview.pas b/components/tvplanit/source/vpmonthview.pas index 9eb80aa39..4e93c5932 100644 --- a/components/tvplanit/source/vpmonthview.pas +++ b/components/tvplanit/source/vpmonthview.pas @@ -1354,6 +1354,7 @@ var I: Integer; y1, m1, d1: Word; y2, m2, d2: Word; + y3, m3, d3: Word; begin Result := false; @@ -1367,7 +1368,8 @@ begin if PtInRect(mvEventArray[I].Rec, Point) then begin DecodeDate(TVpEvent(mvEventArray[I].Event).StartTime, y2, m2, d2); - if (y1 = y2) and (m1 = m2) then + DecodeDate(TVpEvent(mvEventArray[I].Event).EndTime, y3, m3, d3); + if ((y1 = y2) and (m1 = m2)) or ((y1 = y3) and (m1 = m3)) then begin mvActiveEvent := TVpEvent(mvEventArray[I].Event); mvActiveEventRec := mvEventArray[I].Rec;