Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-11 e8ba145debbace4e1016d854ccd0a92f3403fd5e

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
Quintiq file version 2.0
#parent: #root
Method GetDateOfNextOccurrence (
  output Date dateOfRecurrence_o,
  Date date_i
) as Date id:Method_LibCal_dlgEvent_GetDateOfNextOccurrence
{
  #keys: '[131094.0.1729519603]'
  Body:
  [*
    date     := date_i;
    timezone := this.GetCalendarTimeZone();
    
    if( btnDaily.Pressed() )
    {
      date := LibCal_RecurrencePatternDaily::GetDateOfNextOccurrence( dateOfRecurrence_o, date_i,
                                                                      [Number]edtEveryNrOfDays.Text(),
                                                                      ckbEveryWeekday.Checked() );
    }
    
    else if( btnWeekly.Pressed() )
    {
      earliestStart := date_i;
      
      date := LibCal_RecurrencePatternWeekly::GetDateOfNextOccurrence( timezone, dateOfRecurrence_o, date_i, 
                                                                       durStartTimeOfDay.Duration(), durEndTimeOfDay.Duration(), vhDuration.Data(), earliestStart,
                                                                       [Number]edtEveryNrOfWeeks.Text(),
                                                                       btnMonday   .Pressed(),
                                                                       btnTuesday  .Pressed(),
                                                                       btnWednesday.Pressed(),
                                                                       btnThursday .Pressed(),
                                                                       btnFriday   .Pressed(),
                                                                       btnSaturday .Pressed(),
                                                                       btnSunday   .Pressed() );  
    }
    
    else if( btnMonthly.Pressed() )
    {
      // Make sure that the entered day of the month is valid.
      day := guard( [Number]edtMonthlyDay.Text(), 0 );
      
      if( day > 0 )
      {
        everyNrOfMonths := ifexpr( ckbMonthlyDay.Checked(), edtMonthlyDayEveryNrOfMonths.Text(),
                                                            edtMonthlyPatternEveryNrOfMonths.Text() );
                                                            
        date := LibCal_RecurrencePatternMonthly::GetDateOfNextOccurrence( dateOfRecurrence_o, date_i, [Number]everyNrOfMonths,
                                                                          ckbMonthlyDay.Checked(), day,
                                                                          ssMonthlyPatternWeekOfMonth.BoundValue(), ssMonthlyPatternDayOfWeek.BoundValue() );
      }                                                                    
    }
    
    else if( btnYearly.Pressed() )
    {
      date := LibCal_RecurrencePatternYearly::GetDateOfNextOccurrence( dateOfRecurrence_o, date_i, [Number]edtEveryNrOfYears.Text(),
                                                                       ckbYearlyDay.Checked(), [Number]ssYearlyDayOfMonth.BoundValue(),
                                                                       ssYearlyPatternWeekOfMonth.BoundValue(), ssYearlyPatternDayOfWeek.BoundValue() );
    }
    
    return date;
  *]
}