From e4f3d4a880acac6559f8d91277fa559e4fd350c8 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 31 五月 2024 16:12:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_LibCal_SubscriberEventTable/Method_InitializeWeek.qbl | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/_Main/BL/Type_LibCal_SubscriberEventTable/Method_InitializeWeek.qbl b/_Main/BL/Type_LibCal_SubscriberEventTable/Method_InitializeWeek.qbl
index d1da787..f9cfed4 100644
--- a/_Main/BL/Type_LibCal_SubscriberEventTable/Method_InitializeWeek.qbl
+++ b/_Main/BL/Type_LibCal_SubscriberEventTable/Method_InitializeWeek.qbl
@@ -4,7 +4,8 @@
LibCal_SubscriberEventTable table,
LibCal_SubscriberEventRow row,
DateTime starttime,
- DateTime endtime
+ DateTime endtime,
+ String desc
)
{
TextBody:
@@ -20,13 +21,22 @@
column := table.LibCal_SubscriberEventColumn( relnew, Name := time.Format( 'M/D/Y' ), Period := time.Date() );
}
- duration := startTime.StartOfNextWeek() - startTime;
if( startTime.StartOfNextWeek() > endtime ){
duration := endtime - startTime;
+ cell := column.LibCal_SubscriberEventCell( relnew, Value := [String]duration.HoursAsReal()
+ , Start := startTime.Format( 'M/D/Y H:m' )
+ , End := endtime.Format( 'M/D/Y H:m' )
+ , Description := desc );
+ row.LibCal_SubscriberEventCell( relinsert, cell );
+ }else{
+ duration := startTime.StartOfNextWeek() - startTime;
+ cell := column.LibCal_SubscriberEventCell( relnew, Value := [String]duration.HoursAsReal()
+ , Start := startTime.Format( 'M/D/Y H:m' )
+ , End := startTime.StartOfNextWeek().Format( 'M/D/Y H:m' )
+ , Description := desc );
+ row.LibCal_SubscriberEventCell( relinsert, cell );
}
// info( startTime, column.Name(), duration.AsQUILL(), duration.HoursAsReal() );
- cell := column.LibCal_SubscriberEventCell( relnew, Value := [String]duration.HoursAsReal() );
- row.LibCal_SubscriberEventCell( relinsert, cell );
}
*]
}
--
Gitblit v1.9.3