From fb1634fb000c80a7b66d3af521c964dea9923d79 Mon Sep 17 00:00:00 2001 From: lihongji <3117313295@qq.com> Date: 星期日, 04 八月 2024 17:38:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- _Main/BL/Type_LibCal_SubscriberEventTable/Method_InitializeTable.qbl | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/_Main/BL/Type_LibCal_SubscriberEventTable/Method_InitializeTable.qbl b/_Main/BL/Type_LibCal_SubscriberEventTable/Method_InitializeTable.qbl index 1c22d42..1171045 100644 --- a/_Main/BL/Type_LibCal_SubscriberEventTable/Method_InitializeTable.qbl +++ b/_Main/BL/Type_LibCal_SubscriberEventTable/Method_InitializeTable.qbl @@ -33,14 +33,27 @@ } } - + //info( '----------------------1------------------------', this.LibCal_SubscriberEventColumn( relsize ) ); //traverse( this, LibCal_SubscriberEventColumn, column ){ - // traverse( this, LibCal_SubscriberEventRow, row ){ - // if( not exists( column, LibCal_SubscriberEventCell, cell, cell.LibCal_SubscriberEventRow() = row ) ) { - // cell := column.LibCal_SubscriberEventCell( relnew, Value := '' ); - // row.LibCal_SubscriberEventCell( relinsert, cell ); - // } - // } + // info( '------------------------', column.Name(), column.Period(), column.TimeUnit() ); //} + + Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MaxDayDate ) ); + Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MaxWeekDate ) ); + Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MaxMonthDate ) ); + Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MinDayDate ) ); + Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MinWeekDate ) ); + Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MinMonthDate ) ); + this.ProcessColumnDay(); + this.ProcessColumnWeek(); + this.ProcessColumnMonth(); + traverse( this, LibCal_SubscriberEventColumn, column ){ + traverse( this, LibCal_SubscriberEventRow, row ){ + if( not exists( column, LibCal_SubscriberEventCell, cell, cell.LibCal_SubscriberEventRow() = row ) ) { + cell := column.LibCal_SubscriberEventCell( relnew, Value := '' ); + row.LibCal_SubscriberEventCell( relinsert, cell ); + } + } + } *] } -- Gitblit v1.9.3