diff --git a/.gitignore b/.gitignore
index 43c12139e..d3cb3a65a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -405,3 +405,13 @@
/ReportImp/ProBalance/bin/Debug
/ReportImp/ProBalance/obj/Debug
/ReportImp/ProBalance/obj/Release
+/ReportImp/BeWoNordeifel/obj/Debug
+/ReportImp/BeWoNordeifel/obj/Release
+/ReportImp/HshCologne/obj/Debug
+/ReportImp/HshCologne/obj/Release
+/ReportImp/IWohl/obj/Debug
+/ReportImp/IWohl/obj/Release
+/ReportImp/KuhringBetreuung/obj/Debug
+/ReportImp/KuhringBetreuung/obj/Release
+/ReportImp/LebenshilfeFrankfurtOder/obj/Debug
+/ReportImp/LebenshilfeFrankfurtOder/obj/Release
diff --git a/BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs b/BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs
index 5b0b5197f..f85e9e84e 100644
--- a/BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs
+++ b/BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs
@@ -21,11 +21,11 @@ namespace BeWo.SchulbegleitenderDienst.SBDUtils
if (viewModel.Customer != null)
{
- var substitutionNeededDate = DateTime.Now.AddDays(-1 * viewModel.Customer.SubstitutionStartingDayCount);
-
if (viewModel.Absencetime?.Start.HasValue ?? false)
{
- substitutionStartingDayCountCondition = viewModel.Customer.SubstitutionNeed != SubstitutionNeed.NoSubstitutionWanted && substitutionNeededDate < viewModel.Absencetime.Start && viewModel.Customer.SubstitutionStartingDayCount > 0;
+ var substitutionNeededStartDate = viewModel.Absencetime?.Start.Value.AddDays(viewModel.Customer.SubstitutionStartingDayCount - 1);
+
+ substitutionStartingDayCountCondition = viewModel.Customer.SubstitutionNeed != SubstitutionNeed.NoSubstitutionWanted && viewModel.Datum < substitutionNeededStartDate;
}
}
diff --git a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstCustomerView.xaml b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstCustomerView.xaml
index 6a10261a8..76abc61b4 100644
--- a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstCustomerView.xaml
+++ b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstCustomerView.xaml
@@ -61,14 +61,14 @@
-
+
-
diff --git a/BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml.cs b/BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml.cs
index cc3bb7d9a..fac9b9b83 100644
--- a/BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml.cs
+++ b/BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml.cs
@@ -124,7 +124,7 @@ namespace BeWo.SchulbegleitenderDienst
_Wochenansicht = wochenansicht;
_Customer = customer;
_Employee = employee;
- SetzeStartEndDatum();
+ SetzeStartEndDatum(currentDate);
GetAllTokensAndSetAll();
@@ -152,7 +152,7 @@ namespace BeWo.SchulbegleitenderDienst
}
}
- private void SetzeStartEndDatum()
+ private void SetzeStartEndDatum(DateTime currentDate)
{
DateTime? start = _Tagesansicht.Datum;
DateTime? end = _Tagesansicht.Datum;
@@ -176,6 +176,10 @@ namespace BeWo.SchulbegleitenderDienst
end = _Tagesansicht.Vertretung.VertretungsZeitraumBis;
}
+ //Laut VKM Aachen
+ start = currentDate.Date;
+ end = currentDate.Date;
+
SubstitutionStart = start.Value;
SubstitutionEnd = end.Value;
diff --git a/BeWo/View/NotizenView.xaml b/BeWo/View/NotizenView.xaml
index 2718e5569..b076a4fdb 100644
--- a/BeWo/View/NotizenView.xaml
+++ b/BeWo/View/NotizenView.xaml
@@ -110,12 +110,12 @@
+ EditValue="{validation:ValidationBinding Path=NewNotizenEintrag.Datum, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type view:NotizenView}}}" Height="23" Margin="3" x:Name="NewTransaktionDatumDateEdit" HorizontalAlignment="Left"/>
-
-
+
+
s.UpdateNotizenKategorie(SelectedNotizenKategorie.CommitToDataContract()), r => this.Dispatch(delegate
{
popup_newNotizenEintrag.IsOpen = false;
- NewNotizenEintrag = new NotizenEintragVM(new NotizenEintragDC());
+ NewNotizenEintrag = new NotizenEintragVM(new NotizenEintragDC { Datum = DateTime.Now.Date });
SelectedNotizenKategorie = null;
OnPropertyChanged("NewNotizenEintrag");
@@ -361,7 +361,7 @@ namespace BeWo.View
private void ButtonCancelAddNotizenEintragClick(object sender, RoutedEventArgs e)
{
- NewNotizenEintrag = new NotizenEintragVM(new NotizenEintragDC());
+ NewNotizenEintrag = new NotizenEintragVM(new NotizenEintragDC { Datum = DateTime.Now.Date });
SelectedNotizenKategorie = null;
OnPropertyChanged("NewNotizenEintrag");
diff --git a/BeWo/View/StundenplanView.xaml b/BeWo/View/StundenplanView.xaml
index 7e3405a2a..00a2c7336 100644
--- a/BeWo/View/StundenplanView.xaml
+++ b/BeWo/View/StundenplanView.xaml
@@ -166,7 +166,7 @@
-
+
diff --git a/BeWo/ViewModel/CustomerVM.cs b/BeWo/ViewModel/CustomerVM.cs
index baba91c62..3b9cd479a 100644
--- a/BeWo/ViewModel/CustomerVM.cs
+++ b/BeWo/ViewModel/CustomerVM.cs
@@ -1547,7 +1547,13 @@ namespace BeWo.ViewModel
public int AbWelchemKrankheitsTag
{
- get { return _AbWelchemKrankheitsTag; }
+ get
+ {
+ if (_AbWelchemKrankheitsTag < 1)
+ return 1;
+
+ return _AbWelchemKrankheitsTag;
+ }
set
{
diff --git a/BeWo/ViewModel/NotizenEintragVM.cs b/BeWo/ViewModel/NotizenEintragVM.cs
index 2b8764726..529667b75 100644
--- a/BeWo/ViewModel/NotizenEintragVM.cs
+++ b/BeWo/ViewModel/NotizenEintragVM.cs
@@ -91,12 +91,12 @@ namespace BeWo.ViewModel
protected override void InitByDataContract(NotizenEintragDC pDataContract)
{
- if (!IsNew)
- {
+ //if (!IsNew)
+ //{
_Datum = pDataContract.Datum;
_Notice = pDataContract.Notice;
_EintragKategorieDC = pDataContract.EintragKategorieDC;
- }
+ //}
}
protected override NotizenEintragDC MapToDataContract(NotizenEintragDC pDataContract, bool doCommit)
diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
index 6b2083909..846056d34 100644
--- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
+++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
@@ -8,36 +8,36 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/Model/Changes_2019_11_21 Bargeldkasse Anfangsbestand hinzugefügt.txt b/Model/Changes_2019_11_21 Bargeldkasse Anfangsbestand hinzugefügt.txt
index f150cbc43..21aee03c6 100644
--- a/Model/Changes_2019_11_21 Bargeldkasse Anfangsbestand hinzugefügt.txt
+++ b/Model/Changes_2019_11_21 Bargeldkasse Anfangsbestand hinzugefügt.txt
@@ -1,2 +1,2 @@
-ALTER TABLE `bewodemo`.`bargeldkasse`
+ALTER TABLE `bargeldkasse`
ADD COLUMN `Anfangsbestand` DECIMAL(18,10) NULL DEFAULT NULL AFTER `Auszahlungsintervall`;
diff --git a/Report/DefaultReports/FLSListReport.Designer.cs b/Report/DefaultReports/FLSListReport.Designer.cs
index c6ea9cd84..2ef11e488 100644
--- a/Report/DefaultReports/FLSListReport.Designer.cs
+++ b/Report/DefaultReports/FLSListReport.Designer.cs
@@ -29,530 +29,530 @@ namespace BeWo.Report.DefaultReports
///
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
- this.Detail = new DevExpress.XtraReports.UI.DetailBand();
- this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
- this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
- this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
- this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
- this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
- this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
- this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
- this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
- this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
- this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
- this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
- this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
- this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
- this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
- this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
- 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();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
- //
- // Detail
- //
- 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;
- //
- // xrTableCell1
- //
- this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.components = new System.ComponentModel.Container();
+ this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+ this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+ this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+ this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
+ this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
+ 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();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+ //
+ // Detail
+ //
+ 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;
+ //
+ // xrTableCell1
+ //
+ this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.Name")});
- this.xrTableCell1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
- this.xrTableCell1.Name = "xrTableCell1";
- this.xrTableCell1.StylePriority.UseBorderColor = false;
- this.xrTableCell1.StylePriority.UseBorders = false;
- this.xrTableCell1.StylePriority.UseFont = false;
- this.xrTableCell1.Text = "xrTableCell1";
- this.xrTableCell1.Weight = 6.9183673469387754D;
- //
- // xrTableRow1
- //
- this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.StylePriority.UseBorderColor = false;
+ this.xrTableCell1.StylePriority.UseBorders = false;
+ this.xrTableCell1.StylePriority.UseFont = false;
+ this.xrTableCell1.Text = "xrTableCell1";
+ this.xrTableCell1.Weight = 6.9183673469387754D;
+ //
+ // xrTableRow1
+ //
+ this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1});
- this.xrTableRow1.Name = "xrTableRow1";
- this.xrTableRow1.Weight = 1D;
- //
- // xrTable1
- //
- this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ this.xrTableRow1.Name = "xrTableRow1";
+ this.xrTableRow1.Weight = 1D;
+ //
+ // xrTable1
+ //
+ this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
- this.xrTable1.Name = "xrTable1";
- this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+ this.xrTable1.Name = "xrTable1";
+ this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
- this.xrTable1.SizeF = new System.Drawing.SizeF(1017F, 25F);
- this.xrTable1.StylePriority.UseBorders = false;
- this.xrTable1.StylePriority.UsePadding = false;
- //
- // Detail1
- //
- this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable1.SizeF = new System.Drawing.SizeF(1017F, 25F);
+ this.xrTable1.StylePriority.UseBorders = false;
+ this.xrTable1.StylePriority.UsePadding = false;
+ //
+ // Detail1
+ //
+ this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel9,
this.xrLabel8,
this.xrLabel7,
this.xrLabel6,
this.xrTable1});
- this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Detail1.HeightF = 83F;
- this.Detail1.Name = "Detail1";
- this.Detail1.StylePriority.UseFont = false;
- //
- // xrLabel9
- //
- this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(174.5833F, 50F);
- this.xrLabel9.Name = "xrLabel9";
- this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel9.SizeF = new System.Drawing.SizeF(70F, 25F);
- this.xrLabel9.StylePriority.UseFont = false;
- this.xrLabel9.StylePriority.UseTextAlignment = false;
- this.xrLabel9.Text = "entspricht";
- this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- //
- // xrLabel8
- //
- this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.Detail1.HeightF = 83F;
+ this.Detail1.Name = "Detail1";
+ this.Detail1.StylePriority.UseFont = false;
+ //
+ // xrLabel9
+ //
+ this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(174.5833F, 50F);
+ this.xrLabel9.Name = "xrLabel9";
+ this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel9.SizeF = new System.Drawing.SizeF(70F, 25F);
+ this.xrLabel9.StylePriority.UseFont = false;
+ this.xrLabel9.StylePriority.UseTextAlignment = false;
+ this.xrLabel9.Text = "entspricht";
+ this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrLabel8
+ //
+ this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.fieldFLS", "{0:0.00} FLS")});
- this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(244.5834F, 50F);
- this.xrLabel8.Name = "xrLabel8";
- this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel8.SizeF = new System.Drawing.SizeF(235.4167F, 25F);
- this.xrLabel8.StylePriority.UseFont = false;
- this.xrLabel8.Text = "xrLabel8";
- //
- // xrLabel7
- //
- this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F);
- this.xrLabel7.Name = "xrLabel7";
- this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel7.SizeF = new System.Drawing.SizeF(110F, 25F);
- this.xrLabel7.StylePriority.UseFont = false;
- this.xrLabel7.Text = "Minuten gesamt:";
- //
- // xrLabel6
- //
- this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(244.5834F, 50F);
+ this.xrLabel8.Name = "xrLabel8";
+ this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel8.SizeF = new System.Drawing.SizeF(235.4167F, 25F);
+ this.xrLabel8.StylePriority.UseFont = false;
+ this.xrLabel8.Text = "xrLabel8";
+ //
+ // xrLabel7
+ //
+ this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F);
+ this.xrLabel7.Name = "xrLabel7";
+ this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel7.SizeF = new System.Drawing.SizeF(110F, 25F);
+ this.xrLabel7.StylePriority.UseFont = false;
+ this.xrLabel7.Text = "Minuten gesamt:";
+ //
+ // xrLabel6
+ //
+ this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.TotalFLM", "{0:0.##}")});
- this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(110F, 50F);
- this.xrLabel6.Name = "xrLabel6";
- this.xrLabel6.SizeF = new System.Drawing.SizeF(64.58335F, 25F);
- this.xrLabel6.StylePriority.UseFont = false;
- this.xrLabel6.StylePriority.UsePadding = false;
- this.xrLabel6.StylePriority.UseTextAlignment = false;
- this.xrLabel6.Text = "xrLabel6";
- this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- //
- // DetailReport
- //
- this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(110F, 50F);
+ this.xrLabel6.Name = "xrLabel6";
+ this.xrLabel6.SizeF = new System.Drawing.SizeF(64.58335F, 25F);
+ this.xrLabel6.StylePriority.UseFont = false;
+ this.xrLabel6.StylePriority.UsePadding = false;
+ this.xrLabel6.StylePriority.UseTextAlignment = false;
+ this.xrLabel6.Text = "xrLabel6";
+ this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // DetailReport
+ //
+ this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1,
this.DetailReport1});
- this.DetailReport.DataMember = "FLSReportGroups";
- this.DetailReport.DataSource = this.bindingSource1;
- this.DetailReport.Level = 0;
- this.DetailReport.Name = "DetailReport";
- //
- // DetailReport1
- //
- this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.DetailReport.DataMember = "FLSReportGroups";
+ this.DetailReport.DataSource = this.bindingSource1;
+ this.DetailReport.Level = 0;
+ this.DetailReport.Name = "DetailReport";
+ //
+ // DetailReport1
+ //
+ this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail2,
this.GroupHeader2,
this.GroupFooter1});
- this.DetailReport1.DataMember = "FLSReportGroups.ServiceRecords";
- this.DetailReport1.DataSource = this.bindingSource1;
- this.DetailReport1.Level = 0;
- this.DetailReport1.Name = "DetailReport1";
- //
- // Detail2
- //
- this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.DetailReport1.DataMember = "FLSReportGroups.ServiceRecords";
+ this.DetailReport1.DataSource = this.bindingSource1;
+ this.DetailReport1.Level = 0;
+ this.DetailReport1.Name = "DetailReport1";
+ //
+ // Detail2
+ //
+ this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable4});
- this.Detail2.HeightF = 25F;
- this.Detail2.Name = "Detail2";
- //
- // xrTable4
- //
- this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ this.Detail2.HeightF = 25F;
+ this.Detail2.Name = "Detail2";
+ //
+ // xrTable4
+ //
+ this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrTable4.Name = "xrTable4";
- this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
- this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable4.Name = "xrTable4";
+ this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow4});
- this.xrTable4.SizeF = new System.Drawing.SizeF(1018F, 25F);
- this.xrTable4.StylePriority.UseBorders = false;
- this.xrTable4.StylePriority.UsePadding = false;
- //
- // xrTableRow4
- //
- this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTable4.SizeF = new System.Drawing.SizeF(1018F, 25F);
+ this.xrTable4.StylePriority.UseBorders = false;
+ this.xrTable4.StylePriority.UsePadding = false;
+ //
+ // xrTableRow4
+ //
+ this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell4,
this.xrTableCell9,
this.xrTableCell11,
this.xrTableCell10});
- this.xrTableRow4.Name = "xrTableRow4";
- this.xrTableRow4.Weight = 1D;
- //
- // xrTableCell3
- //
- this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableRow4.Name = "xrTableRow4";
+ this.xrTableRow4.Weight = 1D;
+ //
+ // xrTableCell3
+ //
+ this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.Start", "{0:dd/MM/yyyy}")});
- this.xrTableCell3.Font = new System.Drawing.Font("Arial", 9.75F);
- this.xrTableCell3.Name = "xrTableCell3";
- this.xrTableCell3.StylePriority.UseFont = false;
- this.xrTableCell3.Text = "xrTableCell3";
- this.xrTableCell3.Weight = 0.68027210884353728D;
- //
- // xrTableCell4
- //
- this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableCell3.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell3.Name = "xrTableCell3";
+ this.xrTableCell3.StylePriority.UseFont = false;
+ this.xrTableCell3.Text = "xrTableCell3";
+ this.xrTableCell3.Weight = 0.68027210884353728D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.TimeRange")});
- this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F);
- this.xrTableCell4.Name = "xrTableCell4";
- this.xrTableCell4.StylePriority.UseFont = false;
- this.xrTableCell4.Text = "xrTableCell4";
- this.xrTableCell4.Weight = 0.68027210884353717D;
- //
- // xrTableCell9
- //
- this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.StylePriority.UseFont = false;
+ this.xrTableCell4.Text = "xrTableCell4";
+ this.xrTableCell4.Weight = 0.68027210884353717D;
+ //
+ // xrTableCell9
+ //
+ this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.RoundedDuration", "{0:0.##}")});
- this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F);
- this.xrTableCell9.Name = "xrTableCell9";
- this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
- this.xrTableCell9.StylePriority.UseFont = false;
- this.xrTableCell9.StylePriority.UsePadding = false;
- this.xrTableCell9.StylePriority.UseTextAlignment = false;
- this.xrTableCell9.Text = "xrTableCell9";
- this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell9.Weight = 0.54421768707483D;
- //
- // xrTableCell11
- //
- this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell9.Name = "xrTableCell9";
+ this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
+ this.xrTableCell9.StylePriority.UseFont = false;
+ this.xrTableCell9.StylePriority.UsePadding = false;
+ this.xrTableCell9.StylePriority.UseTextAlignment = false;
+ this.xrTableCell9.Text = "xrTableCell9";
+ this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell9.Weight = 0.54421768707483D;
+ //
+ // xrTableCell11
+ //
+ this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.GroupName")});
- this.xrTableCell11.Font = new System.Drawing.Font("Arial", 9.75F);
- this.xrTableCell11.Name = "xrTableCell11";
- this.xrTableCell11.StylePriority.UseFont = false;
- this.xrTableCell11.Text = "xrTableCell11";
- this.xrTableCell11.Weight = 1.360544217687075D;
- //
- // xrTableCell10
- //
- this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableCell11.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell11.Name = "xrTableCell11";
+ this.xrTableCell11.StylePriority.UseFont = false;
+ this.xrTableCell11.Text = "xrTableCell11";
+ this.xrTableCell11.Weight = 1.360544217687075D;
+ //
+ // xrTableCell10
+ //
+ this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.Notice")});
- this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9.75F);
- this.xrTableCell10.Multiline = true;
- this.xrTableCell10.Name = "xrTableCell10";
- this.xrTableCell10.StylePriority.UseFont = false;
- this.xrTableCell10.Text = "xrTableCell10";
- this.xrTableCell10.Weight = 3.6598639455782309D;
- //
- // GroupHeader2
- //
- this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell10.Multiline = true;
+ this.xrTableCell10.Name = "xrTableCell10";
+ this.xrTableCell10.StylePriority.UseFont = false;
+ this.xrTableCell10.Text = "xrTableCell10";
+ this.xrTableCell10.Weight = 3.6598639455782309D;
+ //
+ // GroupHeader2
+ //
+ this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable2});
- this.GroupHeader2.HeightF = 25F;
- this.GroupHeader2.Name = "GroupHeader2";
- this.GroupHeader2.RepeatEveryPage = true;
- //
- // xrTable2
- //
- this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ this.GroupHeader2.HeightF = 25F;
+ this.GroupHeader2.Name = "GroupHeader2";
+ this.GroupHeader2.RepeatEveryPage = true;
+ //
+ // xrTable2
+ //
+ this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTable2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
- this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrTable2.Name = "xrTable2";
- this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
- this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTable2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable2.Name = "xrTable2";
+ this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+ this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
- this.xrTable2.SizeF = new System.Drawing.SizeF(1018F, 25F);
- this.xrTable2.StylePriority.UseBorders = false;
- this.xrTable2.StylePriority.UseFont = false;
- this.xrTable2.StylePriority.UsePadding = false;
- //
- // xrTableRow2
- //
- this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTable2.SizeF = new System.Drawing.SizeF(1018F, 25F);
+ this.xrTable2.StylePriority.UseBorders = false;
+ this.xrTable2.StylePriority.UseFont = false;
+ this.xrTable2.StylePriority.UsePadding = false;
+ //
+ // xrTableRow2
+ //
+ this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell5,
this.xrTableCell6,
this.xrTableCell7,
this.xrTableCell2,
this.xrTableCell8});
- this.xrTableRow2.Name = "xrTableRow2";
- this.xrTableRow2.Weight = 1D;
- //
- // xrTableCell5
- //
- this.xrTableCell5.Name = "xrTableCell5";
- this.xrTableCell5.Text = "Datum";
- this.xrTableCell5.Weight = 0.68027210884353728D;
- //
- // xrTableCell6
- //
- this.xrTableCell6.Name = "xrTableCell6";
- this.xrTableCell6.Text = "Uhrzeit";
- this.xrTableCell6.Weight = 0.68027210884353717D;
- //
- // xrTableCell7
- //
- this.xrTableCell7.Name = "xrTableCell7";
- this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
- this.xrTableCell7.StylePriority.UsePadding = false;
- this.xrTableCell7.StylePriority.UseTextAlignment = false;
- this.xrTableCell7.Text = "Minuten";
- this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell7.Weight = 0.54421768707483D;
- //
- // xrTableCell2
- //
- this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrTableRow2.Name = "xrTableRow2";
+ this.xrTableRow2.Weight = 1D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.Text = "Datum";
+ this.xrTableCell5.Weight = 0.68027210884353728D;
+ //
+ // xrTableCell6
+ //
+ this.xrTableCell6.Name = "xrTableCell6";
+ this.xrTableCell6.Text = "Uhrzeit";
+ this.xrTableCell6.Weight = 0.68027210884353717D;
+ //
+ // xrTableCell7
+ //
+ this.xrTableCell7.Name = "xrTableCell7";
+ this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
+ this.xrTableCell7.StylePriority.UsePadding = false;
+ this.xrTableCell7.StylePriority.UseTextAlignment = false;
+ this.xrTableCell7.Text = "Minuten";
+ this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell7.Weight = 0.54421768707483D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "GroupTypeHeader")});
- this.xrTableCell2.Name = "xrTableCell2";
- this.xrTableCell2.Text = "xrTableCell2";
- this.xrTableCell2.Weight = 1.360544217687075D;
- //
- // xrTableCell8
- //
- this.xrTableCell8.Name = "xrTableCell8";
- this.xrTableCell8.Text = "Dokumentation";
- this.xrTableCell8.Weight = 3.6598639455782314D;
- //
- // GroupFooter1
- //
- this.GroupFooter1.HeightF = 0F;
- this.GroupFooter1.Name = "GroupFooter1";
- this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
- //
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FLSReportRO);
- //
- // ReportHeader
- //
- this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.Text = "xrTableCell2";
+ this.xrTableCell2.Weight = 1.360544217687075D;
+ //
+ // xrTableCell8
+ //
+ this.xrTableCell8.Name = "xrTableCell8";
+ this.xrTableCell8.Text = "Dokumentation";
+ this.xrTableCell8.Weight = 3.6598639455782314D;
+ //
+ // GroupFooter1
+ //
+ this.GroupFooter1.HeightF = 0F;
+ this.GroupFooter1.Name = "GroupFooter1";
+ this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FLSReportRO);
+ //
+ // ReportHeader
+ //
+ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel5,
this.xrLabel4,
this.xrLabel3,
this.xrLabel2,
this.xrLabel1});
- this.ReportHeader.HeightF = 50F;
- this.ReportHeader.Name = "ReportHeader";
- //
- // xrLabel5
- //
- this.xrLabel5.Font = new System.Drawing.Font("Arial", 12F);
- this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(175F, 25F);
- this.xrLabel5.Name = "xrLabel5";
- this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel5.SizeF = new System.Drawing.SizeF(17F, 25F);
- this.xrLabel5.StylePriority.UseFont = false;
- this.xrLabel5.StylePriority.UseTextAlignment = false;
- this.xrLabel5.Text = "-";
- this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- //
- // xrLabel4
- //
- this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.ReportHeader.HeightF = 50F;
+ this.ReportHeader.Name = "ReportHeader";
+ //
+ // xrLabel5
+ //
+ this.xrLabel5.Font = new System.Drawing.Font("Arial", 12F);
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(175F, 25F);
+ this.xrLabel5.Name = "xrLabel5";
+ this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel5.SizeF = new System.Drawing.SizeF(17F, 25F);
+ this.xrLabel5.StylePriority.UseFont = false;
+ this.xrLabel5.StylePriority.UseTextAlignment = false;
+ this.xrLabel5.Text = "-";
+ this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+ //
+ // xrLabel4
+ //
+ this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportEndDate", "{0:dd/MM/yyyy}")});
- this.xrLabel4.Font = new System.Drawing.Font("Arial", 12F);
- this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(192.0001F, 25F);
- this.xrLabel4.Name = "xrLabel4";
- this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel4.SizeF = new System.Drawing.SizeF(288F, 25F);
- this.xrLabel4.StylePriority.UseFont = false;
- this.xrLabel4.Text = "xrLabel4";
- //
- // xrLabel3
- //
- this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ this.xrLabel4.Font = new System.Drawing.Font("Arial", 12F);
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(192.0001F, 25F);
+ this.xrLabel4.Name = "xrLabel4";
+ this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel4.SizeF = new System.Drawing.SizeF(288F, 25F);
+ this.xrLabel4.StylePriority.UseFont = false;
+ this.xrLabel4.Text = "xrLabel4";
+ //
+ // xrLabel3
+ //
+ this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "{0:dd/MM/yyyy}")});
- this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F);
- this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(83F, 25F);
- this.xrLabel3.Name = "xrLabel3";
- this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel3.SizeF = new System.Drawing.SizeF(92F, 25F);
- this.xrLabel3.StylePriority.UseFont = false;
- this.xrLabel3.StylePriority.UseTextAlignment = false;
- this.xrLabel3.Text = "xrLabel3";
- this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- //
- // xrLabel2
- //
- this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F);
- this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
- this.xrLabel2.Name = "xrLabel2";
- this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel2.SizeF = new System.Drawing.SizeF(83F, 25F);
- this.xrLabel2.StylePriority.UseFont = false;
- this.xrLabel2.Text = "Zeitraum:";
- //
- // xrLabel1
- //
- this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F);
- this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrLabel1.Multiline = true;
- this.xrLabel1.Name = "xrLabel1";
- this.xrLabel1.SizeF = new System.Drawing.SizeF(1017F, 25F);
- this.xrLabel1.StyleName = "Title";
- this.xrLabel1.StylePriority.UseFont = false;
- this.xrLabel1.Text = "Auswertung über geleistete Fachleistungsstunden";
- //
- // pageFooterBand1
- //
- this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(83F, 25F);
+ this.xrLabel3.Name = "xrLabel3";
+ this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel3.SizeF = new System.Drawing.SizeF(92F, 25F);
+ this.xrLabel3.StylePriority.UseFont = false;
+ this.xrLabel3.StylePriority.UseTextAlignment = false;
+ this.xrLabel3.Text = "xrLabel3";
+ this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(83F, 25F);
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.Text = "Zeitraum:";
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel1.Multiline = true;
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(1017F, 25F);
+ this.xrLabel1.StyleName = "Title";
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "Auswertung über geleistete Fachleistungsstunden";
+ //
+ // pageFooterBand1
+ //
+ this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPageInfo2,
this.xrPageInfo1});
- this.pageFooterBand1.HeightF = 48F;
- this.pageFooterBand1.Name = "pageFooterBand1";
- //
- // xrPageInfo2
- //
- this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
- this.xrPageInfo2.Format = "Seite {0} von {1}";
- this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(480.0001F, 25F);
- this.xrPageInfo2.Name = "xrPageInfo2";
- this.xrPageInfo2.SizeF = new System.Drawing.SizeF(536.9999F, 23F);
- this.xrPageInfo2.StyleName = "PageInfo";
- this.xrPageInfo2.StylePriority.UseFont = false;
- this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- //
- // xrPageInfo1
- //
- this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
- this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(7.999929F, 25F);
- this.xrPageInfo1.Name = "xrPageInfo1";
- this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
- this.xrPageInfo1.SizeF = new System.Drawing.SizeF(271.9999F, 23F);
- this.xrPageInfo1.StyleName = "PageInfo";
- this.xrPageInfo1.StylePriority.UseFont = false;
- //
- // 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.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 = 50F;
- this.bottomMarginBand1.Name = "bottomMarginBand1";
- //
- // Leistungsdokumentation
- //
- this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.pageFooterBand1.HeightF = 48F;
+ this.pageFooterBand1.Name = "pageFooterBand1";
+ //
+ // xrPageInfo2
+ //
+ this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo2.Format = "Seite {0} von {1}";
+ this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(480.0001F, 25F);
+ this.xrPageInfo2.Name = "xrPageInfo2";
+ this.xrPageInfo2.SizeF = new System.Drawing.SizeF(536.9999F, 23F);
+ this.xrPageInfo2.StyleName = "PageInfo";
+ this.xrPageInfo2.StylePriority.UseFont = false;
+ this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrPageInfo1
+ //
+ this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(7.999929F, 25F);
+ this.xrPageInfo1.Name = "xrPageInfo1";
+ this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
+ this.xrPageInfo1.SizeF = new System.Drawing.SizeF(271.9999F, 23F);
+ this.xrPageInfo1.StyleName = "PageInfo";
+ this.xrPageInfo1.StylePriority.UseFont = false;
+ //
+ // 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.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 = 50F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // Leistungsdokumentation
+ //
+ this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.DetailReport,
this.ReportHeader,
this.pageFooterBand1,
this.topMarginBand1,
this.bottomMarginBand1});
- this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+ this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldFLS});
- this.DataSource = this.bindingSource1;
- this.Landscape = true;
- this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 50);
- this.PageHeight = 827;
- this.PageWidth = 1169;
- this.PaperKind = System.Drawing.Printing.PaperKind.A4;
- this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+ this.DataSource = this.bindingSource1;
+ this.Landscape = true;
+ this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 50);
+ this.PageHeight = 827;
+ this.PageWidth = 1169;
+ this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+ this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
this.Title,
this.FieldCaption,
this.PageInfo,
this.DataField});
- this.Version = "13.1";
- ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+ this.Version = "17.1";
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
diff --git a/Report/ReportObjects/AdditionalServiceBookingRO.cs b/Report/ReportObjects/AdditionalServiceBookingRO.cs
index 0576601b2..2014d9454 100644
--- a/Report/ReportObjects/AdditionalServiceBookingRO.cs
+++ b/Report/ReportObjects/AdditionalServiceBookingRO.cs
@@ -5,6 +5,10 @@ using System.Linq;
using BS.Shared;
using BeWo.Data.Access;
using BeWo.Data.Entities;
+using BeWo.Service.DCEntityMapper;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+using DevExpress.Entity.Model;
namespace BeWo.Report.ReportObjects
@@ -13,6 +17,8 @@ namespace BeWo.Report.ReportObjects
{
public String Month { get; set; }
+ public int MonthInt { get; set; }
+
public int Year { get; set; }
public String AdditionalServiceRegion { get; set; }
@@ -29,6 +35,7 @@ namespace BeWo.Report.ReportObjects
AdditionalServiceRegion = region.Name,
AdditionalService = region.AdditionalService.Name,
Month = month.ToString(),
+ MonthInt = (int)month,
Year = year
};
@@ -40,7 +47,8 @@ namespace BeWo.Report.ReportObjects
booking.Datum.Value.Month == (int)month &&
booking.Datum.Value.Year == year);
- var c2aodList = new Dictionary();
+ var c2aodList = new Dictionary();
+
foreach (var item in additionalServiceBookings)
{
@@ -48,18 +56,18 @@ namespace BeWo.Report.ReportObjects
foreach (var e in item.Customer2AddServiceBookings)
{
var customer = DAOFactory.GenericDAO.GetByID(e.CustomerOid);
-
- var key = customer.Person.LastName + ", " + customer.Person.FirstName;
- if (c2aodList.ContainsKey(key))
+ var cdc = MapperFactory.CompactCustomerDC_Customer.MapToNewDC(customer);
+
+ if (c2aodList.ContainsKey(cdc))
{
- c2aodList[key][item.Datum.Value.Day - 1] = (e.Participated ? "P" : "");
+ c2aodList[cdc][item.Datum.Value.Day - 1] = (e.Participated ? "P" : "");
}
else
{
var attendancies = new string[31];
attendancies[item.Datum.Value.Day - 1] = (e.Participated ? "P" : "");
- c2aodList.Add(key, attendancies);
+ c2aodList.Add(cdc, attendancies);
}
}
}
@@ -68,7 +76,8 @@ namespace BeWo.Report.ReportObjects
{
result.Rows.Add(new AdditionalServiceBookingRow
{
- Customer = item.Key,
+ CustomerDC = item.Key,
+ Customer = item.Key.LastNameFirstName,
AttendanceOnDay1 = item.Value[0] ?? "",
AttendanceOnDay2 = item.Value[1] ?? "",
AttendanceOnDay3 = item.Value[2] ?? "",
@@ -102,14 +111,211 @@ namespace BeWo.Report.ReportObjects
AttendanceOnDay31 = item.Value[30] ?? ""
});
}
-
+
result.Rows.Sort((a, b) => a.Customer.CompareTo(b.Customer));
return result;
}
+
+ public static void CalculateAbsenceTimes(AdditionalServiceBookingRO result)
+ {
+ foreach (var row in result.Rows)
+ {
+ int monthCount = 0;
+ int yearCount = 0;
+
+ foreach (var at in row.CustomerDC.AbsenceTimes)
+ {
+ if (at.Start.HasValue && at.Start.Value.Year <= result.Year &&
+ (!at.End.HasValue || at.End.Value.Year >= result.Year))
+ {
+ DateTime dt = at.Start.Value;
+ DateTime end = new DateTime(result.Year, result.MonthInt, 1).AddMonths(1);
+
+ if (at.End.HasValue && at.End.Value < end)
+ {
+ end = at.End.Value;
+ }
+
+ while (dt < end)
+ {
+ if (dt.DayOfWeek != DayOfWeek.Saturday && dt.DayOfWeek != DayOfWeek.Sunday)
+ {
+ if (dt.Year == result.Year)
+ {
+ yearCount++;
+ }
+
+ if (dt.Month == result.MonthInt)
+ {
+ monthCount++;
+
+ var name = at.Reason.Description.ToLower();
+ if (name.Contains("urlaub"))
+ {
+ SetInfo(dt, row, "U");
+ }
+ else if (name.Contains("krank"))
+ {
+ SetInfo(dt, row, "K");
+ }
+ else if (name.Contains("unentschuldigt"))
+ {
+ SetInfo(dt, row, "UE");
+ }
+ else if (name.Contains("entschuldigt"))
+ {
+ SetInfo(dt, row, "E");
+ }
+
+ }
+ }
+
+ dt = dt.AddDays(1);
+ }
+
+ }
+
+ }
+
+ row.AbsenceTimeMonthCount = monthCount;
+ row.AbsenceTimeYearCount = yearCount;
+ }
+
+ }
+
+ private static void SetInfo(DateTime dt, AdditionalServiceBookingRow row, string val)
+ {
+ if (dt.Day == 1)
+ {
+ row.AttendanceOnDay1 = val;
+ }
+ else if (dt.Day == 2)
+ {
+ row.AttendanceOnDay2 = val;
+ }
+ else if (dt.Day == 3)
+ {
+ row.AttendanceOnDay3 = val;
+ }
+ else if (dt.Day == 4)
+ {
+ row.AttendanceOnDay4 = val;
+ }
+ else if (dt.Day == 5)
+ {
+ row.AttendanceOnDay5 = val;
+ }
+ else if (dt.Day == 6)
+ {
+ row.AttendanceOnDay6 = val;
+ }
+ else if (dt.Day == 7)
+ {
+ row.AttendanceOnDay7 = val;
+ }
+ else if (dt.Day == 8)
+ {
+ row.AttendanceOnDay8 = val;
+ }
+ else if (dt.Day == 9)
+ {
+ row.AttendanceOnDay9 = val;
+ }
+ else if (dt.Day == 10)
+ {
+ row.AttendanceOnDay10 = val;
+ }
+ else if (dt.Day == 11)
+ {
+ row.AttendanceOnDay11 = val;
+ }
+ else if (dt.Day == 12)
+ {
+ row.AttendanceOnDay12 = val;
+ }
+ else if (dt.Day == 13)
+ {
+ row.AttendanceOnDay13 = val;
+ }
+ else if (dt.Day == 14)
+ {
+ row.AttendanceOnDay14 = val;
+ }
+ else if (dt.Day == 15)
+ {
+ row.AttendanceOnDay15 = val;
+ }
+ else if (dt.Day == 16)
+ {
+ row.AttendanceOnDay16 = val;
+ }
+ else if (dt.Day == 17)
+ {
+ row.AttendanceOnDay17 = val;
+ }
+ else if (dt.Day == 18)
+ {
+ row.AttendanceOnDay18 = val;
+ }
+ else if (dt.Day == 19)
+ {
+ row.AttendanceOnDay19 = val;
+ }
+ else if (dt.Day == 20)
+ {
+ row.AttendanceOnDay20 = val;
+ }
+ else if (dt.Day == 21)
+ {
+ row.AttendanceOnDay21 = val;
+ }
+ else if (dt.Day == 22)
+ {
+ row.AttendanceOnDay22 = val;
+ }
+ else if (dt.Day == 23)
+ {
+ row.AttendanceOnDay23 = val;
+ }
+ else if (dt.Day == 24)
+ {
+ row.AttendanceOnDay24 = val;
+ }
+ else if (dt.Day == 25)
+ {
+ row.AttendanceOnDay25 = val;
+ }
+ else if (dt.Day == 26)
+ {
+ row.AttendanceOnDay26 = val;
+ }
+ else if (dt.Day == 27)
+ {
+ row.AttendanceOnDay27 = val;
+ }
+ else if (dt.Day == 28)
+ {
+ row.AttendanceOnDay28 = val;
+ }
+ else if (dt.Day == 29)
+ {
+ row.AttendanceOnDay29 = val;
+ }
+ else if (dt.Day == 30)
+ {
+ row.AttendanceOnDay30 = val;
+ }
+ else if (dt.Day == 31)
+ {
+ row.AttendanceOnDay31 = val;
+ }
+ }
}
public class AdditionalServiceBookingRow
{
+ public CompactCustomerDC CustomerDC { get; set; }
+
public string Customer { get; set; } // Nachname, Vorname
public string AttendanceOnDay1 { get; set; } // O -> nicht anwesend, P -> anwesend
@@ -173,5 +379,11 @@ namespace BeWo.Report.ReportObjects
public string AttendanceOnDay30 { get; set; }
public string AttendanceOnDay31 { get; set; }
+
+ public int AbsenceTimeMonthCount { get; set; }
+
+ public int AbsenceTimeYearCount { get; set; }
+
+ public string Notice { get; set; }
}
}
diff --git a/Report/ReportObjects/SbdStundenaufstellungRO.cs b/Report/ReportObjects/SbdStundenaufstellungRO.cs
index 567414094..8ad80ee53 100644
--- a/Report/ReportObjects/SbdStundenaufstellungRO.cs
+++ b/Report/ReportObjects/SbdStundenaufstellungRO.cs
@@ -217,14 +217,18 @@ namespace BeWo.Report.ReportObjects
foreach (var e2c in emp.Employee2CustomerList)
{
- resultList.AddRange(Create(e2c.Customer, pSpan, orgaOid, empOid, serviceCategoryOid, disableEmptySupportConcepts));
+ if (e2c.Customer.IsActive == ActivationTypeId.Active)
+ {
+ resultList.AddRange(Create(e2c.Customer, pSpan, orgaOid, empOid, serviceCategoryOid,
+ disableEmptySupportConcepts));
+ }
}
}
return resultList;
}
- private static List Create(Customer cust, DateTimeSpan span, long orgaOid, long empOid, long serviceCategoryOid, bool disableEmptySupportConcepts)
+ public static List Create(Customer cust, DateTimeSpan span, long orgaOid, long empOid, long serviceCategoryOid, bool disableEmptySupportConcepts)
{
var resultList = new List();
diff --git a/Report/ReportObjects/ServicesOverviewRO.cs b/Report/ReportObjects/ServicesOverviewRO.cs
index 33023f90a..d65fdc4c6 100644
--- a/Report/ReportObjects/ServicesOverviewRO.cs
+++ b/Report/ReportObjects/ServicesOverviewRO.cs
@@ -1277,7 +1277,7 @@ namespace BeWo.Report.ReportObjects
newRo.TotalGefahreneKilometer = ro.TotalGefahreneKilometer;
newRo.SupportConceptCostBearer = ro.SupportConceptCostBearer;
newRo.Mandator = ro.Mandator;
-
+ newRo.CustomerOid = ro.CustomerOid;
return newRo;
}
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index 6b9aef2e5..97a6a0f4f 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -77,7 +77,7 @@ namespace BeWo.Service.Plugins
//t = "6483870127"; // Wigonetz
//t = "9482484652"; // Blömeling und Teckhaus
//t = "8001550599"; // Biallas BeWo
- t = "7282396774"; // Caritas Unna
+ //t = "7282396774"; // Caritas Unna
//t = "6884855402"; // IBP
//t = "4867997795"; // ADiK Kleve
//t = "3184859776"; // Sergej Becker
@@ -110,7 +110,7 @@ namespace BeWo.Service.Plugins
//t = "9417634361"; // Synprax
//t = "5761861730"; // Lebenshilfe Warendorf
//t = "6712648331"; // BeWo Färber
- //t = "4982295287"; // ASB Hamm
+ t = "4982295287"; // ASB Hamm
//t = "3890031575"; // Die Wohnhelfer Kuhrau
//t = "3536719736"; // BeWo Stefanie Schäfer (BeWoKerpen)
//t = "7739670213"; // SPZ Leverkusen
@@ -218,7 +218,11 @@ namespace BeWo.Service.Plugins
//t = "5495240031"; // Christian Luft
//t = "6922762575"; // BHS Solingen
//t = "3472573348"; // ASB Mönchengladbach
- //t = "8831599797"; //SeHT Münster
+ //t = "8831599797"; // SeHT Münster
+ //t = "7817461089"; // FAB e.V. (Familienarbeit und Beratung e.V.)
+ //t = "5207911843"; // Pro Balance
+ //t = "8619663355"; // HSH Cologne
+ //t = "1652658918"; // LH Frankfurt Oder
return t;
#else