From ce6dbe762789ef34e72c57348213451e5538f03c Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 26 七月 2024 11:35:15 +0800
Subject: [PATCH] 日历不可用事件导出失败
---
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelPeriods.def | 1 -
_Main/BL/Type_LibCal_SubscriberEventTable/StaticMethod_Export.qbl | 6 ++++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_LibCal_SubscriberEventTable/StaticMethod_Export.qbl b/_Main/BL/Type_LibCal_SubscriberEventTable/StaticMethod_Export.qbl
index 7cdbcf7..4cc4cef 100644
--- a/_Main/BL/Type_LibCal_SubscriberEventTable/StaticMethod_Export.qbl
+++ b/_Main/BL/Type_LibCal_SubscriberEventTable/StaticMethod_Export.qbl
@@ -33,7 +33,8 @@
tableElement.AppendChild( subscribercolumnelement );
tableElement.AppendChild( eventcolumnelement );
-
+ columns := selectsortedset( columns, Elements, column, column.Period() );
+ isfirst := true;
traverse ( columns, Elements, column ) {
columnelement := xmlDOM.CreateElement( "column" );
nameelement := xmlDOM.CreateElement( "name" );
@@ -46,7 +47,7 @@
cells := selectsortedset( column, LibCal_SubscriberEventCell, cell, rows.Find( cell.LibCal_SubscriberEventRow() ) > -1, cell.LibCal_SubscriberEventRow().RowNr() );
traverse ( cells, Elements, c ) {
- if( column.Index() = 0 ){
+ if( isfirst ){
row := c.LibCal_SubscriberEventRow();
//subscriber
subscribercellElement := xmlDOM.CreateElement( "cell" );
@@ -62,6 +63,7 @@
columnelement.AppendChild( cellElement );
}
tableElement.AppendChild( columnelement );
+ isfirst := false;
}
xmlString := xmlDOMI.CreateSerializer().WriteToString( xmlDOM )
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelPeriods.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelPeriods.def
index 2b876f1..8e8390c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelPeriods.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelPeriods.def
@@ -17,7 +17,6 @@
Orientation: 'horizontal'
Taborder: 0
Title: 'Periods'
- Tooltip: '<html>Select if the periods are used for planning or merely for visualization.<br>The planning periods define the granularity at which planning is done.<br>In case of overlapping planning periods, the smallest ones are used.<br>The planning periods are shown in the period overview in blue.</html>'
]
}
]
--
Gitblit v1.9.3