diff --git a/BeWo/View/Controls/ValueListEntryEditControl.xaml b/BeWo/View/Controls/ValueListEntryEditControl.xaml
index c827370d2..814c2f2f0 100644
--- a/BeWo/View/Controls/ValueListEntryEditControl.xaml
+++ b/BeWo/View/Controls/ValueListEntryEditControl.xaml
@@ -31,7 +31,7 @@
-
+
diff --git a/BeWo/View/Master/ReportView.xaml.cs b/BeWo/View/Master/ReportView.xaml.cs
index 89fc56a01..bf14fcfd2 100644
--- a/BeWo/View/Master/ReportView.xaml.cs
+++ b/BeWo/View/Master/ReportView.xaml.cs
@@ -20,6 +20,7 @@ namespace BeWo.View.Master
{
public Dictionary OpenViews { get; } = new Dictionary();
+ private bool ignoreSelectTabEvents = true;
public ReportView()
{
InitializeComponent();
@@ -293,6 +294,8 @@ namespace BeWo.View.Master
//tabitem_abwesenheitsTabelle.Visibility = Visibility.Visible;
//tabitem_dienstPlaner.Visibility = Visibility.Visible;
#endif
+
+ ignoreSelectTabEvents = false;
}
private void InitRightsAlt()
@@ -436,6 +439,8 @@ namespace BeWo.View.Master
private void tabitem_flsReport_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectFlsReportTabItem();
}
@@ -453,6 +458,8 @@ namespace BeWo.View.Master
private void tabitem_Mitarbeiter_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectMitarbeiterKoelnRing();
}
@@ -470,6 +477,8 @@ namespace BeWo.View.Master
private void tabitem_maReport_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectAuslastungReportView2();
}
@@ -488,6 +497,8 @@ namespace BeWo.View.Master
private void tabitem_maKonto_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectMitarbeiterstundenkontoTabItem();
}
@@ -505,6 +516,8 @@ namespace BeWo.View.Master
private void tabitem_abwesenheitsTabelle_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectAbwesenheitstabelleTabItem();
}
@@ -522,6 +535,8 @@ namespace BeWo.View.Master
private void tabitem_dienstPlaner_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectDienstplanerTabItem();
}
@@ -548,11 +563,15 @@ namespace BeWo.View.Master
private void tabitem_queries_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectQueriesTabItem();
}
private void tabitem_accountingreport_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
//if (!_OpenViews.ContainsKey(tabitem_accountingreport))
// _OpenViews[tabitem_accountingreport] = new AccountingReportView();
//Show(tabitem_accountingreport);
@@ -572,11 +591,15 @@ namespace BeWo.View.Master
private void tabitem_serviceOverview_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectServiceOverviewTabItem();
}
private void SelectServiceOverview2TabItem()
{
+ if (ignoreSelectTabEvents)
+ return;
tabitem_serviceOverview2.IsSelected = true;
if(!OpenViews.ContainsKey(tabitem_serviceOverview2))
@@ -589,6 +612,8 @@ namespace BeWo.View.Master
private void tabitem_serviceOverview2_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectServiceOverview2TabItem();
}
@@ -606,6 +631,8 @@ namespace BeWo.View.Master
private void tabitem_stundenzettelOverview_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectStundenzettelTabItem();
}
@@ -623,6 +650,8 @@ namespace BeWo.View.Master
private void tabitem_flexibleReport_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectFlexibleReportTabItem();
}
@@ -653,6 +682,8 @@ namespace BeWo.View.Master
private void tabitem_supportConceptAnalysis_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectSupportConceptAnalysisTabItem();
}
@@ -670,6 +701,8 @@ namespace BeWo.View.Master
private void tabitem_RatingAnalysis_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectRatingAnalysisTabItem();
}
@@ -687,6 +720,8 @@ namespace BeWo.View.Master
private void tabitem_annualReport_Selected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectAnnualReportTabItem();
}
@@ -704,6 +739,8 @@ namespace BeWo.View.Master
private void TabItemKilometerauswertung_OnSelected(object sender, RoutedEventArgs e)
{
+ if (ignoreSelectTabEvents)
+ return;
SelectKilometerauswertungTabItem();
}
diff --git a/BeWo/View/Navigation/UserGroupNavigationView.xaml b/BeWo/View/Navigation/UserGroupNavigationView.xaml
index 042888467..3451c2e14 100644
--- a/BeWo/View/Navigation/UserGroupNavigationView.xaml
+++ b/BeWo/View/Navigation/UserGroupNavigationView.xaml
@@ -1,6 +1,19 @@

-
+
\ No newline at end of file
diff --git a/BeWo/View/Navigation/UserGroupNavigationView.xaml.cs b/BeWo/View/Navigation/UserGroupNavigationView.xaml.cs
index 6197e0619..304aa5e44 100644
--- a/BeWo/View/Navigation/UserGroupNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/UserGroupNavigationView.xaml.cs
@@ -7,7 +7,7 @@ using BeWo.Core;
using BeWo.ServiceProxy;
using BeWo.View.Detail;
using BeWo.ViewModel;
-
+using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
@@ -25,7 +25,11 @@ namespace BeWo.View.Navigation
public UserGroupNavigationView()
{
InitializeComponent();
- //###CB SERIENBRIEF mainNavigationView.MailMergeButton.Visibility = Visibility.Collapsed;
+ if (BeWoApp.LoggedOnUser.HasRight(UserRightType.UserGroupView_Create))
+ {
+ mainNavigationView.btnCopy.Visibility = Visibility.Visible;
+ }
+ //###CB SERIENBRIEF mainNavigationView.MailMergeButton.Visibility = Visibility.Collapsed;
}
private void OnLoaded(object sender, RoutedEventArgs e)
@@ -109,5 +113,17 @@ namespace BeWo.View.Navigation
mainNavigationView.ShowHistory(recentList);
}
}
+
+ private void MainNavigation_CopyObject(IFilterableDC obj)
+ {
+ var dc = (UserGroupDC)obj;
+ var copy = new UserGroupDC();
+ copy.Name = "Kopie von " + dc.Name;
+ copy.Rights = dc.Rights;
+
+ this.MainControl.NavigateTo(new UserGroupView(new UserGroupVM(copy)) { ParentView = this });
+
+
+ }
}
}
\ No newline at end of file
diff --git a/BeWo/View/Report/FLSReport/FLSOverviewGrid.xaml.cs b/BeWo/View/Report/FLSReport/FLSOverviewGrid.xaml.cs
index 78bf3ad42..8e85603c8 100644
--- a/BeWo/View/Report/FLSReport/FLSOverviewGrid.xaml.cs
+++ b/BeWo/View/Report/FLSReport/FLSOverviewGrid.xaml.cs
@@ -435,6 +435,7 @@ namespace BeWo.View.Report.FLSReport
lblDate.SetValue(Grid.ColumnProperty, idx++);
lblDate.HorizontalAlignment = HorizontalAlignment.Right;
lblDate.ToolTip = this.CreateToolTip(dv);
+ ToolTipService.SetShowDuration(lblDate, 1000000);
grid.Children.Add(lblDate);
}
}
diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
index 359c270c6..19e97f07a 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
@@ -8,7 +8,7 @@
- Debug|Any CPU
+ Release|Any CPU
ShowAllFiles
600
MvcControllerEmptyScaffolder
diff --git a/Report/DefaultReports/Finanzauswertung.cs b/Report/DefaultReports/Finanzauswertung.cs
index a7bc6ca96..9fa5b56b9 100644
--- a/Report/DefaultReports/Finanzauswertung.cs
+++ b/Report/DefaultReports/Finanzauswertung.cs
@@ -25,14 +25,18 @@ namespace BeWo.Report.DefaultReports
lblTitel.Text = String.Format("Finanzauswertung {0:MMMM yyyy}", start);
cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:MMMM}", start);
cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:MMMM}", start);
+ cellGeleistetImZeitraumHeader.Text = String.Format("Fehl-\nkontakte {0:MMMM}", start);
+
+
}
else
{
lblTitel.Text = String.Format("Finanzauswertung {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
-
+ cellGeleistetImZeitraumHeader.Text = String.Format("Fehl-\nkontakte {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+
}
if (pRO.RateFactor.HasValue)
{
@@ -40,8 +44,8 @@ namespace BeWo.Report.DefaultReports
}
else
{
- cellRateFactorHeader.Visible = false;
- cellRateFactor.Visible = false;
+ //cellRateFactorHeader.Visible = false;
+ //cellRateFactor.Visible = false;
}
}
diff --git a/Report/DefaultReports/Finanzauswertung.designer.cs b/Report/DefaultReports/Finanzauswertung.designer.cs
index f163b0cd8..b891aa60d 100644
--- a/Report/DefaultReports/Finanzauswertung.designer.cs
+++ b/Report/DefaultReports/Finanzauswertung.designer.cs
@@ -38,6 +38,7 @@ namespace BeWo.Report.DefaultReports
DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary8 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary10 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -85,7 +86,6 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
@@ -98,6 +98,10 @@ namespace BeWo.Report.DefaultReports
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+ this.cellFehlkontakteHeader = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -131,7 +135,7 @@ namespace BeWo.Report.DefaultReports
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
- this.xrTable2.SizeF = new System.Drawing.SizeF(1050F, 25F);
+ this.xrTable2.SizeF = new System.Drawing.SizeF(1080F, 25F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
@@ -151,6 +155,7 @@ namespace BeWo.Report.DefaultReports
this.cellBewilligteFLSImBereich,
this.cellGeleistetImBereich,
this.cellRateFactor,
+ this.xrTableCell29,
this.xrTableCell26});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 1D;
@@ -230,17 +235,17 @@ namespace BeWo.Report.DefaultReports
this.cellBewilligteFLSImBereich.StylePriority.UseTextAlignment = false;
this.cellBewilligteFLSImBereich.Text = "cellBewilligteFLSImBereich";
this.cellBewilligteFLSImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.cellBewilligteFLSImBereich.Weight = 0.35450516993088632D;
+ this.cellBewilligteFLSImBereich.Weight = 0.31019202369719984D;
//
// cellGeleistetImBereich
//
this.cellGeleistetImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpan", "{0:0.00}")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenNichtFehlkontakteInReportTimeSpan", "{0:0.00}")});
this.cellGeleistetImBereich.Name = "cellGeleistetImBereich";
this.cellGeleistetImBereich.StylePriority.UseTextAlignment = false;
this.cellGeleistetImBereich.Text = "cellGeleistetImBereich";
this.cellGeleistetImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.cellGeleistetImBereich.Weight = 0.3545051698989734D;
+ this.cellGeleistetImBereich.Weight = 0.31019202366528686D;
//
// cellRateFactor
//
@@ -250,7 +255,7 @@ namespace BeWo.Report.DefaultReports
this.cellRateFactor.StylePriority.UseTextAlignment = false;
this.cellRateFactor.Text = "cellRateFactor";
this.cellRateFactor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.cellRateFactor.Weight = 0.35450516989897335D;
+ this.cellRateFactor.Weight = 0.31019202366528686D;
//
// xrTableCell26
//
@@ -259,7 +264,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.StylePriority.UseTextAlignment = false;
this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell26.Weight = 0.35450516989897335D;
+ this.xrTableCell26.Weight = 0.31019202365054621D;
//
// lblTitel
//
@@ -309,7 +314,7 @@ namespace BeWo.Report.DefaultReports
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
- this.xrTable1.SizeF = new System.Drawing.SizeF(1050F, 50F);
+ this.xrTable1.SizeF = new System.Drawing.SizeF(1080F, 50F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
@@ -329,6 +334,7 @@ namespace BeWo.Report.DefaultReports
this.cellBewilligtImZeitraumHeader,
this.cellGeleistetImZeitraumHeader,
this.cellRateFactorHeader,
+ this.cellFehlkontakteHeader,
this.xrTableCell25});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1.3953493323567705D;
@@ -393,7 +399,7 @@ namespace BeWo.Report.DefaultReports
this.cellBewilligtImZeitraumHeader.StylePriority.UseTextAlignment = false;
this.cellBewilligtImZeitraumHeader.Text = "bewilligte FLS";
this.cellBewilligtImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.cellBewilligtImZeitraumHeader.Weight = 0.35450516993088627D;
+ this.cellBewilligtImZeitraumHeader.Weight = 0.31019202369719978D;
//
// cellGeleistetImZeitraumHeader
//
@@ -401,7 +407,7 @@ namespace BeWo.Report.DefaultReports
this.cellGeleistetImZeitraumHeader.StylePriority.UseTextAlignment = false;
this.cellGeleistetImZeitraumHeader.Text = "geleistete FLS";
this.cellGeleistetImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.cellGeleistetImZeitraumHeader.Weight = 0.35450516989897335D;
+ this.cellGeleistetImZeitraumHeader.Weight = 0.31019202366528681D;
//
// cellRateFactorHeader
//
@@ -409,7 +415,7 @@ namespace BeWo.Report.DefaultReports
this.cellRateFactorHeader.StylePriority.UseTextAlignment = false;
this.cellRateFactorHeader.Text = "geleistete Std. x 1,2";
this.cellRateFactorHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.cellRateFactorHeader.Weight = 0.3545051698989734D;
+ this.cellRateFactorHeader.Weight = 0.31019202366528692D;
//
// xrTableCell25
//
@@ -417,7 +423,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell25.StylePriority.UseTextAlignment = false;
this.xrTableCell25.Text = "Betrag";
this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell25.Weight = 0.3545051698989734D;
+ this.xrTableCell25.Weight = 0.31019202365054621D;
//
// GroupFooter2
//
@@ -438,7 +444,7 @@ namespace BeWo.Report.DefaultReports
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow3});
- this.xrTable3.SizeF = new System.Drawing.SizeF(1050F, 25F);
+ this.xrTable3.SizeF = new System.Drawing.SizeF(1080F, 25F);
this.xrTable3.StylePriority.UseBorders = false;
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.StylePriority.UsePadding = false;
@@ -458,6 +464,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell22,
this.xrTableCell23,
this.xrTableCell24,
+ this.xrTableCell30,
this.xrTableCell27});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 1D;
@@ -559,13 +566,13 @@ namespace BeWo.Report.DefaultReports
xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell22.Summary = xrSummary6;
this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell22.Weight = 0.35450516993088632D;
+ this.xrTableCell22.Weight = 0.31019202369719984D;
//
// xrTableCell23
//
this.xrTableCell23.CanGrow = false;
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpan")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenNichtFehlkontakteInReportTimeSpan")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.StylePriority.UseTextAlignment = false;
xrSummary7.FormatString = "{0:0.00}";
@@ -573,7 +580,7 @@ namespace BeWo.Report.DefaultReports
xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell23.Summary = xrSummary7;
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell23.Weight = 0.3545051698989734D;
+ this.xrTableCell23.Weight = 0.31019202366528686D;
//
// xrTableCell24
//
@@ -587,7 +594,7 @@ namespace BeWo.Report.DefaultReports
xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell24.Summary = xrSummary8;
this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell24.Weight = 0.35450516989897335D;
+ this.xrTableCell24.Weight = 0.31019202366528686D;
//
// xrTableCell27
//
@@ -595,15 +602,11 @@ namespace BeWo.Report.DefaultReports
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableAmountInReportTimeSpan")});
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.StylePriority.UseTextAlignment = false;
- xrSummary9.FormatString = "{0:c}";
- xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
- this.xrTableCell27.Summary = xrSummary9;
+ xrSummary10.FormatString = "{0:c}";
+ xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell27.Summary = xrSummary10;
this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell27.Weight = 0.35450516989897335D;
- //
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
+ this.xrTableCell27.Weight = 0.31019202365054621D;
//
// ReportHeader
//
@@ -624,9 +627,9 @@ namespace BeWo.Report.DefaultReports
//
this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo2.Format = "Seite {0} von {1}";
- this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(969.9999F, 25F);
+ this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(940F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
- this.xrPageInfo2.SizeF = new System.Drawing.SizeF(79.99982F, 23F);
+ this.xrPageInfo2.SizeF = new System.Drawing.SizeF(140F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
@@ -706,6 +709,40 @@ namespace BeWo.Report.DefaultReports
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
+ // cellFehlkontakteHeader
+ //
+ this.cellFehlkontakteHeader.Multiline = true;
+ this.cellFehlkontakteHeader.Name = "cellFehlkontakteHeader";
+ this.cellFehlkontakteHeader.StylePriority.UseTextAlignment = false;
+ this.cellFehlkontakteHeader.Text = "Fehl-\r\nkontakte";
+ this.cellFehlkontakteHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.cellFehlkontakteHeader.Weight = 0.31019202365054621D;
+ //
+ // xrTableCell29
+ //
+ this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenFehlkontakteInReportTimeSpan", "{0:0.00}")});
+ this.xrTableCell29.Name = "xrTableCell29";
+ this.xrTableCell29.StylePriority.UseTextAlignment = false;
+ this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell29.Weight = 0.31019202365054616D;
+ //
+ // xrTableCell30
+ //
+ this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenFehlkontakteInReportTimeSpan")});
+ this.xrTableCell30.Name = "xrTableCell30";
+ this.xrTableCell30.StylePriority.UseTextAlignment = false;
+ xrSummary9.FormatString = "{0:0.00}";
+ xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell30.Summary = xrSummary9;
+ this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell30.Weight = 0.31019202365054616D;
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
+ //
// Finanzauswertung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -718,7 +755,7 @@ namespace BeWo.Report.DefaultReports
this.ReportFooter});
this.DataSource = this.bindingSource1;
this.Landscape = true;
- this.Margins = new System.Drawing.Printing.Margins(55, 55, 50, 30);
+ this.Margins = new System.Drawing.Printing.Margins(45, 40, 50, 30);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -797,5 +834,8 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
+ private DevExpress.XtraReports.UI.XRTableCell cellFehlkontakteHeader;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
}
}
diff --git a/Report/ReportObjects/FinanceRO.cs b/Report/ReportObjects/FinanceRO.cs
index 07dbac41a..199953083 100644
--- a/Report/ReportObjects/FinanceRO.cs
+++ b/Report/ReportObjects/FinanceRO.cs
@@ -14,6 +14,7 @@ using BeWo.Service.Plugins;
using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Services;
+using System.Text;
namespace BeWo.Report.ReportObjects
{
@@ -48,13 +49,21 @@ namespace BeWo.Report.ReportObjects
public decimal BillableHours { get; set; }
- public decimal ApprovedHoursInReportTimeSpan { get; set; }
+ public decimal StundenNichtFehlkontakte { get; set; }
+
+ public decimal StundenFehlkontakte { get; set; }
+
+ public decimal ApprovedHoursInReportTimeSpan { get; set; }
public decimal BillableHoursInReportTimeSpan { get; set; }
public decimal BillableHoursInReportTimeSpanWithFactor { get; set; }
- public decimal BillableAmountInReportTimeSpan { get; set; }
+ public decimal StundenNichtFehlkontakteInReportTimeSpan { get; set; }
+
+ public decimal StundenFehlkontakteInReportTimeSpan { get; set; }
+
+ public decimal BillableAmountInReportTimeSpan { get; set; }
public decimal BillableAmountUntilNow { get; set; }
@@ -64,6 +73,10 @@ namespace BeWo.Report.ReportObjects
public decimal? AmountInReportTimeSpan { get; set; }
+ public decimal? AmountNichtFehlkontakteInReportTimeSpan { get; set; }
+
+ public decimal? AmountFehlkontakteInReportTimeSpan { get; set; }
+
public List ServiceRecords { get; set; }
public bool IsApproved { get; set; }
@@ -107,7 +120,10 @@ namespace BeWo.Report.ReportObjects
var service = new AnalysisServiceImp();
var financeList = service.GetOutstandingReceivables(false, false, start, end);
-
+
+
+
+
foreach (var item in financeList)
{
if (item.SupportConcept != null && item.SupportConcept.ActivationType != ActivationTypeId.Deleted)
@@ -121,234 +137,27 @@ namespace BeWo.Report.ReportObjects
{
continue; // Ãœberspringen, wenn nur die NICHT bewilligten angezeigt werden sollen.
}
-
- var costRateDcs = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(cb2sc.CostBearer.CostRatePeriods);
- var calc = Calculations.GetInstance(cb2sc.CostBearer.ID);
+
if (splitByServiceCategory)
{
- var allRecords = cb2sc.ServiceRecords.MapToNewDCs();
+
foreach (var scap in cb2sc.ApprovalPeriodList)
{
var scapDC = MapperFactory.SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod.MapToNewDC(scap);
- var ro = new SupportConceptFinanceRO();
-
- ro.CustomerName = item.CustomerName;
- ro.SupportConceptTimeSpanString = item.SupportConceptTimeSpanString;
- ro.CostBearerName = item.CostBearerName;
-
- ro.AmountTotal = item.AmountTotal;
- ro.AmountPaid = item.AmountPaid;
- ro.OpenAmount = item.OpenAmount;
-
-
- ro.Costbearer2Supportconcept = relDC;
- ro.IsApproved = istBewilligt;
-
-
- ro.SupportConceptApprovalPeriod = scapDC;
-
- if (scap.ServiceCategory != null)
- {
- ro.Leistungskategorie = scap.ServiceCategory.Name;
- ro.ServiceRecords = allRecords.Where(sr =>
- sr.ServiceDescription.Category.ServiceCategoryOid == scap.ServiceCategory.Oid)
- .ToList();
- }
- else
- {
- ro.ServiceRecords = allRecords;
- }
-
-
-
-
-
-
- if (end.HasValue && end < DateTime.MaxValue.AddDays(-1))
- {
- ro.ApprovedHours = calc.GetApprovedHoursTillNow(scapDC, costRateDcs, end.Value, true) ?? 0;
-
- ro.BillableHours = calc.GetBillableDurationInMinutes(ro.ServiceRecords.Where(sr => sr.Start.Value.Date < end.Value.AddDays(1)).ToList()) / 60;
- }
- else
- {
- ro.ApprovedHours = calc.GetApprovedHoursTillNow(scapDC, costRateDcs, null, true) ?? 0;
- ro.BillableHours = calc.GetBillableDurationInMinutes(ro.ServiceRecords) / 60;
- }
-
-
-
- if (start.HasValue && end.HasValue)
- {
-
- var rfcrEnd = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, end.Value);
- if (rfcrEnd != null && rfcrEnd.CostRateValue.HasValue)
- {
- ro.RateFactor = (rfcrEnd.CostRateValue.Value + 100m) / 100m;
-
- if (!result.RateFactor.HasValue)
- {
- result.RateFactor = ro.RateFactor;
- }
- }
-
- var hcrEnd = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, end.Value);
- if (hcrEnd != null && hcrEnd.CostRateValue.HasValue)
- {
-
- ro.HourlyRate = hcrEnd.CostRateValue.Value;
- }
- ro.ApprovedHoursInReportTimeSpan = calc.GetApprovedHoursForPeriod(scapDC, costRateDcs, start, end) ?? 0;
-
-
- ro.AmountInReportTimeSpan = 0;
- foreach (var srDc in ro.ServiceRecords)
- {
- if (srDc.Start >= start && srDc.Start.Value.Date <= end.Value.Date)
- {
-
- var billable = calc.GetBillableDurationInMinutes(srDc, true) / 60;
- ro.BillableHoursInReportTimeSpan += billable;
-
- var rfcr = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, srDc.Start.Value);
- if (rfcr != null && rfcr.CostRateValue.HasValue)
- {
- var billableRateFactor = billable * (rfcr.CostRateValue.Value + 100m) / 100m;
- ro.BillableHoursInReportTimeSpanWithFactor += billableRateFactor;
-
- billable = billableRateFactor;
- }
-
- decimal stundensatz = 0;
-
- var hcr = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, srDc.Start.Value);
- if (hcr != null && hcr.CostRateValue.HasValue)
- {
- stundensatz = hcr.CostRateValue.Value;
- }
-
- var betrag = billable * stundensatz;
-
- ro.AmountInReportTimeSpan += betrag;
- }
- }
-
-
-
-
- }
-
-
+ var ro = CreateSupportConceptFinanceRO(item, relDC, scapDC);
+ // 1.
result.SupportConceptFinanceList.Add(ro);
}
}
else
{
- var ro = new SupportConceptFinanceRO();
-
- ro.CustomerName = item.CustomerName;
- ro.SupportConceptTimeSpanString = item.SupportConceptTimeSpanString;
- ro.CostBearerName = item.CostBearerName;
-
- ro.AmountTotal = item.AmountTotal;
- ro.AmountPaid = item.AmountPaid;
- ro.OpenAmount = item.OpenAmount;
-
- ro.ServiceRecords = cb2sc.ServiceRecords.MapToNewDCs();
-
- ro.Costbearer2Supportconcept = relDC;
- ro.IsApproved = (relDC.ApprovedEndDate.HasValue || relDC.ApprovedStartDate.HasValue);
-
-
-
-
- if (end.HasValue && end < DateTime.MaxValue.AddDays(-1))
- {
- ro.ApprovedHours = calc.GetApprovedHoursTillNow(relDC, end.Value) ?? 0;
- //ro.ApprovedHours = calc.GetApprovedHoursTillNow(relDC, null) ?? 0;
- ro.BillableHours =
- calc.GetBillableDurationInMinutes(ro.ServiceRecords.Where(sr => sr.Start.Value.Date < end.Value.AddDays(1)).ToList()) / 60;
- }
- else
- {
- ro.ApprovedHours = calc.GetApprovedHoursTillNow(relDC, null) ?? 0;
- ro.BillableHours = calc.GetBillableDurationInMinutes(ro.ServiceRecords) / 60;
- }
-
-
-
- if (start.HasValue && end.HasValue)
- {
- var rfcrEnd = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, end.Value);
- if (rfcrEnd != null && rfcrEnd.CostRateValue.HasValue)
- {
- ro.RateFactor = (rfcrEnd.CostRateValue.Value + 100m) / 100m;
-
- if (!result.RateFactor.HasValue)
- {
- result.RateFactor = ro.RateFactor;
- }
- }
-
- var hcrEnd = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, end.Value);
- if (hcrEnd != null && hcrEnd.CostRateValue.HasValue)
- {
-
- ro.HourlyRate = hcrEnd.CostRateValue.Value;
- }
- ro.ApprovedHoursInReportTimeSpan = calc.GetApprovedHoursForPeriod(relDC, start.Value, end.Value);
-
- //ro.BillableHoursInReportTimeSpan =
- // calc.GetBillableDurationInMinutes(
- // cb2sc.ServiceRecords.Where(sr => sr.Start >= start && sr.Start.Value.Date <= end.Value.Date).ToList().
- // MapToNewDCs())/60;
-
-
-
-
- ro.AmountInReportTimeSpan = 0;
- foreach (var serviceRecordtemp in cb2sc.ServiceRecords)
- {
- if (serviceRecordtemp.Start >= start && serviceRecordtemp.Start.Value.Date <= end.Value.Date)
- {
- var dc = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(serviceRecordtemp);
-
- var billable = calc.GetBillableDurationInMinutes(dc, true) / 60;
- ro.BillableHoursInReportTimeSpan += billable;
-
- var rfcr = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, serviceRecordtemp.Start.Value);
- if (rfcr != null && rfcr.CostRateValue.HasValue)
- {
- var billableRateFactor = billable * (rfcr.CostRateValue.Value + 100m) / 100m;
- ro.BillableHoursInReportTimeSpanWithFactor += billableRateFactor;
-
- billable = billableRateFactor;
- }
-
- decimal stundensatz = 0;
-
- var hcr = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, serviceRecordtemp.Start.Value);
- if (hcr != null && hcr.CostRateValue.HasValue)
- {
- stundensatz = hcr.CostRateValue.Value;
- }
-
- var betrag = billable * stundensatz;
-
- ro.AmountInReportTimeSpan += betrag;
- }
- }
-
-
-
-
- }
-
-
+ var ro = CreateSupportConceptFinanceRO(item, relDC, null);
+
+ //2
result.SupportConceptFinanceList.Add(ro);
}
@@ -356,9 +165,317 @@ namespace BeWo.Report.ReportObjects
}
}
- return result;
+ StringBuilder oidList = new StringBuilder();
+ foreach (var ro in result.SupportConceptFinanceList)
+ {
+ if (oidList.Length > 0)
+ {
+ oidList.Append(",");
+ }
+ oidList.Append(ro.Costbearer2Supportconcept.CostBearer2SupportConceptOid);
+ }
+
+
+ var allServiceDescs = DAOFactory.GenericDAO.GetAll();
+ Dictionary serviceDict = new Dictionary();
+ foreach (var item in allServiceDescs)
+ {
+ serviceDict.Add(item.Oid.Value, MapperFactory.ServiceDescriptionDC_ServiceDescription.MapToNewDC(item));
+ }
+
+ var cs2ServiceRecords = new Dictionary>();
+
+ if (oidList.Length > 0)
+ {
+ String sql = "SELECT Oid, Version, StartDate, EndDate, DistanceInMeter, CostBearer2SupportConceptOid, Betrag, ServiceDescriptionOid, RoundedDuration, GroupEmployeeCount, GroupPersonCount, GroupRoundedDuration, GroupOid FROM servicerecord";
+ if (oidList.Length > 0)
+ {
+ sql += String.Format(" WHERE CostBearer2SupportConceptOid in ({0})", oidList.ToString());
+ }
+ else
+ {
+ sql += " WHERE CostBearer2SupportConceptOid is not null";
+ }
+
+ var sqlresult = DAOFactory.SearchDAO.GetSqlResult(sql);
+ //
+ //update customer set debitornumber = '5' + debitornumber where debitornumber is not null
+ foreach (object[] srRow in sqlresult)
+ {
+ var sr = CreateServiceRecordDC2(srRow, serviceDict);
+ if (sr.CostBearer2SupportConceptOid.HasValue)
+ {
+ if (!cs2ServiceRecords.ContainsKey(sr.CostBearer2SupportConceptOid.Value))
+ {
+ cs2ServiceRecords.Add(sr.CostBearer2SupportConceptOid.Value, new List());
+ }
+ cs2ServiceRecords[sr.CostBearer2SupportConceptOid.Value].Add(sr);
+ }
+ }
+ }
+
+ foreach (var ro in result.SupportConceptFinanceList)
+ {
+ var cb2sc = ro.Costbearer2Supportconcept;
+ var costRateDcs = cb2sc.CostBearer.CostRatePeriods;
+ var calc = Calculations.GetInstance(cb2sc.CostBearer.CostBearerID);
+ List records = null;
+
+ if (cs2ServiceRecords.ContainsKey(cb2sc.CostBearer2SupportConceptOid.Value))
+ {
+ records = cs2ServiceRecords[cb2sc.CostBearer2SupportConceptOid.Value];
+ }
+ else
+ {
+ records = new List();
+ }
+
+
+ //1.
+ if (ro.SupportConceptApprovalPeriod != null && ro.SupportConceptApprovalPeriod.ServiceCategory != null)
+ {
+ ro.Leistungskategorie = ro.SupportConceptApprovalPeriod.ServiceCategory.Name;
+ ro.ServiceRecords = records.Where(sr =>
+ sr.ServiceDescription.Category.ServiceCategoryOid == ro.SupportConceptApprovalPeriod.ServiceCategory.ServiceCategoryOid)
+ .ToList();
+ }
+ else
+ {
+ ro.ServiceRecords = records;
+ }
+
+ var fkRecords = new List();
+ var flsRecords = new List();
+
+ foreach (var sr in ro.ServiceRecords)
+ {
+ sr.Employee = new CompactEmployeeDC { ValueListEntries = new Dictionary() }; // hack, damit später bei der Berechnung des Betrags kein Fehler kommt
+ sr.CostBearer = cb2sc.CostBearer;
+
+ if (sr.ServiceDescription.Name.ToLower().Contains("fehlkontakt") || sr.ServiceDescription.Category.Name.ToLower().Contains("fehlkontakt") || (sr.ServiceDescription.ProzentAbrechnung.HasValue && sr.ServiceDescription.ProzentAbrechnung.Value < 100))
+ {
+ fkRecords.Add(sr);
+ }
+ else
+ {
+ flsRecords.Add(sr);
+ }
+ }
+
+ //Fehlkontakte
+ if (end.HasValue && end < DateTime.MaxValue.AddDays(-1))
+ {
+ if (ro.SupportConceptApprovalPeriod != null)
+ {
+ ro.ApprovedHours = calc.GetApprovedHoursTillNow(ro.SupportConceptApprovalPeriod, costRateDcs, end.Value, true) ?? 0;
+ }
+ else
+ {
+ ro.ApprovedHours = calc.GetApprovedHoursTillNow(ro.Costbearer2Supportconcept, end.Value) ?? 0;
+ }
+ ro.StundenNichtFehlkontakte = calc.GetBillableDurationInMinutes(flsRecords.Where(sr => sr.Start.Value.Date < end.Value.AddDays(1)).ToList()) / 60;
+ ro.StundenFehlkontakte = calc.GetBillableDurationInMinutes(fkRecords.Where(sr => sr.Start.Value.Date < end.Value.AddDays(1)).ToList()) / 60;
+
+
+ }
+ else
+ {
+ if (ro.SupportConceptApprovalPeriod != null)
+ {
+ ro.ApprovedHours = calc.GetApprovedHoursTillNow(ro.SupportConceptApprovalPeriod, costRateDcs, null, true) ?? 0;
+ }
+ else
+ {
+ ro.ApprovedHours = calc.GetApprovedHoursTillNow(ro.Costbearer2Supportconcept, null) ?? 0;
+ }
+
+ ro.StundenNichtFehlkontakte = calc.GetBillableDurationInMinutes(flsRecords) / 60;
+ ro.StundenFehlkontakte = calc.GetBillableDurationInMinutes(fkRecords) / 60;
+ }
+
+ ro.BillableHours = ro.StundenNichtFehlkontakte + ro.StundenFehlkontakte;
+
+ if (start.HasValue && end.HasValue)
+ {
+ var rfcrEnd = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, end.Value);
+ if (rfcrEnd != null && rfcrEnd.CostRateValue.HasValue)
+ {
+ ro.RateFactor = (rfcrEnd.CostRateValue.Value + 100m) / 100m;
+
+ if (!result.RateFactor.HasValue)
+ {
+ result.RateFactor = ro.RateFactor;
+ }
+ }
+
+ var hcrEnd = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, end.Value);
+ if (hcrEnd != null && hcrEnd.CostRateValue.HasValue)
+ {
+
+ ro.HourlyRate = hcrEnd.CostRateValue.Value;
+ }
+ if (ro.SupportConceptApprovalPeriod != null)
+ {
+ ro.ApprovedHoursInReportTimeSpan = calc.GetApprovedHoursForPeriod(ro.SupportConceptApprovalPeriod, costRateDcs, start, end) ?? 0;
+ }
+ else
+ {
+ ro.ApprovedHoursInReportTimeSpan = calc.GetApprovedHoursForPeriod(ro.Costbearer2Supportconcept, start.Value, end.Value);
+ }
+
+
+ ro.AmountInReportTimeSpan = 0;
+ ro.AmountNichtFehlkontakteInReportTimeSpan = 0;
+ ro.AmountFehlkontakteInReportTimeSpan = 0;
+
+ foreach (var srDc in flsRecords)
+ {
+ if (srDc.Start >= start && srDc.Start.Value.Date <= end.Value.Date)
+ {
+
+ var billable = calc.GetBillableDurationInMinutes(srDc, false) / 60;
+ ro.StundenNichtFehlkontakteInReportTimeSpan += billable;
+
+ var rfcr = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, srDc.Start.Value);
+ if (rfcr != null && rfcr.CostRateValue.HasValue)
+ {
+ var billableRateFactor = billable * (rfcr.CostRateValue.Value + 100m) / 100m;
+ ro.BillableHoursInReportTimeSpanWithFactor += billableRateFactor;
+
+ billable = billableRateFactor;
+ }
+
+ decimal stundensatz = 0;
+
+ var hcr = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, srDc.Start.Value);
+ if (hcr != null && hcr.CostRateValue.HasValue)
+ {
+ stundensatz = hcr.CostRateValue.Value;
+ }
+
+ var betrag = billable * stundensatz;
+
+ ro.AmountNichtFehlkontakteInReportTimeSpan += betrag;
+ }
+ }
+
+
+ //Fehlkontakte
+ foreach (var srDc in fkRecords)
+ {
+ if (srDc.Start >= start && srDc.Start.Value.Date <= end.Value.Date)
+ {
+
+ var billable = calc.GetBillableDurationInMinutes(srDc, false) / 60;
+ ro.StundenFehlkontakteInReportTimeSpan += billable;
+
+
+ decimal stundensatz = 0;
+
+ var hcr = costRateDcs.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, srDc.Start.Value);
+ if (hcr != null && hcr.CostRateValue.HasValue)
+ {
+ stundensatz = hcr.CostRateValue.Value;
+ }
+
+ if (srDc.ServiceDescription.ProzentAbrechnung.HasValue && srDc.ServiceDescription.ProzentAbrechnung.Value < 100)
+ {
+ stundensatz *= (srDc.ServiceDescription.ProzentAbrechnung.Value / 100);
+ }
+
+ var betrag = billable * stundensatz;
+
+ ro.AmountFehlkontakteInReportTimeSpan += betrag;
+ }
+ }
+ ro.BillableHoursInReportTimeSpan = ro.StundenNichtFehlkontakteInReportTimeSpan + ro.StundenFehlkontakteInReportTimeSpan;
+ ro.AmountInReportTimeSpan = (ro.AmountNichtFehlkontakteInReportTimeSpan ?? 0) + (ro.AmountFehlkontakteInReportTimeSpan ?? 0);
+
+ }
+
+
+
+ }
+
+
+
+ return result;
}
+ private static ServiceRecordDC CreateServiceRecordDC2(object[] sqlRow, Dictionary serviceDict)
+ {
+ try
+ {
+ var dc = new ServiceRecordDC();
+
+
+ //DAOFactory.SearchDAO.GetSqlResult("SELECT Oid, Version, Start, End, DistanceInMeter, CostBearer2SupportConceptOid, Betrag, ServiceDescriptionOid, RoundedDuration, GroupEmployeeCount, GroupPersonCount, GroupRoundedDuration, GroupOid FROM servicerecord");
+
+
+ dc.ServiceRecordOid = (long?)sqlRow[0];
+ dc.ServiceRecordVersion = (long?)sqlRow[1];
+ dc.Start = (DateTime?)sqlRow[2];
+ dc.End = (DateTime?)sqlRow[3];
+
+ var test = sqlRow[4];
+ if (test != null)
+ {
+ decimal meter = 0;
+
+ if (Decimal.TryParse(test.ToString(), out meter))
+ {
+ dc.DistanceInMeterDecimal = meter;
+ }
+ }
+
+ if (dc.DistanceInMeterDecimal.HasValue)
+ {
+ dc.DistanceInMeter = (int)dc.DistanceInMeterDecimal;
+ }
+ dc.CostBearer2SupportConceptOid = (long?)sqlRow[5];
+ dc.Betrag = (decimal?)sqlRow[6];
+
+ long? sdOid = (long?)sqlRow[7];
+ if (sdOid.HasValue && serviceDict.ContainsKey(sdOid.Value))
+ {
+ dc.ServiceDescription = serviceDict[sdOid.Value];
+ }
+ dc.RoundedDuration = (decimal)sqlRow[8];
+
+ dc.GroupEmployeeCount = (int?)sqlRow[9];
+ dc.GroupPersonCount = (int?)sqlRow[10];
+ dc.GroupRoundedDuration = (decimal?)sqlRow[11];
+ dc.GroupOid = (long?)sqlRow[12];
+
+ return dc;
+ }
+ catch (Exception e)
+ {
+
+ throw;
+ }
+
+ }
+
+ private static SupportConceptFinanceRO CreateSupportConceptFinanceRO(FinanceOverviewItemDC item, SupportConceptCostBearerRelDC relDc, SupportConceptApprovalPeriodDC scapDc)
+ {
+ var ro = new SupportConceptFinanceRO();
+
+ ro.CustomerName = item.CustomerName;
+ ro.SupportConceptTimeSpanString = item.SupportConceptTimeSpanString;
+ ro.CostBearerName = item.CostBearerName;
+
+ ro.AmountTotal = item.AmountTotal;
+ ro.AmountPaid = item.AmountPaid;
+ ro.OpenAmount = item.OpenAmount;
+
+ ro.Costbearer2Supportconcept = relDc;
+ ro.SupportConceptApprovalPeriod = scapDc;
+
+ ro.IsApproved = (relDc.ApprovedEndDate.HasValue || relDc.ApprovedStartDate.HasValue);
+
+ return ro;
+ }
public void CalculateBillableAmountInReportTimeSpan()
{
if (this.SupportConceptFinanceList != null)
diff --git a/ReportImp/AlphaEv/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/AlphaEv/CustomMitarbeiterstundenkontoBerechnung.cs
index 0520c73eb..9ec2762b2 100644
--- a/ReportImp/AlphaEv/CustomMitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/AlphaEv/CustomMitarbeiterstundenkontoBerechnung.cs
@@ -421,6 +421,18 @@ namespace AlphaEv
return sum;
}
+ protected override decimal BerechneFlsSoll(Employee emp, Contract contract, DateTime berichtsAnfang, DateTime berichtsEnde, decimal tatSollStdImVertragsUndBerichtzeitraum, decimal? stundenSollProMonat)
+ {
+ var soll = base.BerechneFlsSoll(emp, contract, berichtsAnfang, berichtsEnde, tatSollStdImVertragsUndBerichtzeitraum, stundenSollProMonat);
+
+ if (soll == 0)
+ {
+ soll = tatSollStdImVertragsUndBerichtzeitraum * 0.75m;
+ }
+
+ return soll;
+ }
+
public override bool ShouldCreateDayDetails()
{
return true;
diff --git a/ReportImp/DiakonieKKKleve/DiakonieKKKleve.csproj b/ReportImp/DiakonieKKKleve/DiakonieKKKleve.csproj
index 276fea611..3ef7f0675 100644
--- a/ReportImp/DiakonieKKKleve/DiakonieKKKleve.csproj
+++ b/ReportImp/DiakonieKKKleve/DiakonieKKKleve.csproj
@@ -88,6 +88,12 @@
AllgemeineRechnung.cs
+
+ Component
+
+
+ FinanzauswertungFehlkontakte.cs
+
Component
@@ -236,6 +242,9 @@
FinanzauswertungAb.cs
+
+ FinanzauswertungFehlkontakte.cs
+
FinanzauswertungSozi.cs
diff --git a/ReportImp/DiakonieKKKleve/Finanzauswertung.cs b/ReportImp/DiakonieKKKleve/Finanzauswertung.cs
index 7de6458b4..ec1f817ce 100644
--- a/ReportImp/DiakonieKKKleve/Finanzauswertung.cs
+++ b/ReportImp/DiakonieKKKleve/Finanzauswertung.cs
@@ -50,6 +50,13 @@ namespace BeWo.DiakonieKKKleve
RateFactor = pRO.RateFactor,
SupportConceptFinanceList = new List()
};
+ var roFehlKontakte = new FinanceRO
+ {
+ ReportStartDate = pRO.ReportStartDate,
+ ReportEndDate = pRO.ReportEndDate,
+ RateFactor = pRO.RateFactor,
+ SupportConceptFinanceList = new List()
+ };
var roAls = new FinanceRO
{
ReportStartDate = pRO.ReportStartDate,
@@ -171,12 +178,14 @@ namespace BeWo.DiakonieKKKleve
if (f.RateFactor.HasValue && f.RateFactor > 1)
{
roFls.SupportConceptFinanceList.Add(f);
+ CheckFehlkontakte(f, roFls, roFehlKontakte);
}
else
{
if (f.ServiceRecords != null && f.ServiceRecords.Any(sr => sr.ServiceDescription.CategoryName.Contains("FLS")))
{
roFls.SupportConceptFinanceList.Add(f);
+ CheckFehlkontakte(f, roFls, roFehlKontakte);
}
else
{
@@ -191,6 +200,9 @@ namespace BeWo.DiakonieKKKleve
var flsReport = subReportFls.ReportSource as FinanzauswertungFls;
flsReport.SetReportDataSource(roFls);
+ var fkReport = subReportFehlkontakte.ReportSource as FinanzauswertungFehlkontakte;
+ fkReport.SetReportDataSource(roFehlKontakte);
+
var alsReport = subReportAls.ReportSource as FinanzauswertungAls;
alsReport.SetReportDataSource(roAls);
@@ -211,6 +223,30 @@ namespace BeWo.DiakonieKKKleve
this.bindingSource1.DataSource = pRO;
}
+ private void CheckFehlkontakte(FinanceRO.SupportConceptFinanceRO f, FinanceRO roFls, FinanceRO roFehlKontakte)
+ {
+ if (f.StundenFehlkontakteInReportTimeSpan > 0)
+ {
+ var fkRo = new FinanceRO.SupportConceptFinanceRO();
+ fkRo.BillableHours = f.BillableHours;
+ fkRo.StundenFehlkontakte = f.StundenFehlkontakte;
+ fkRo.StundenNichtFehlkontakte = f.StundenNichtFehlkontakte;
+ fkRo.StundenFehlkontakteInReportTimeSpan = f.StundenFehlkontakteInReportTimeSpan;
+ fkRo.StundenNichtFehlkontakteInReportTimeSpan = f.StundenNichtFehlkontakteInReportTimeSpan;
+ fkRo.AmountFehlkontakteInReportTimeSpan = f.AmountFehlkontakteInReportTimeSpan;
+ fkRo.AmountNichtFehlkontakteInReportTimeSpan = f.AmountNichtFehlkontakteInReportTimeSpan;
+ fkRo.CostBearerName = f.CostBearerName;
+ fkRo.CustomerName = f.CustomerName;
+ fkRo.SupportConceptTimeSpanString = f.SupportConceptTimeSpanString;
+ fkRo.Costbearer2Supportconcept = f.Costbearer2Supportconcept;
+ fkRo.ApprovedHours = f.ApprovedHours;
+ fkRo.ApprovedHoursInReportTimeSpan = f.ApprovedHoursInReportTimeSpan;
+ fkRo.AmountInReportTimeSpan = f.AmountInReportTimeSpan;
+
+ roFehlKontakte.SupportConceptFinanceList.Add(f);
+ }
+
+ }
}
}
diff --git a/ReportImp/DiakonieKKKleve/Finanzauswertung.designer.cs b/ReportImp/DiakonieKKKleve/Finanzauswertung.designer.cs
index 90c844d73..5f62d7afd 100644
--- a/ReportImp/DiakonieKKKleve/Finanzauswertung.designer.cs
+++ b/ReportImp/DiakonieKKKleve/Finanzauswertung.designer.cs
@@ -48,8 +48,8 @@ namespace BeWo.DiakonieKKKleve
this.parameter1 = new DevExpress.XtraReports.Parameters.Parameter();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.subReportFls = new DevExpress.XtraReports.UI.XRSubreport();
- this.subReportAls = new DevExpress.XtraReports.UI.XRSubreport();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.subReportAls = new DevExpress.XtraReports.UI.XRSubreport();
this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.subReportPflege = new DevExpress.XtraReports.UI.XRSubreport();
this.GroupHeader4 = new DevExpress.XtraReports.UI.GroupHeaderBand();
@@ -58,6 +58,8 @@ namespace BeWo.DiakonieKKKleve
this.subReportAb = new DevExpress.XtraReports.UI.XRSubreport();
this.GroupHeader6 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.subReportSozi = new DevExpress.XtraReports.UI.XRSubreport();
+ this.GroupHeader7 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.subReportFehlkontakte = new DevExpress.XtraReports.UI.XRSubreport();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
@@ -194,7 +196,7 @@ namespace BeWo.DiakonieKKKleve
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.subReportFls});
this.GroupHeader1.HeightF = 20F;
- this.GroupHeader1.Level = 5;
+ this.GroupHeader1.Level = 6;
this.GroupHeader1.Name = "GroupHeader1";
//
// subReportFls
@@ -204,13 +206,6 @@ namespace BeWo.DiakonieKKKleve
this.subReportFls.ReportSource = new BeWo.DiakonieKKKleve.FinanzauswertungFls();
this.subReportFls.SizeF = new System.Drawing.SizeF(1069F, 20F);
//
- // subReportAls
- //
- this.subReportAls.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.subReportAls.Name = "subReportAls";
- this.subReportAls.ReportSource = new BeWo.DiakonieKKKleve.FinanzauswertungAls();
- this.subReportAls.SizeF = new System.Drawing.SizeF(1069F, 20F);
- //
// GroupHeader2
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -220,6 +215,13 @@ namespace BeWo.DiakonieKKKleve
this.GroupHeader2.Name = "GroupHeader2";
this.GroupHeader2.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand;
//
+ // subReportAls
+ //
+ this.subReportAls.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.subReportAls.Name = "subReportAls";
+ this.subReportAls.ReportSource = new BeWo.DiakonieKKKleve.FinanzauswertungAls();
+ this.subReportAls.SizeF = new System.Drawing.SizeF(1069F, 20F);
+ //
// GroupHeader3
//
this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -283,6 +285,22 @@ namespace BeWo.DiakonieKKKleve
this.subReportSozi.ReportSource = new BeWo.DiakonieKKKleve.FinanzauswertungSozi();
this.subReportSozi.SizeF = new System.Drawing.SizeF(1069F, 20F);
//
+ // GroupHeader7
+ //
+ this.GroupHeader7.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.subReportFehlkontakte});
+ this.GroupHeader7.HeightF = 20F;
+ this.GroupHeader7.Level = 5;
+ this.GroupHeader7.Name = "GroupHeader7";
+ this.GroupHeader7.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand;
+ //
+ // subReportFehlkontakte
+ //
+ this.subReportFehlkontakte.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.subReportFehlkontakte.Name = "subReportFehlkontakte";
+ this.subReportFehlkontakte.ReportSource = new BeWo.DiakonieKKKleve.FinanzauswertungFehlkontakte();
+ this.subReportFehlkontakte.SizeF = new System.Drawing.SizeF(1069F, 20F);
+ //
// Finanzauswertung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -296,7 +314,8 @@ namespace BeWo.DiakonieKKKleve
this.GroupHeader3,
this.GroupHeader4,
this.GroupHeader5,
- this.GroupHeader6});
+ this.GroupHeader6,
+ this.GroupHeader7});
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new System.Drawing.Printing.Margins(50, 50, 50, 30);
@@ -347,5 +366,7 @@ namespace BeWo.DiakonieKKKleve
private DevExpress.XtraReports.UI.XRSubreport subReportAb;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader6;
private DevExpress.XtraReports.UI.XRSubreport subReportSozi;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader7;
+ private DevExpress.XtraReports.UI.XRSubreport subReportFehlkontakte;
}
}
diff --git a/ReportImp/DiakonieKKKleve/FinanzauswertungFehlkontakte.cs b/ReportImp/DiakonieKKKleve/FinanzauswertungFehlkontakte.cs
new file mode 100644
index 000000000..545fca0fb
--- /dev/null
+++ b/ReportImp/DiakonieKKKleve/FinanzauswertungFehlkontakte.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Linq;
+using BS.Shared;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BeWo.Data.Entities;
+using BeWo.Data.Access;
+using System.Collections.Generic;
+using BS.Shared.Core;
+using BS.Shared.Services;
+using BS.Shared.DataContracts;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.ServiceImplementations;
+
+namespace BeWo.DiakonieKKKleve
+{
+ public partial class FinanzauswertungFehlkontakte : DevExpress.XtraReports.UI.XtraReport, IBeWoReport
+ {
+ public FinanzauswertungFehlkontakte()
+ {
+ InitializeComponent();
+ }
+
+ public void SetReportDataSource(FinanceRO pRO)
+ {
+ if (pRO.ReportStartDate.HasValue && pRO.ReportEndDate.HasValue)
+ {
+ DateTime start = pRO.ReportStartDate.Value;
+ DateTime end = pRO.ReportEndDate.Value;
+
+ if (start.Year == end.Year && start.Month == end.Month && start.Day == 1 &&
+ end.Day == DateTime.DaysInMonth(end.Year, end.Month))
+ {
+ cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:MMM. yyyy}", start);
+ cellGeleistetImZeitraumHeader.Text = String.Format("Fehlkontakte {0:MMM. yyyy}", start);
+
+ }
+ else
+ {
+ cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+ cellGeleistetImZeitraumHeader.Text = String.Format("Fehlkontakte {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+
+ }
+ //if (pRO.RateFactor.HasValue)
+ //{
+ // cellRateFactorHeader.Text = String.Format("geleistete Std. x {0:0.##}", pRO.RateFactor);
+ //}
+ //else
+ //{
+ // cellRateFactorHeader.Visible = false;
+ // cellRateFactor.Visible = false;
+ //}
+
+ }
+ else
+ {
+ cellBewilligtImZeitraumHeader.Visible = false;
+ cellBewilligteFLSImBereich.Visible = false;
+ cellGeleistetImBereich.Visible = false;
+ cellGeleistetImZeitraumHeader.Visible = false;
+ //cellRateFactorHeader.Visible = false;
+ //cellRateFactor.Visible = false;
+ }
+ this.bindingSource1.DataSource = pRO;
+ }
+
+ }
+
+}
diff --git a/ReportImp/DiakonieKKKleve/FinanzauswertungFehlkontakte.designer.cs b/ReportImp/DiakonieKKKleve/FinanzauswertungFehlkontakte.designer.cs
new file mode 100644
index 000000000..3e6a8bafe
--- /dev/null
+++ b/ReportImp/DiakonieKKKleve/FinanzauswertungFehlkontakte.designer.cs
@@ -0,0 +1,772 @@
+using BeWo.Report.ReportObjects;
+namespace BeWo.DiakonieKKKleve
+{
+ partial class FinanzauswertungFehlkontakte
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary8 = new DevExpress.XtraReports.UI.XRSummary();
+ this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+ this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellBewilligteFLSImBereich = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellGeleistetImBereich = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellBewilligtImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellGeleistetImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ this.lblTitel = new DevExpress.XtraReports.UI.XRLabel();
+ this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
+ this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+ this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ this.TESTPARAMTER = new DevExpress.XtraReports.Parameters.Parameter();
+ this.parameter1 = new DevExpress.XtraReports.Parameters.Parameter();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+ //
+ // Detail
+ //
+ this.Detail.Expanded = false;
+ this.Detail.HeightF = 0F;
+ this.Detail.Name = "Detail";
+ this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // Detail1
+ //
+ this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable2});
+ this.Detail1.Font = new System.Drawing.Font("Arial", 9F);
+ this.Detail1.HeightF = 25F;
+ this.Detail1.KeepTogetherWithDetailReports = true;
+ this.Detail1.Name = "Detail1";
+ this.Detail1.StylePriority.UseFont = false;
+ //
+ // xrTable2
+ //
+ this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable2.Name = "xrTable2";
+ this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+ this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow2});
+ this.xrTable2.SizeF = new System.Drawing.SizeF(975F, 25F);
+ this.xrTable2.StylePriority.UseBorders = false;
+ this.xrTable2.StylePriority.UseFont = false;
+ this.xrTable2.StylePriority.UsePadding = false;
+ this.xrTable2.StylePriority.UseTextAlignment = false;
+ this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ //
+ // xrTableRow2
+ //
+ this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell6,
+ this.xrTableCell25,
+ this.xrTableCell7,
+ this.xrTableCell8,
+ this.xrTableCell9,
+ this.xrTableCell10,
+ this.xrTableCell14,
+ this.xrTableCell12,
+ this.cellBewilligteFLSImBereich,
+ this.cellGeleistetImBereich,
+ this.xrTableCell27});
+ this.xrTableRow2.Name = "xrTableRow2";
+ this.xrTableRow2.Weight = 1D;
+ //
+ // xrTableCell6
+ //
+ this.xrTableCell6.Multiline = true;
+ this.xrTableCell6.Name = "xrTableCell6";
+ this.xrTableCell6.Text = "[CustomerName]\r\n[SupportConceptTimeSpanString]";
+ this.xrTableCell6.Weight = 0.70901033395737445D;
+ //
+ // xrTableCell25
+ //
+ this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Costbearer2Supportconcept.SupportConcept.Customer.Debit" +
+ "orNumber")});
+ this.xrTableCell25.Name = "xrTableCell25";
+ this.xrTableCell25.Weight = 0.24372229219690847D;
+ //
+ // xrTableCell7
+ //
+ this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.CostBearerName")});
+ this.xrTableCell7.Name = "xrTableCell7";
+ this.xrTableCell7.StylePriority.UseTextAlignment = false;
+ this.xrTableCell7.Text = "Mitarbeiter/in";
+ this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell7.Weight = 0.53175772401146282D;
+ //
+ // xrTableCell8
+ //
+ this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountTotal", "{0:c}")});
+ this.xrTableCell8.Name = "xrTableCell8";
+ this.xrTableCell8.StylePriority.UseTextAlignment = false;
+ this.xrTableCell8.Text = "xrTableCell8";
+ this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell8.Weight = 0.39881828790085577D;
+ //
+ // xrTableCell9
+ //
+ this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaid", "{0:c}")});
+ this.xrTableCell9.Name = "xrTableCell9";
+ this.xrTableCell9.StylePriority.UseTextAlignment = false;
+ this.xrTableCell9.Text = "xrTableCell9";
+ this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell9.Weight = 0.39881828331340963D;
+ //
+ // xrTableCell10
+ //
+ this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.OpenAmount", "{0:c}")});
+ this.xrTableCell10.Name = "xrTableCell10";
+ this.xrTableCell10.StylePriority.UseTextAlignment = false;
+ this.xrTableCell10.Text = "xrTableCell10";
+ this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell10.Weight = 0.39881828280280379D;
+ //
+ // xrTableCell14
+ //
+ this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours", "{0:0.00}")});
+ this.xrTableCell14.Name = "xrTableCell14";
+ this.xrTableCell14.StylePriority.UseTextAlignment = false;
+ this.xrTableCell14.Text = "xrTableCell14";
+ this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell14.Weight = 0.31019199583533025D;
+ //
+ // xrTableCell12
+ //
+ this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours", "{0:0.00}")});
+ this.xrTableCell12.Name = "xrTableCell12";
+ this.xrTableCell12.StylePriority.UseTextAlignment = false;
+ this.xrTableCell12.Text = "xrTableCell12";
+ this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell12.Weight = 0.31019199570767875D;
+ //
+ // cellBewilligteFLSImBereich
+ //
+ this.cellBewilligteFLSImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan", "{0:0.00}")});
+ this.cellBewilligteFLSImBereich.Name = "cellBewilligteFLSImBereich";
+ this.cellBewilligteFLSImBereich.StylePriority.UseTextAlignment = false;
+ this.cellBewilligteFLSImBereich.Text = "cellBewilligteFLSImBereich";
+ this.cellBewilligteFLSImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.cellBewilligteFLSImBereich.Weight = 0.31019199564387057D;
+ //
+ // cellGeleistetImBereich
+ //
+ this.cellGeleistetImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenFehlkontakteInReportTimeSpan", "{0:0.00}")});
+ this.cellGeleistetImBereich.Name = "cellGeleistetImBereich";
+ this.cellGeleistetImBereich.StylePriority.UseTextAlignment = false;
+ this.cellGeleistetImBereich.Text = "cellGeleistetImBereich";
+ this.cellGeleistetImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.cellGeleistetImBereich.Weight = 0.31019201647234756D;
+ //
+ // xrTableCell27
+ //
+ this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountFehlkontakteInReportTimeSpan", "{0:c}")});
+ this.xrTableCell27.Name = "xrTableCell27";
+ this.xrTableCell27.StylePriority.UseTextAlignment = false;
+ this.xrTableCell27.Text = "xrTableCell27";
+ this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell27.Weight = 0.39881826937627274D;
+ //
+ // DetailReport
+ //
+ this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail1,
+ this.GroupFooter1,
+ this.GroupHeader2,
+ this.GroupFooter2});
+ this.DetailReport.DataMember = "SupportConceptFinanceList";
+ this.DetailReport.DataSource = this.bindingSource1;
+ this.DetailReport.Level = 0;
+ this.DetailReport.Name = "DetailReport";
+ //
+ // GroupFooter1
+ //
+ this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.GroupFooter1.HeightF = 0F;
+ this.GroupFooter1.Name = "GroupFooter1";
+ this.GroupFooter1.StylePriority.UseFont = false;
+ //
+ // GroupHeader2
+ //
+ this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable1});
+ this.GroupHeader2.HeightF = 50F;
+ this.GroupHeader2.Name = "GroupHeader2";
+ this.GroupHeader2.RepeatEveryPage = true;
+ //
+ // xrTable1
+ //
+ this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable1.Name = "xrTable1";
+ this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+ this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow1});
+ this.xrTable1.SizeF = new System.Drawing.SizeF(975F, 50F);
+ this.xrTable1.StylePriority.UseBorders = false;
+ this.xrTable1.StylePriority.UseFont = false;
+ this.xrTable1.StylePriority.UsePadding = false;
+ this.xrTable1.StylePriority.UseTextAlignment = false;
+ this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ //
+ // xrTableRow1
+ //
+ this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell1,
+ this.xrTableCell24,
+ this.xrTableCell2,
+ this.xrTableCell3,
+ this.xrTableCell4,
+ this.xrTableCell5,
+ this.xrTableCell13,
+ this.xrTableCell11,
+ this.cellBewilligtImZeitraumHeader,
+ this.cellGeleistetImZeitraumHeader,
+ this.xrTableCell26});
+ this.xrTableRow1.Name = "xrTableRow1";
+ this.xrTableRow1.Weight = 1.3953493323567705D;
+ //
+ // xrTableCell1
+ //
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.Text = "KlientIn/Hilfeplan";
+ this.xrTableCell1.Weight = 0.70901033395737445D;
+ //
+ // xrTableCell24
+ //
+ this.xrTableCell24.Name = "xrTableCell24";
+ this.xrTableCell24.Text = "Debitor";
+ this.xrTableCell24.Weight = 0.24372230334643646D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.StylePriority.UseTextAlignment = false;
+ this.xrTableCell2.Text = "Kostenträger";
+ this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell2.Weight = 0.531757753863423D;
+ //
+ // xrTableCell3
+ //
+ this.xrTableCell3.Name = "xrTableCell3";
+ this.xrTableCell3.StylePriority.UseTextAlignment = false;
+ this.xrTableCell3.Text = "Gesamt laut Bewilligung";
+ this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell3.Weight = 0.39881832170910125D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.StylePriority.UseTextAlignment = false;
+ this.xrTableCell4.Text = "Bereits gezahlt";
+ this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell4.Weight = 0.39881831712165505D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.StylePriority.UseTextAlignment = false;
+ this.xrTableCell5.Text = "Noch offen";
+ this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell5.Weight = 0.39881831661104905D;
+ //
+ // xrTableCell13
+ //
+ this.xrTableCell13.Name = "xrTableCell13";
+ this.xrTableCell13.StylePriority.UseTextAlignment = false;
+ this.xrTableCell13.Text = "Bis dato bewilligte FLS";
+ this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell13.Weight = 0.31019202388898093D;
+ //
+ // xrTableCell11
+ //
+ this.xrTableCell11.Name = "xrTableCell11";
+ this.xrTableCell11.StylePriority.UseTextAlignment = false;
+ this.xrTableCell11.Text = "Bis dato geleistete FLS";
+ this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell11.Weight = 0.31019202376132948D;
+ //
+ // cellBewilligtImZeitraumHeader
+ //
+ this.cellBewilligtImZeitraumHeader.Name = "cellBewilligtImZeitraumHeader";
+ this.cellBewilligtImZeitraumHeader.StylePriority.UseTextAlignment = false;
+ this.cellBewilligtImZeitraumHeader.Text = "bewilligte FLS";
+ this.cellBewilligtImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.cellBewilligtImZeitraumHeader.Weight = 0.31019202369750365D;
+ //
+ // cellGeleistetImZeitraumHeader
+ //
+ this.cellGeleistetImZeitraumHeader.Name = "cellGeleistetImZeitraumHeader";
+ this.cellGeleistetImZeitraumHeader.StylePriority.UseTextAlignment = false;
+ this.cellGeleistetImZeitraumHeader.Text = "geleistete FLS";
+ this.cellGeleistetImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.cellGeleistetImZeitraumHeader.Weight = 0.31019202366559079D;
+ //
+ // xrTableCell26
+ //
+ this.xrTableCell26.Name = "xrTableCell26";
+ this.xrTableCell26.StylePriority.UseTextAlignment = false;
+ this.xrTableCell26.Text = "Betrag";
+ this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell26.Weight = 0.39881831613235597D;
+ //
+ // GroupFooter2
+ //
+ this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable3});
+ this.GroupFooter2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+ this.GroupFooter2.HeightF = 25F;
+ this.GroupFooter2.Level = 1;
+ this.GroupFooter2.Name = "GroupFooter2";
+ this.GroupFooter2.StylePriority.UseFont = false;
+ //
+ // xrTable3
+ //
+ this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable3.Name = "xrTable3";
+ this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+ this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow3});
+ this.xrTable3.SizeF = new System.Drawing.SizeF(975F, 25F);
+ this.xrTable3.StylePriority.UseBorders = false;
+ this.xrTable3.StylePriority.UseFont = false;
+ this.xrTable3.StylePriority.UsePadding = false;
+ this.xrTable3.StylePriority.UseTextAlignment = false;
+ this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ //
+ // xrTableRow3
+ //
+ this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell15,
+ this.xrTableCell29,
+ this.xrTableCell16,
+ this.xrTableCell17,
+ this.xrTableCell18,
+ this.xrTableCell19,
+ this.xrTableCell20,
+ this.xrTableCell21,
+ this.xrTableCell22,
+ this.xrTableCell23,
+ this.xrTableCell28});
+ this.xrTableRow3.Name = "xrTableRow3";
+ this.xrTableRow3.Weight = 1D;
+ //
+ // xrTableCell15
+ //
+ this.xrTableCell15.CanGrow = false;
+ this.xrTableCell15.Multiline = true;
+ this.xrTableCell15.Name = "xrTableCell15";
+ this.xrTableCell15.Weight = 0.70901033395737445D;
+ //
+ // xrTableCell29
+ //
+ this.xrTableCell29.CanGrow = false;
+ this.xrTableCell29.Name = "xrTableCell29";
+ this.xrTableCell29.Weight = 0.24372227529278578D;
+ //
+ // xrTableCell16
+ //
+ this.xrTableCell16.CanGrow = false;
+ this.xrTableCell16.Name = "xrTableCell16";
+ this.xrTableCell16.StylePriority.UseTextAlignment = false;
+ this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell16.Weight = 0.53175770710734D;
+ //
+ // xrTableCell17
+ //
+ this.xrTableCell17.CanGrow = false;
+ this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountTotal")});
+ this.xrTableCell17.Name = "xrTableCell17";
+ this.xrTableCell17.StylePriority.UseTextAlignment = false;
+ xrSummary1.FormatString = "{0:c}";
+ xrSummary1.IgnoreNullValues = true;
+ xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+ this.xrTableCell17.Summary = xrSummary1;
+ this.xrTableCell17.Text = "xrTableCell17";
+ this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell17.Weight = 0.39881828790085572D;
+ //
+ // xrTableCell18
+ //
+ this.xrTableCell18.CanGrow = false;
+ this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaid")});
+ this.xrTableCell18.Name = "xrTableCell18";
+ this.xrTableCell18.StylePriority.UseTextAlignment = false;
+ xrSummary2.FormatString = "{0:c}";
+ xrSummary2.IgnoreNullValues = true;
+ xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+ this.xrTableCell18.Summary = xrSummary2;
+ this.xrTableCell18.Text = "xrTableCell18";
+ this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell18.Weight = 0.39881828331340963D;
+ //
+ // xrTableCell19
+ //
+ this.xrTableCell19.CanGrow = false;
+ this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.OpenAmount")});
+ this.xrTableCell19.Name = "xrTableCell19";
+ this.xrTableCell19.StylePriority.UseTextAlignment = false;
+ xrSummary3.FormatString = "{0:c}";
+ xrSummary3.IgnoreNullValues = true;
+ xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+ this.xrTableCell19.Summary = xrSummary3;
+ this.xrTableCell19.Text = "xrTableCell19";
+ this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell19.Weight = 0.39881828280280385D;
+ //
+ // xrTableCell20
+ //
+ this.xrTableCell20.CanGrow = false;
+ this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours")});
+ this.xrTableCell20.Name = "xrTableCell20";
+ this.xrTableCell20.StylePriority.UseTextAlignment = false;
+ xrSummary4.FormatString = "{0:0.00}";
+ xrSummary4.IgnoreNullValues = true;
+ xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+ this.xrTableCell20.Summary = xrSummary4;
+ this.xrTableCell20.Text = "xrTableCell20";
+ this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell20.Weight = 0.31019199583533025D;
+ //
+ // xrTableCell21
+ //
+ this.xrTableCell21.CanGrow = false;
+ this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours")});
+ this.xrTableCell21.Name = "xrTableCell21";
+ this.xrTableCell21.StylePriority.UseTextAlignment = false;
+ xrSummary5.FormatString = "{0:0.00}";
+ xrSummary5.IgnoreNullValues = true;
+ xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+ this.xrTableCell21.Summary = xrSummary5;
+ this.xrTableCell21.Text = "xrTableCell21";
+ this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell21.Weight = 0.31019199570767875D;
+ //
+ // xrTableCell22
+ //
+ this.xrTableCell22.CanGrow = false;
+ this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")});
+ this.xrTableCell22.Name = "xrTableCell22";
+ this.xrTableCell22.StylePriority.UseTextAlignment = false;
+ xrSummary6.FormatString = "{0:0.00}";
+ xrSummary6.IgnoreNullValues = true;
+ xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+ this.xrTableCell22.Summary = xrSummary6;
+ this.xrTableCell22.Text = "xrTableCell22";
+ this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell22.Weight = 0.31019199564387062D;
+ //
+ // xrTableCell23
+ //
+ this.xrTableCell23.CanGrow = false;
+ this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenFehlkontakteInReportTimeSpan")});
+ this.xrTableCell23.Name = "xrTableCell23";
+ this.xrTableCell23.StylePriority.UseTextAlignment = false;
+ xrSummary7.FormatString = "{0:0.00}";
+ xrSummary7.IgnoreNullValues = true;
+ xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+ this.xrTableCell23.Summary = xrSummary7;
+ this.xrTableCell23.Text = "xrTableCell23";
+ this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell23.Weight = 0.31019201647234756D;
+ //
+ // xrTableCell28
+ //
+ this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountFehlkontakteInReportTimeSpan")});
+ this.xrTableCell28.Name = "xrTableCell28";
+ this.xrTableCell28.StylePriority.UseTextAlignment = false;
+ xrSummary8.FormatString = "{0:c}";
+ xrSummary8.IgnoreNullValues = true;
+ xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+ this.xrTableCell28.Summary = xrSummary8;
+ this.xrTableCell28.Text = "xrTableCell28";
+ this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell28.Weight = 0.39881838489003185D;
+ //
+ // ReportHeader
+ //
+ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.lblTitel});
+ this.ReportHeader.HeightF = 50.125F;
+ this.ReportHeader.Name = "ReportHeader";
+ //
+ // lblTitel
+ //
+ this.lblTitel.Font = new System.Drawing.Font("Arial", 12F);
+ this.lblTitel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
+ this.lblTitel.Name = "lblTitel";
+ this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblTitel.SizeF = new System.Drawing.SizeF(666.9999F, 23F);
+ this.lblTitel.StylePriority.UseFont = false;
+ this.lblTitel.Text = "Fehlkontakte";
+ //
+ // Title
+ //
+ this.Title.BackColor = System.Drawing.Color.White;
+ this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.Title.BorderWidth = 1F;
+ this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+ this.Title.ForeColor = System.Drawing.Color.Black;
+ this.Title.Name = "Title";
+ //
+ // FieldCaption
+ //
+ this.FieldCaption.BackColor = System.Drawing.Color.White;
+ this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.FieldCaption.BorderWidth = 1F;
+ this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+ this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+ this.FieldCaption.Name = "FieldCaption";
+ //
+ // PageInfo
+ //
+ this.PageInfo.BackColor = System.Drawing.Color.White;
+ this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.PageInfo.BorderWidth = 1F;
+ this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.PageInfo.ForeColor = System.Drawing.Color.Black;
+ this.PageInfo.Name = "PageInfo";
+ //
+ // DataField
+ //
+ this.DataField.BackColor = System.Drawing.Color.White;
+ this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.DataField.BorderWidth = 1F;
+ this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Name = "DataField";
+ //
+ // fieldFLS
+ //
+ this.fieldFLS.DataMember = "FLSReportGroups";
+ this.fieldFLS.DataSource = this.bindingSource1;
+ this.fieldFLS.Expression = "[TotalFLM] / 60";
+ this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldFLS.Name = "fieldFLS";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 50F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 30F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // TESTPARAMTER
+ //
+ this.TESTPARAMTER.Description = "zrdz";
+ this.TESTPARAMTER.Name = "TESTPARAMTER";
+ this.TESTPARAMTER.ValueInfo = "blabla standard";
+ //
+ // parameter1
+ //
+ this.parameter1.Description = "Parameter1";
+ this.parameter1.Name = "parameter1";
+ this.parameter1.Type = typeof(bool);
+ this.parameter1.ValueInfo = "False";
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
+ //
+ // FinanzauswertungFehlkontakte
+ //
+ this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail,
+ this.DetailReport,
+ this.ReportHeader,
+ this.topMarginBand1,
+ this.bottomMarginBand1});
+ this.DataSource = this.bindingSource1;
+ this.Landscape = true;
+ this.Margins = new System.Drawing.Printing.Margins(50, 50, 50, 30);
+ this.PageHeight = 827;
+ this.PageWidth = 1169;
+ this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+ this.Parameters.AddRange(new DevExpress.XtraReports.Parameters.Parameter[] {
+ this.TESTPARAMTER,
+ this.parameter1});
+ this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+ this.Title,
+ this.FieldCaption,
+ this.PageInfo,
+ this.DataField});
+ this.Version = "17.1";
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraReports.UI.DetailBand Detail;
+ private System.Windows.Forms.BindingSource bindingSource1;
+ private DevExpress.XtraReports.UI.DetailBand Detail1;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+ private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+ private DevExpress.XtraReports.UI.XRControlStyle Title;
+ private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
+ private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
+ private DevExpress.XtraReports.UI.XRControlStyle DataField;
+ private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
+ private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+ private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+ private DevExpress.XtraReports.UI.XRTable xrTable2;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+ private DevExpress.XtraReports.UI.XRTable xrTable1;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+ private DevExpress.XtraReports.UI.XRTableCell cellBewilligteFLSImBereich;
+ private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImBereich;
+ private DevExpress.XtraReports.UI.XRTableCell cellBewilligtImZeitraumHeader;
+ private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImZeitraumHeader;
+ private DevExpress.XtraReports.Parameters.Parameter TESTPARAMTER;
+ private DevExpress.XtraReports.Parameters.Parameter parameter1;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
+ private DevExpress.XtraReports.UI.XRTable xrTable3;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+ private DevExpress.XtraReports.UI.XRLabel lblTitel;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
+ }
+}
diff --git a/ReportImp/DiakonieKKKleve/FinanzauswertungFehlkontakte.resx b/ReportImp/DiakonieKKKleve/FinanzauswertungFehlkontakte.resx
new file mode 100644
index 000000000..d25f3eba2
--- /dev/null
+++ b/ReportImp/DiakonieKKKleve/FinanzauswertungFehlkontakte.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/ReportImp/DiakonieKKKleve/FinanzauswertungFls.designer.cs b/ReportImp/DiakonieKKKleve/FinanzauswertungFls.designer.cs
index 6848ba169..79e6385f4 100644
--- a/ReportImp/DiakonieKKKleve/FinanzauswertungFls.designer.cs
+++ b/ReportImp/DiakonieKKKleve/FinanzauswertungFls.designer.cs
@@ -41,36 +41,6 @@ namespace BeWo.DiakonieKKKleve
DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
- this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
- this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
- this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
- this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
- this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
- this.lblTitel = new DevExpress.XtraReports.UI.XRLabel();
- this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
- this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
- this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
- this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
- this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
- this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
- this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
- this.TESTPARAMTER = new DevExpress.XtraReports.Parameters.Parameter();
- this.parameter1 = new DevExpress.XtraReports.Parameters.Parameter();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
- this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
- this.cellBewilligtImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
- this.cellGeleistetImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
- this.cellRateFactorHeader = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -85,6 +55,24 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellRateFactor = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellBewilligtImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellGeleistetImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellRateFactorHeader = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -99,10 +87,22 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellRateFactorSummary = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+ this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ this.lblTitel = new DevExpress.XtraReports.UI.XRLabel();
+ this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
+ this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+ this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ this.TESTPARAMTER = new DevExpress.XtraReports.Parameters.Parameter();
+ this.parameter1 = new DevExpress.XtraReports.Parameters.Parameter();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -123,6 +123,155 @@ namespace BeWo.DiakonieKKKleve
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
//
+ // xrTable5
+ //
+ this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable5.Name = "xrTable5";
+ this.xrTable5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+ this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow5});
+ this.xrTable5.SizeF = new System.Drawing.SizeF(1055F, 25F);
+ this.xrTable5.StylePriority.UseBorders = false;
+ this.xrTable5.StylePriority.UseFont = false;
+ this.xrTable5.StylePriority.UsePadding = false;
+ this.xrTable5.StylePriority.UseTextAlignment = false;
+ this.xrTable5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ //
+ // xrTableRow5
+ //
+ this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell37,
+ this.xrTableCell38,
+ this.xrTableCell39,
+ this.xrTableCell40,
+ this.xrTableCell41,
+ this.xrTableCell42,
+ this.xrTableCell43,
+ this.xrTableCell44,
+ this.cellBewilligteFLSImBereich,
+ this.xrTableCell46,
+ this.cellRateFactor,
+ this.xrTableCell47});
+ this.xrTableRow5.Name = "xrTableRow5";
+ this.xrTableRow5.Weight = 1D;
+ //
+ // xrTableCell37
+ //
+ this.xrTableCell37.Multiline = true;
+ this.xrTableCell37.Name = "xrTableCell37";
+ this.xrTableCell37.Text = "[CustomerName]\r\n[SupportConceptTimeSpanString]";
+ this.xrTableCell37.Weight = 0.70901033395737445D;
+ //
+ // xrTableCell38
+ //
+ this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Costbearer2Supportconcept.SupportConcept.Customer.Debit" +
+ "orNumber")});
+ this.xrTableCell38.Name = "xrTableCell38";
+ this.xrTableCell38.Weight = 0.24372229219690847D;
+ //
+ // xrTableCell39
+ //
+ this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.CostBearerName")});
+ this.xrTableCell39.Name = "xrTableCell39";
+ this.xrTableCell39.StylePriority.UseTextAlignment = false;
+ this.xrTableCell39.Text = "Mitarbeiter/in";
+ this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell39.Weight = 0.53175772401146282D;
+ //
+ // xrTableCell40
+ //
+ this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountTotal", "{0:c}")});
+ this.xrTableCell40.Name = "xrTableCell40";
+ this.xrTableCell40.StylePriority.UseTextAlignment = false;
+ this.xrTableCell40.Text = "xrTableCell8";
+ this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell40.Weight = 0.39881828790085577D;
+ //
+ // xrTableCell41
+ //
+ this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaid", "{0:c}")});
+ this.xrTableCell41.Name = "xrTableCell41";
+ this.xrTableCell41.StylePriority.UseTextAlignment = false;
+ this.xrTableCell41.Text = "xrTableCell9";
+ this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell41.Weight = 0.39881828331340963D;
+ //
+ // xrTableCell42
+ //
+ this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.OpenAmount", "{0:c}")});
+ this.xrTableCell42.Name = "xrTableCell42";
+ this.xrTableCell42.StylePriority.UseTextAlignment = false;
+ this.xrTableCell42.Text = "xrTableCell10";
+ this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell42.Weight = 0.39881828280280379D;
+ //
+ // xrTableCell43
+ //
+ this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours", "{0:0.00}")});
+ this.xrTableCell43.Name = "xrTableCell43";
+ this.xrTableCell43.StylePriority.UseTextAlignment = false;
+ this.xrTableCell43.Text = "xrTableCell14";
+ this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell43.Weight = 0.31019199583533025D;
+ //
+ // xrTableCell44
+ //
+ this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours", "{0:0.00}")});
+ this.xrTableCell44.Name = "xrTableCell44";
+ this.xrTableCell44.StylePriority.UseTextAlignment = false;
+ this.xrTableCell44.Text = "xrTableCell12";
+ this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell44.Weight = 0.31019199570767875D;
+ //
+ // cellBewilligteFLSImBereich
+ //
+ this.cellBewilligteFLSImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan", "{0:0.00}")});
+ this.cellBewilligteFLSImBereich.Name = "cellBewilligteFLSImBereich";
+ this.cellBewilligteFLSImBereich.StylePriority.UseTextAlignment = false;
+ this.cellBewilligteFLSImBereich.Text = "cellBewilligteFLSImBereich";
+ this.cellBewilligteFLSImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.cellBewilligteFLSImBereich.Weight = 0.31019199564387057D;
+ //
+ // xrTableCell46
+ //
+ this.xrTableCell46.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenNichtFehlkontakteInReportTimeSpan", "{0:0.00}")});
+ this.xrTableCell46.Name = "xrTableCell46";
+ this.xrTableCell46.StylePriority.UseTextAlignment = false;
+ this.xrTableCell46.Text = "cellGeleistetImBereich";
+ this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell46.Weight = 0.31019201647234756D;
+ //
+ // cellRateFactor
+ //
+ this.cellRateFactor.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpanWithFactor", "{0:0.00}")});
+ this.cellRateFactor.Name = "cellRateFactor";
+ this.cellRateFactor.StylePriority.UseTextAlignment = false;
+ this.cellRateFactor.Text = "cellRateFactor";
+ this.cellRateFactor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.cellRateFactor.Weight = 0.35450515333855759D;
+ //
+ // xrTableCell47
+ //
+ this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountNichtFehlkontakteInReportTimeSpan", "{0:c}")});
+ this.xrTableCell47.Name = "xrTableCell47";
+ this.xrTableCell47.StylePriority.UseTextAlignment = false;
+ this.xrTableCell47.Text = "xrTableCell27";
+ this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell47.Weight = 0.39881826288639749D;
+ //
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -150,108 +299,6 @@ namespace BeWo.DiakonieKKKleve
this.GroupHeader2.Name = "GroupHeader2";
this.GroupHeader2.RepeatEveryPage = true;
//
- // GroupFooter2
- //
- this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrTable1});
- this.GroupFooter2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
- this.GroupFooter2.HeightF = 25F;
- this.GroupFooter2.Level = 1;
- this.GroupFooter2.Name = "GroupFooter2";
- this.GroupFooter2.StylePriority.UseFont = false;
- //
- // ReportHeader
- //
- this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.lblTitel});
- this.ReportHeader.HeightF = 50.125F;
- this.ReportHeader.Name = "ReportHeader";
- //
- // lblTitel
- //
- this.lblTitel.Font = new System.Drawing.Font("Arial", 12F);
- this.lblTitel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
- this.lblTitel.Name = "lblTitel";
- this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.lblTitel.SizeF = new System.Drawing.SizeF(666.9999F, 23F);
- this.lblTitel.StylePriority.UseFont = false;
- this.lblTitel.Text = "Fachleistungsstunden";
- //
- // Title
- //
- this.Title.BackColor = System.Drawing.Color.White;
- this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
- this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.Title.BorderWidth = 1;
- this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
- this.Title.ForeColor = System.Drawing.Color.Black;
- this.Title.Name = "Title";
- //
- // FieldCaption
- //
- this.FieldCaption.BackColor = System.Drawing.Color.White;
- this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
- this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.FieldCaption.BorderWidth = 1;
- this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
- this.FieldCaption.ForeColor = System.Drawing.Color.Black;
- this.FieldCaption.Name = "FieldCaption";
- //
- // PageInfo
- //
- this.PageInfo.BackColor = System.Drawing.Color.White;
- this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
- this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.PageInfo.BorderWidth = 1;
- this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
- this.PageInfo.ForeColor = System.Drawing.Color.Black;
- this.PageInfo.Name = "PageInfo";
- //
- // DataField
- //
- this.DataField.BackColor = System.Drawing.Color.White;
- this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
- this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.DataField.BorderWidth = 1;
- this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
- this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
- this.DataField.Name = "DataField";
- //
- // fieldFLS
- //
- this.fieldFLS.DataMember = "FLSReportGroups";
- this.fieldFLS.DataSource = this.bindingSource1;
- this.fieldFLS.Expression = "[TotalFLM] / 60";
- this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
- this.fieldFLS.Name = "fieldFLS";
- //
- // topMarginBand1
- //
- this.topMarginBand1.HeightF = 50F;
- this.topMarginBand1.Name = "topMarginBand1";
- //
- // bottomMarginBand1
- //
- this.bottomMarginBand1.HeightF = 30F;
- this.bottomMarginBand1.Name = "bottomMarginBand1";
- //
- // TESTPARAMTER
- //
- this.TESTPARAMTER.Description = "zrdz";
- this.TESTPARAMTER.Name = "TESTPARAMTER";
- this.TESTPARAMTER.ValueInfo = "blabla standard";
- //
- // parameter1
- //
- this.parameter1.Description = "Parameter1";
- this.parameter1.Name = "parameter1";
- this.parameter1.Type = typeof(bool);
- this.parameter1.ValueInfo = "False";
- //
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
- //
// xrTable4
//
this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
@@ -380,154 +427,15 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell35.Weight = 0.39881831611639951D;
//
- // xrTable5
+ // GroupFooter2
//
- this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrTable5.Name = "xrTable5";
- this.xrTable5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
- this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
- this.xrTableRow5});
- this.xrTable5.SizeF = new System.Drawing.SizeF(1055F, 25F);
- this.xrTable5.StylePriority.UseBorders = false;
- this.xrTable5.StylePriority.UseFont = false;
- this.xrTable5.StylePriority.UsePadding = false;
- this.xrTable5.StylePriority.UseTextAlignment = false;
- this.xrTable5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- //
- // xrTableRow5
- //
- this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell37,
- this.xrTableCell38,
- this.xrTableCell39,
- this.xrTableCell40,
- this.xrTableCell41,
- this.xrTableCell42,
- this.xrTableCell43,
- this.xrTableCell44,
- this.cellBewilligteFLSImBereich,
- this.xrTableCell46,
- this.cellRateFactor,
- this.xrTableCell47});
- this.xrTableRow5.Name = "xrTableRow5";
- this.xrTableRow5.Weight = 1D;
- //
- // xrTableCell37
- //
- this.xrTableCell37.Multiline = true;
- this.xrTableCell37.Name = "xrTableCell37";
- this.xrTableCell37.Text = "[CustomerName]\r\n[SupportConceptTimeSpanString]";
- this.xrTableCell37.Weight = 0.70901033395737445D;
- //
- // xrTableCell38
- //
- this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Costbearer2Supportconcept.SupportConcept.Customer.Debit" +
- "orNumber")});
- this.xrTableCell38.Name = "xrTableCell38";
- this.xrTableCell38.Weight = 0.24372229219690847D;
- //
- // xrTableCell39
- //
- this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.CostBearerName")});
- this.xrTableCell39.Name = "xrTableCell39";
- this.xrTableCell39.StylePriority.UseTextAlignment = false;
- this.xrTableCell39.Text = "Mitarbeiter/in";
- this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell39.Weight = 0.53175772401146282D;
- //
- // xrTableCell40
- //
- this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountTotal", "{0:c}")});
- this.xrTableCell40.Name = "xrTableCell40";
- this.xrTableCell40.StylePriority.UseTextAlignment = false;
- this.xrTableCell40.Text = "xrTableCell8";
- this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell40.Weight = 0.39881828790085577D;
- //
- // xrTableCell41
- //
- this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaid", "{0:c}")});
- this.xrTableCell41.Name = "xrTableCell41";
- this.xrTableCell41.StylePriority.UseTextAlignment = false;
- this.xrTableCell41.Text = "xrTableCell9";
- this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell41.Weight = 0.39881828331340963D;
- //
- // xrTableCell42
- //
- this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.OpenAmount", "{0:c}")});
- this.xrTableCell42.Name = "xrTableCell42";
- this.xrTableCell42.StylePriority.UseTextAlignment = false;
- this.xrTableCell42.Text = "xrTableCell10";
- this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell42.Weight = 0.39881828280280379D;
- //
- // xrTableCell43
- //
- this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours", "{0:0.00}")});
- this.xrTableCell43.Name = "xrTableCell43";
- this.xrTableCell43.StylePriority.UseTextAlignment = false;
- this.xrTableCell43.Text = "xrTableCell14";
- this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell43.Weight = 0.31019199583533025D;
- //
- // xrTableCell44
- //
- this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours", "{0:0.00}")});
- this.xrTableCell44.Name = "xrTableCell44";
- this.xrTableCell44.StylePriority.UseTextAlignment = false;
- this.xrTableCell44.Text = "xrTableCell12";
- this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell44.Weight = 0.31019199570767875D;
- //
- // cellBewilligteFLSImBereich
- //
- this.cellBewilligteFLSImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan", "{0:0.00}")});
- this.cellBewilligteFLSImBereich.Name = "cellBewilligteFLSImBereich";
- this.cellBewilligteFLSImBereich.StylePriority.UseTextAlignment = false;
- this.cellBewilligteFLSImBereich.Text = "cellBewilligteFLSImBereich";
- this.cellBewilligteFLSImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.cellBewilligteFLSImBereich.Weight = 0.31019199564387057D;
- //
- // xrTableCell46
- //
- this.xrTableCell46.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpan", "{0:0.00}")});
- this.xrTableCell46.Name = "xrTableCell46";
- this.xrTableCell46.StylePriority.UseTextAlignment = false;
- this.xrTableCell46.Text = "cellGeleistetImBereich";
- this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell46.Weight = 0.31019201647234756D;
- //
- // cellRateFactor
- //
- this.cellRateFactor.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpanWithFactor", "{0:0.00}")});
- this.cellRateFactor.Name = "cellRateFactor";
- this.cellRateFactor.StylePriority.UseTextAlignment = false;
- this.cellRateFactor.Text = "cellRateFactor";
- this.cellRateFactor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.cellRateFactor.Weight = 0.35450515333855759D;
- //
- // xrTableCell47
- //
- this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountInReportTimeSpan", "{0:c}")});
- this.xrTableCell47.Name = "xrTableCell47";
- this.xrTableCell47.StylePriority.UseTextAlignment = false;
- this.xrTableCell47.Text = "xrTableCell27";
- this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell47.Weight = 0.39881826288639749D;
+ this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable1});
+ this.GroupFooter2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+ this.GroupFooter2.HeightF = 25F;
+ this.GroupFooter2.Level = 1;
+ this.GroupFooter2.Name = "GroupFooter2";
+ this.GroupFooter2.StylePriority.UseFont = false;
//
// xrTable1
//
@@ -678,7 +586,7 @@ namespace BeWo.DiakonieKKKleve
//
this.xrTableCell10.CanGrow = false;
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpan", "{0:0.00}")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenNichtFehlkontakteInReportTimeSpan", "{0:0.00}")});
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseTextAlignment = false;
xrSummary7.FormatString = "{0:0.00}";
@@ -706,7 +614,7 @@ namespace BeWo.DiakonieKKKleve
// xrTableCell11
//
this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountInReportTimeSpan")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountNichtFehlkontakteInReportTimeSpan")});
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseTextAlignment = false;
xrSummary9.FormatString = "{0:c}";
@@ -717,6 +625,98 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell11.Weight = 0.39881839203079233D;
//
+ // ReportHeader
+ //
+ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.lblTitel});
+ this.ReportHeader.HeightF = 50.125F;
+ this.ReportHeader.Name = "ReportHeader";
+ //
+ // lblTitel
+ //
+ this.lblTitel.Font = new System.Drawing.Font("Arial", 12F);
+ this.lblTitel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
+ this.lblTitel.Name = "lblTitel";
+ this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblTitel.SizeF = new System.Drawing.SizeF(666.9999F, 23F);
+ this.lblTitel.StylePriority.UseFont = false;
+ this.lblTitel.Text = "Fachleistungsstunden";
+ //
+ // Title
+ //
+ this.Title.BackColor = System.Drawing.Color.White;
+ this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.Title.BorderWidth = 1F;
+ this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+ this.Title.ForeColor = System.Drawing.Color.Black;
+ this.Title.Name = "Title";
+ //
+ // FieldCaption
+ //
+ this.FieldCaption.BackColor = System.Drawing.Color.White;
+ this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.FieldCaption.BorderWidth = 1F;
+ this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+ this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+ this.FieldCaption.Name = "FieldCaption";
+ //
+ // PageInfo
+ //
+ this.PageInfo.BackColor = System.Drawing.Color.White;
+ this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.PageInfo.BorderWidth = 1F;
+ this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.PageInfo.ForeColor = System.Drawing.Color.Black;
+ this.PageInfo.Name = "PageInfo";
+ //
+ // DataField
+ //
+ this.DataField.BackColor = System.Drawing.Color.White;
+ this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.DataField.BorderWidth = 1F;
+ this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Name = "DataField";
+ //
+ // fieldFLS
+ //
+ this.fieldFLS.DataMember = "FLSReportGroups";
+ this.fieldFLS.DataSource = this.bindingSource1;
+ this.fieldFLS.Expression = "[TotalFLM] / 60";
+ this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldFLS.Name = "fieldFLS";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 50F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 30F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // TESTPARAMTER
+ //
+ this.TESTPARAMTER.Description = "zrdz";
+ this.TESTPARAMTER.Name = "TESTPARAMTER";
+ this.TESTPARAMTER.ValueInfo = "blabla standard";
+ //
+ // parameter1
+ //
+ this.parameter1.Description = "Parameter1";
+ this.parameter1.Name = "parameter1";
+ this.parameter1.Type = typeof(bool);
+ this.parameter1.ValueInfo = "False";
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
+ //
// FinanzauswertungFls
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -739,11 +739,11 @@ namespace BeWo.DiakonieKKKleve
this.FieldCaption,
this.PageInfo,
this.DataField});
- this.Version = "13.1";
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+ this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
diff --git a/ReportImp/SPZLeverkusen/SPZLeverkusen.csproj b/ReportImp/SPZLeverkusen/SPZLeverkusen.csproj
index 0528fae3b..cf32a0381 100644
--- a/ReportImp/SPZLeverkusen/SPZLeverkusen.csproj
+++ b/ReportImp/SPZLeverkusen/SPZLeverkusen.csproj
@@ -34,6 +34,9 @@
+
+ False
+
@@ -101,6 +104,8 @@
ServicesOverviewReport.cs
+
+
Component
diff --git a/ReportImp/SPZLeverkusen/Service/CustomSupportConceptAnalysisCreator.cs b/ReportImp/SPZLeverkusen/Service/CustomSupportConceptAnalysisCreator.cs
new file mode 100644
index 000000000..9163d7c1f
--- /dev/null
+++ b/ReportImp/SPZLeverkusen/Service/CustomSupportConceptAnalysisCreator.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.DCEntityMapper;
+
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+using BS.Shared.Extensions;
+using BS.Shared.Services;
+using BeWo.Service.Configuration;
+using BeWo.Service.Plugins;
+using BeWo.Data;
+using BeWo.Data.Security;
+
+namespace SPZLeverkusen.Service
+{
+ public class CustomSupportConceptAnalysisCreator : SupportConceptAnalysisCreator
+ {
+ public override List GetSupportConceptAnalysis2(IList c2sOids, long? employeeOid, long? teamOid, long? catOid, DateTime? startDate, DateTime? endDate, int? expiredMonths, bool showArchivedScs)
+ {
+ ApplicationUser loggedInUser = null;
+
+ if (LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+ {
+ loggedInUser = LoggedInUserOperationContextExt.Current.User;
+ }
+ else
+ {
+ loggedInUser = SessionFacade.LoggedInUser;
+ }
+
+ bool isLeitung = false;
+ if (loggedInUser != null && loggedInUser.Employee != null)
+ {
+ foreach (var ug in loggedInUser.UserGroups)
+ {
+ if (ug.Name.ToLower().Contains("verwaltung") || ug.Name.ToLower().Contains("leitung"))
+ {
+ isLeitung = true;
+ }
+ }
+ }
+ if (isLeitung)
+ {
+
+ }
+
+ if (employeeOid.HasValue && !teamOid.HasValue)
+ {
+ if (UserRightHelper.LoggedInUserHasRight(UserRightType.SupportConcept_ViewMyTeams))
+ {
+ var teams = DAOFactory.SearchDAO.FindAllActiveTeamsOfEmployee(employeeOid.Value);
+
+ if (teams.Count > 0)
+ {
+ teamOid = teams[0].Oid;
+ }
+ }
+ }
+ return base.GetSupportConceptAnalysis2(c2sOids, employeeOid, teamOid, catOid, startDate, endDate, expiredMonths, showArchivedScs);
+ }
+ }
+}
\ No newline at end of file
diff --git a/ReportImp/SPZLeverkusen/Service/SpzCustomerService.cs b/ReportImp/SPZLeverkusen/Service/SpzCustomerService.cs
index ee50e04be..7670c1d52 100644
--- a/ReportImp/SPZLeverkusen/Service/SpzCustomerService.cs
+++ b/ReportImp/SPZLeverkusen/Service/SpzCustomerService.cs
@@ -1,4 +1,9 @@
-using BeWo.Service.Plugins;
+using System.Collections.Generic;
+using BeWo.Data;
+using BeWo.Data.Entities;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.DataContracts.Compact;
namespace SPZLeverkusen.Service
{
@@ -8,5 +13,57 @@ namespace SPZLeverkusen.Service
{
return true;
}
+
+ public override List GetAllActiveCustomersCompact(bool fetchReferenceNumbers, long? currentEmployeeOid)
+ {
+ var customer = base.GetAllActiveCustomersCompact(fetchReferenceNumbers, currentEmployeeOid);
+
+ ApplicationUser loggedInUser = null;
+ if (LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+ {
+ loggedInUser = LoggedInUserOperationContextExt.Current.User;
+ }
+ else
+ {
+ loggedInUser = SessionFacade.LoggedInUser;
+ }
+
+ if (loggedInUser != null && loggedInUser.Employee != null)
+ {
+
+ if (HasRight(loggedInUser, UserRightType.Customer_ViewMyTeams))
+ {
+
+ foreach (var c in customer)
+ {
+ if (c.IsRelatedToTeam)
+ {
+ c.IsRelatedToEmployee = true;
+ }
+ }
+ }
+ }
+
+ return customer;
+ }
+
+ private static bool HasRight(ApplicationUser user, UserRightType right)
+ {
+ return GetGrantedRights(user).Contains(right);
+ }
+
+ public static List GetGrantedRights(ApplicationUser user)
+ {
+ var rights = new List();
+ foreach (var ug in user.UserGroups)
+ {
+ foreach (var rr in ug.Rights)
+ {
+ rights.Add(rr.RightType);
+ }
+ }
+
+ return rights;
+ }
}
}
\ No newline at end of file
diff --git a/ReportImp/SPZLeverkusen/Service/SpzEmployeeService.cs b/ReportImp/SPZLeverkusen/Service/SpzEmployeeService.cs
new file mode 100644
index 000000000..5906f5c58
--- /dev/null
+++ b/ReportImp/SPZLeverkusen/Service/SpzEmployeeService.cs
@@ -0,0 +1,128 @@
+using System.Collections.Generic;
+using BeWo.Data;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.DataContracts.Compact;
+using DevExpress.Data.Browsing;
+
+namespace SPZLeverkusen.Service
+{
+ public class FfEmployeeService : EmployeeService
+ {
+ public override List GetAllActiveEmployeesCompact()
+ {
+ var employees = DAOFactory.GenericDAO.GetAllActive();
+ return MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(FilterList(employees));
+ }
+
+ public override List GetAllActiveAndArchivedEmployeesCompact()
+ {
+ var employees = DAOFactory.GenericDAO.GetAllActiveAndArchived();
+ return MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(FilterList(employees));
+ }
+
+ public static IList FilterList(IList employees)
+ {
+ List newList = new List();
+ ApplicationUser loggedInUser = null;
+ if (LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+ {
+ loggedInUser = LoggedInUserOperationContextExt.Current.User;
+
+
+ }
+ else
+ {
+ loggedInUser = SessionFacade.LoggedInUser;
+ }
+
+ if (loggedInUser != null && loggedInUser.Employee != null)
+ {
+ if (HasRight(loggedInUser, UserRightType.EmployeeView_View))
+ {
+ return employees;
+ }
+ if (HasRight(loggedInUser, UserRightType.Employee_AllowViewOwnTeam))
+ {
+ var teams = DAOFactory.SearchDAO.FindAllActiveTeamsOfEmployee(loggedInUser.Employee.Oid.Value);
+
+ foreach (var e in employees)
+ {
+ if (BelongsToTeam(teams, loggedInUser, e))
+ {
+ newList.Add(e);
+ }
+ }
+ }
+ else if (HasRight(loggedInUser, UserRightType.Employee_AllowViewOwnEmployees))
+ {
+ foreach (var e in employees)
+ {
+ if (e.Oid == loggedInUser.Employee.Oid)
+ {
+ newList.Add(e);
+ }
+ }
+ }
+ }
+
+ return newList;
+ }
+
+ public static bool BelongsToTeam(IList teams, ApplicationUser loggedInUser, Employee emp)
+ {
+ //var teams = loggedInUser.Employee.LeadingTeams;
+
+ //foreach (var team in teams)
+ //{
+ // foreach (var member in team.MemberList)
+ // {
+ // if (member.Oid == compactEmployeeDc.EmployeeOid)
+ // {
+ // return true;
+ // }
+ // }
+ //}
+
+
+ foreach (var team in teams)
+ {
+ if (team.Leader != null && team.Leader.Oid == emp.Oid)
+ {
+ return true;
+ }
+ foreach (var member in team.MemberList)
+ {
+ if (member.Oid == emp.Oid)
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ private static bool HasRight(ApplicationUser user, UserRightType right)
+ {
+ return GetGrantedRights(user).Contains(right);
+
+ }
+
+ public static List GetGrantedRights(ApplicationUser user)
+ {
+ var rights = new List();
+ foreach (var ug in user.UserGroups)
+ {
+ foreach (var rr in ug.Rights)
+ {
+ rights.Add(rr.RightType);
+ }
+ }
+
+ return rights;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Service/Plugins/HomeContentGenerator.cs b/Service/Plugins/HomeContentGenerator.cs
index 6447c078c..d77f60a6f 100644
--- a/Service/Plugins/HomeContentGenerator.cs
+++ b/Service/Plugins/HomeContentGenerator.cs
@@ -37,7 +37,11 @@ namespace BeWo.Service.Plugins
{
foreach (var c2s in sc.CostBearer2SupportConceptList)
{
- result.Add(cs.CreateFlatSupportConcept(sc, c2s));
+ var fsc = cs.CreateFlatSupportConcept(sc, c2s);
+ if (fsc.EndDate.HasValue && fsc.EndDate.Value >= DateTime.Now.Date && fsc.EndDate.Value <= expiredUntil)
+ {
+ result.Add(fsc);
+ }
}
}
diff --git a/Service/Plugins/ServiceRecordValidator.cs b/Service/Plugins/ServiceRecordValidator.cs
index 172035956..2d25466e6 100644
--- a/Service/Plugins/ServiceRecordValidator.cs
+++ b/Service/Plugins/ServiceRecordValidator.cs
@@ -194,6 +194,8 @@ namespace BeWo.Service.Plugins
{
result.AddOrUpdateValueInDictionary(groupRecord, new List { ServiceRecordValidationResult.Error });
}
+
+
}
return result;
@@ -475,7 +477,21 @@ namespace BeWo.Service.Plugins
{
result.Add(resultdc);
}
- }
+
+ // 10. Prüfe Fehlkontakte > 2 Std.
+
+ if (duration > 120 && (newServiceRecord.ServiceDescription.Name.ToLower().Contains("fehlkontakt") || newServiceRecord.ServiceDescription.Category.Name.ToLower().Contains("fehlkontakt")))
+ {
+ String message = String.Format("Die eingegebene Dauer des Fehlkontakts überschreitet die maximal abrechenbare Dauer von 2 Stunden.\nMöchten Sie trotzdem speichern?");
+ result.Add(new ServiceRecordValidationResultDC
+ {
+ ResultType = ServiceRecordValidationResult.Custom,
+ Message = message,
+ Allow = true
+
+ });
+ }
+ }
return result;
}
diff --git a/Service/ServiceImplementations/AnalysisServiceImp.cs b/Service/ServiceImplementations/AnalysisServiceImp.cs
index 867f2bcc6..a9a4f7124 100644
--- a/Service/ServiceImplementations/AnalysisServiceImp.cs
+++ b/Service/ServiceImplementations/AnalysisServiceImp.cs
@@ -454,7 +454,16 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
-
+
+
+ public List GetSupportConceptAnalysis(long? currentEmployeeOid,
+ bool showOnlyRelatedSCs,
+ bool showArchivedSCs,
+ DateTime? appointedDate)
+ {
+ return GetSupportConceptAnalysis2(currentEmployeeOid, null, appointedDate, null, showArchivedSCs);
+ }
+
public List GetSupportConceptAnalysis2(long? employeeOid, long? teamOid, DateTime? appointedDate, int? expiredMonths, bool showArchivedScs)
{
try
@@ -511,13 +520,6 @@ namespace BeWo.Service.ServiceImplementations
}
}
- public List GetSupportConceptAnalysis(long? currentEmployeeOid,
- bool showOnlyRelatedSCs,
- bool showArchivedSCs,
- DateTime? appointedDate)
- {
- return GetSupportConceptAnalysis2(currentEmployeeOid, null, appointedDate, null, showArchivedSCs);
- }
public List GetSupportConceptsWithConferenceDate(long? employeeOid, DateTime conferenceDateUntil)
{
diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs
index f8520b27b..38412cdbe 100644
--- a/Shared/Core/EnumTranslations.cs
+++ b/Shared/Core/EnumTranslations.cs
@@ -685,8 +685,7 @@ namespace BS.Shared.Core
},
{
UserRightType.Employee_Anonymization, Translator.Translate("MitarbeiterPlural") + " anonymisieren"
- }
- ,
+ },
{
UserRightType.Termine_IntervalDelete, Translator.Translate("Termine bis zum angegebenen Zeitpunkt löschen")
},