diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
index d256670f4..7edd1c090 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
@@ -927,7 +927,7 @@
-
+
diff --git a/BeWo/ownChat/ChatServiceEmployee.xaml.cs b/BeWo/ownChat/ChatServiceEmployee.xaml.cs
index 743cbeacc..c2dcbbf3e 100644
--- a/BeWo/ownChat/ChatServiceEmployee.xaml.cs
+++ b/BeWo/ownChat/ChatServiceEmployee.xaml.cs
@@ -256,7 +256,9 @@ namespace BeWo.ownChat
var tenant = BeWoApp.Tenant;
#if DEBUG
- tenant = "5473568546";
+
+ //tenant = "5473568546";
+ tenant = "1566251835";
#endif
OwnChatHelper.OpenOwnChatPdf(tenant, BeWoApp.Mandator.Apikey, "", "", GeneratetTexfield.Text);
diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user
index a0002e9f5..769cd8b25 100644
--- a/Host/Host.csproj.user
+++ b/Host/Host.csproj.user
@@ -3,7 +3,7 @@
BeWo2.0
true
- Debug|Any CPU
+ Release|Any CPU
false
diff --git a/ReportImp/AkggMid/AkggMid.csproj b/ReportImp/AkggMid/AkggMid.csproj
index c7765b0b0..9848310f1 100644
--- a/ReportImp/AkggMid/AkggMid.csproj
+++ b/ReportImp/AkggMid/AkggMid.csproj
@@ -54,12 +54,24 @@
+
+ Component
+
+
+ EmployeeKilometerauswertungsListReportOhneKlient.cs
+
Component
EmployeeKilometerauswertungsListReport.cs
+
+ Component
+
+
+ EmployeeKilometerauswertungsReportOhneKlient.cs
+
Component
@@ -152,10 +164,17 @@
+
+ EmployeeKilometerauswertungsListReportOhneKlient.cs
+ Designer
+
EmployeeKilometerauswertungsListReport.cs
Designer
+
+ EmployeeKilometerauswertungsReportOhneKlient.cs
+
EmployeeKilometerauswertungsReport.cs
diff --git a/ReportImp/AkggMid/CustomReportCreator.cs b/ReportImp/AkggMid/CustomReportCreator.cs
index 352fd7ee7..94dfcc623 100644
--- a/ReportImp/AkggMid/CustomReportCreator.cs
+++ b/ReportImp/AkggMid/CustomReportCreator.cs
@@ -181,6 +181,21 @@ namespace AkggMid
public override XtraReport CreateEmployeeKilometerauswertung(long employeeOid, List serviceDescriptionOids, DateTime start, DateTime end)
{
var report = FindReportImp();
+
+ if (TemplateOid.HasValue)
+ {
+ if (TemplateOid.Value == 1)
+ {
+ report = new EmployeeKilometerauswertungsReport();
+ }
+ else
+ {
+ report = new EmployeeKilometerauswertungsReportOhneKlient();
+ }
+ }
+
+
+
var qbs = ServicesOverviewRO.Create(start.Month, start.Year, 0, employeeOid, start.Day, end.Day, null, true, false);
List serviceDetails = new List();
@@ -224,6 +239,17 @@ namespace AkggMid
public override XtraReport CreateKilometerauswertungForAllEmployees(List employeeOids, List serviceDescriptionOids, DateTime start, DateTime end)
{
var report = FindReportImp();
+ if (TemplateOid.HasValue)
+ {
+ if (TemplateOid.Value == 1)
+ {
+ report = new EmployeeKilometerauswertungsListReport();
+ }
+ else
+ {
+ report = new EmployeeKilometerauswertungsListReportOhneKlient();
+ }
+ }
var auswertungRO = EmployeeKilometerauswertungsListRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(DAOFactory.GenericDAO.LoadByIDs(employeeOids)), serviceDescriptionOids, start, end);
foreach (var e2e in auswertungRO.Employees2Entries)
diff --git a/ReportImp/AkggMid/EmployeeKilometerauswertungsListReportOhneKlient.Designer.cs b/ReportImp/AkggMid/EmployeeKilometerauswertungsListReportOhneKlient.Designer.cs
new file mode 100644
index 000000000..aa8e55400
--- /dev/null
+++ b/ReportImp/AkggMid/EmployeeKilometerauswertungsListReportOhneKlient.Designer.cs
@@ -0,0 +1,640 @@
+using BeWo.Report.ReportObjects;
+namespace AkggMid
+{
+ partial class EmployeeKilometerauswertungsListReportOhneKlient
+ {
+ ///
+ /// 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();
+ 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.xrLabel7 = 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.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.objectDataSource1 = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components);
+ this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+ this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel2 = 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.KilometerVerguetung = new DevExpress.XtraReports.UI.CalculatedField();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).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.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.StylePriority.UseBorderColor = false;
+ this.xrTableCell1.StylePriority.UseBorders = false;
+ this.xrTableCell1.StylePriority.UseFont = false;
+ this.xrTableCell1.Text = "Name: [EmployeeName]";
+ this.xrTableCell1.Weight = 4.0816326530612246D;
+ //
+ // 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)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable1.Name = "xrTable1";
+ this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow1});
+ this.xrTable1.SizeF = new System.Drawing.SizeF(600F, 25F);
+ this.xrTable1.StylePriority.UseBorders = false;
+ this.xrTable1.StylePriority.UsePadding = false;
+ //
+ // Detail1
+ //
+ this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel7,
+ 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 = 50F;
+ this.Detail1.Name = "Detail1";
+ this.Detail1.StylePriority.UseFont = false;
+ //
+ // xrLabel7
+ //
+ this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonthInformation", "Monat/Jahr: {0:MMMM yyyy}")});
+ this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+ this.xrLabel7.Name = "xrLabel7";
+ this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel7.SizeF = new System.Drawing.SizeF(347.7083F, 25F);
+ this.xrLabel7.StylePriority.UseFont = false;
+ //
+ // DetailReport
+ //
+ this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail1,
+ this.DetailReport1});
+ this.DetailReport.DataMember = "Employees2Entries";
+ this.DetailReport.DataSource = this.objectDataSource1;
+ 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 = "Employees2Entries.Entries";
+ this.DetailReport1.DataSource = this.objectDataSource1;
+ 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)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable4.Name = "xrTable4";
+ this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow4});
+ this.xrTable4.SizeF = new System.Drawing.SizeF(677F, 25F);
+ this.xrTable4.StylePriority.UseBorders = false;
+ this.xrTable4.StylePriority.UsePadding = false;
+ //
+ // xrTableRow4
+ //
+ this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell3,
+ this.xrTableCell8,
+ this.xrTableCell11});
+ 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, "Employees2Entries.Entries.Datum", "{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.StylePriority.UseTextAlignment = false;
+ this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell3.Weight = 0.6802721055263049D;
+ //
+ // xrTableCell8
+ //
+ this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.Notice2")});
+ this.xrTableCell8.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell8.Name = "xrTableCell8";
+ this.xrTableCell8.StylePriority.UseFont = false;
+ this.xrTableCell8.StylePriority.UseTextAlignment = false;
+ this.xrTableCell8.Text = "xrTableCell8";
+ this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell8.Weight = 2.9379014083851D;
+ //
+ // xrTableCell11
+ //
+ this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.DistanceInMeters")});
+ this.xrTableCell11.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell11.Name = "xrTableCell11";
+ this.xrTableCell11.StylePriority.UseFont = false;
+ this.xrTableCell11.StylePriority.UseTextAlignment = false;
+ this.xrTableCell11.Text = "xrTableCell11";
+ this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell11.Weight = 0.98726844592730134D;
+ //
+ // GroupHeader2
+ //
+ this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable3});
+ this.GroupHeader2.HeightF = 44.79167F;
+ this.GroupHeader2.Name = "GroupHeader2";
+ this.GroupHeader2.RepeatEveryPage = true;
+ //
+ // xrTable3
+ //
+ this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable3.Name = "xrTable3";
+ this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow3});
+ this.xrTable3.SizeF = new System.Drawing.SizeF(677F, 44.79167F);
+ this.xrTable3.StylePriority.UseBorders = false;
+ this.xrTable3.StylePriority.UseFont = false;
+ this.xrTable3.StylePriority.UsePadding = false;
+ //
+ // xrTableRow3
+ //
+ this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell12,
+ this.xrTableCell13,
+ this.xrTableCell16});
+ this.xrTableRow3.Name = "xrTableRow3";
+ this.xrTableRow3.Weight = 1D;
+ //
+ // xrTableCell12
+ //
+ this.xrTableCell12.Name = "xrTableCell12";
+ this.xrTableCell12.StylePriority.UseTextAlignment = false;
+ this.xrTableCell12.Text = "Datum";
+ this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell12.Weight = 0.68027211962967382D;
+ //
+ // xrTableCell13
+ //
+ this.xrTableCell13.Name = "xrTableCell13";
+ this.xrTableCell13.StylePriority.UseTextAlignment = false;
+ this.xrTableCell13.Text = "Fahrstrecke";
+ this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell13.Weight = 2.9379017480195495D;
+ //
+ // xrTableCell16
+ //
+ this.xrTableCell16.Multiline = true;
+ this.xrTableCell16.Name = "xrTableCell16";
+ this.xrTableCell16.StylePriority.UseTextAlignment = false;
+ this.xrTableCell16.Text = "Km /\r\nSchulassistenz";
+ this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell16.Weight = 0.98726862891403955D;
+ //
+ // GroupFooter1
+ //
+ this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable5,
+ this.xrTable2});
+ this.GroupFooter1.HeightF = 50F;
+ this.GroupFooter1.Name = "GroupFooter1";
+ this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
+ //
+ // 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, 25F);
+ this.xrTable5.Name = "xrTable5";
+ this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow5});
+ this.xrTable5.SizeF = new System.Drawing.SizeF(677F, 25F);
+ this.xrTable5.StylePriority.UseBorders = false;
+ this.xrTable5.StylePriority.UsePadding = false;
+ //
+ // xrTableRow5
+ //
+ this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell7,
+ this.xrTableCell10,
+ this.xrTableCell14,
+ this.xrTableCell17});
+ this.xrTableRow5.Name = "xrTableRow5";
+ this.xrTableRow5.Weight = 1D;
+ //
+ // xrTableCell7
+ //
+ this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell7.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell7.Name = "xrTableCell7";
+ this.xrTableCell7.StylePriority.UseBorders = false;
+ this.xrTableCell7.StylePriority.UseFont = false;
+ this.xrTableCell7.StylePriority.UseTextAlignment = false;
+ this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell7.Weight = 0.6802721055263049D;
+ //
+ // xrTableCell10
+ //
+ this.xrTableCell10.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell10.Name = "xrTableCell10";
+ this.xrTableCell10.StylePriority.UseBorders = false;
+ this.xrTableCell10.StylePriority.UseFont = false;
+ this.xrTableCell10.StylePriority.UseTextAlignment = false;
+ this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell10.Weight = 1.3180271922314462D;
+ //
+ // xrTableCell14
+ //
+ this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell14.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell14.Name = "xrTableCell14";
+ this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F);
+ this.xrTableCell14.StylePriority.UseBorders = false;
+ this.xrTableCell14.StylePriority.UseFont = false;
+ this.xrTableCell14.StylePriority.UsePadding = false;
+ this.xrTableCell14.StylePriority.UseTextAlignment = false;
+ this.xrTableCell14.Text = "Kilometer x 0,35 €";
+ this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell14.Weight = 1.6198739714748316D;
+ //
+ // xrTableCell17
+ //
+ this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.KilometerVerguetung", "{0:c}")});
+ this.xrTableCell17.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell17.Name = "xrTableCell17";
+ this.xrTableCell17.StylePriority.UseFont = false;
+ this.xrTableCell17.StylePriority.UseTextAlignment = false;
+ this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell17.Weight = 0.98726869060612354D;
+ //
+ // 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.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow2});
+ this.xrTable2.SizeF = new System.Drawing.SizeF(677F, 25F);
+ this.xrTable2.StylePriority.UseBorders = false;
+ this.xrTable2.StylePriority.UsePadding = false;
+ //
+ // xrTableRow2
+ //
+ this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell2,
+ this.xrTableCell4,
+ this.xrTableCell5,
+ this.xrTableCell6});
+ this.xrTableRow2.Name = "xrTableRow2";
+ this.xrTableRow2.Weight = 1D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell2.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.StylePriority.UseBorders = false;
+ this.xrTableCell2.StylePriority.UseFont = false;
+ this.xrTableCell2.StylePriority.UseTextAlignment = false;
+ this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell2.Weight = 0.6802721055263049D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.StylePriority.UseBorders = false;
+ this.xrTableCell4.StylePriority.UseFont = false;
+ this.xrTableCell4.StylePriority.UseTextAlignment = false;
+ this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell4.Weight = 1.3180271922314462D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell5.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F);
+ this.xrTableCell5.StylePriority.UseBorders = false;
+ this.xrTableCell5.StylePriority.UseFont = false;
+ this.xrTableCell5.StylePriority.UsePadding = false;
+ this.xrTableCell5.StylePriority.UseTextAlignment = false;
+ this.xrTableCell5.Text = "Summe aller gefahrener Kilometer";
+ this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell5.Weight = 1.6198739714748316D;
+ //
+ // xrTableCell6
+ //
+ this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.TotalDistanceInMeters", "{0:0.00}")});
+ this.xrTableCell6.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell6.Name = "xrTableCell6";
+ this.xrTableCell6.StylePriority.UseFont = false;
+ this.xrTableCell6.StylePriority.UseTextAlignment = false;
+ this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell6.Weight = 0.98726869060612354D;
+ //
+ // objectDataSource1
+ //
+ this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.EmployeeKilometerauswertungsListRO);
+ this.objectDataSource1.Name = "objectDataSource1";
+ //
+ // ReportHeader
+ //
+ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel1});
+ this.ReportHeader.HeightF = 50F;
+ this.ReportHeader.Name = "ReportHeader";
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel1.Multiline = true;
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(600F, 25F);
+ this.xrLabel1.StyleName = "Title";
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "Fahrtkostenabrechnung";
+ //
+ // pageFooterBand1
+ //
+ this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel3,
+ this.xrLabel2});
+ this.pageFooterBand1.HeightF = 83.41669F;
+ this.pageFooterBand1.Name = "pageFooterBand1";
+ //
+ // xrLabel3
+ //
+ this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 66.75002F);
+ this.xrLabel3.Multiline = true;
+ this.xrLabel3.Name = "xrLabel3";
+ this.xrLabel3.SizeF = new System.Drawing.SizeF(293.75F, 16.66667F);
+ this.xrLabel3.StyleName = "Title";
+ this.xrLabel3.StylePriority.UseBorders = false;
+ this.xrLabel3.StylePriority.UseFont = false;
+ this.xrLabel3.Text = "Unterschrift:";
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 38.62502F);
+ this.xrLabel2.Multiline = true;
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(293.75F, 16.66667F);
+ this.xrLabel2.StyleName = "Title";
+ this.xrLabel2.StylePriority.UseBorders = false;
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.Text = "Geprüft am: ";
+ //
+ // 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";
+ //
+ // KilometerVerguetung
+ //
+ this.KilometerVerguetung.DataMember = "Employees2Entries";
+ this.KilometerVerguetung.Expression = "[TotalDistanceInMeters] * 0.35";
+ this.KilometerVerguetung.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.KilometerVerguetung.Name = "KilometerVerguetung";
+ //
+ // EmployeeKilometerauswertungsListReportOhneKlient
+ //
+ 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.fieldFLS,
+ this.KilometerVerguetung});
+ this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] {
+ this.objectDataSource1});
+ this.DataSource = this.objectDataSource1;
+ this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 50);
+ this.PageHeight = 1169;
+ this.PageWidth = 827;
+ 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 = "17.1";
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraReports.UI.DetailBand Detail;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+ private DevExpress.XtraReports.UI.XRTable xrTable1;
+ private DevExpress.XtraReports.UI.DetailBand Detail1;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+ private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
+ 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.DetailReportBand DetailReport1;
+ private DevExpress.XtraReports.UI.DetailBand Detail2;
+ private DevExpress.XtraReports.UI.XRTable xrTable4;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+ private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+ private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+ private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+ private DevExpress.DataAccess.ObjectBinding.ObjectDataSource objectDataSource1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+ private DevExpress.XtraReports.UI.XRTable xrTable3;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+ private DevExpress.XtraReports.UI.XRTable xrTable2;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+ private DevExpress.XtraReports.UI.XRTable xrTable5;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+ private DevExpress.XtraReports.UI.CalculatedField KilometerVerguetung;
+ }
+}
diff --git a/ReportImp/AkggMid/EmployeeKilometerauswertungsListReportOhneKlient.cs b/ReportImp/AkggMid/EmployeeKilometerauswertungsListReportOhneKlient.cs
new file mode 100644
index 000000000..518606f05
--- /dev/null
+++ b/ReportImp/AkggMid/EmployeeKilometerauswertungsListReportOhneKlient.cs
@@ -0,0 +1,20 @@
+using BeWo.Data.Access;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+
+namespace AkggMid
+{
+ public partial class EmployeeKilometerauswertungsListReportOhneKlient : DevExpress.XtraReports.UI.XtraReport, IBeWoReport
+ {
+ public EmployeeKilometerauswertungsListReportOhneKlient()
+ {
+ InitializeComponent();
+ }
+
+ public void SetReportDataSource(EmployeeKilometerauswertungsListRO pRO)
+ {
+
+ objectDataSource1.DataSource = pRO;
+ }
+ }
+}
diff --git a/ReportImp/AkggMid/EmployeeKilometerauswertungsListReportOhneKlient.resx b/ReportImp/AkggMid/EmployeeKilometerauswertungsListReportOhneKlient.resx
new file mode 100644
index 000000000..2662eac07
--- /dev/null
+++ b/ReportImp/AkggMid/EmployeeKilometerauswertungsListReportOhneKlient.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/AkggMid/EmployeeKilometerauswertungsReportOhneKlient.cs b/ReportImp/AkggMid/EmployeeKilometerauswertungsReportOhneKlient.cs
new file mode 100644
index 000000000..a4abe66a9
--- /dev/null
+++ b/ReportImp/AkggMid/EmployeeKilometerauswertungsReportOhneKlient.cs
@@ -0,0 +1,20 @@
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+
+namespace AkggMid
+{
+ public partial class EmployeeKilometerauswertungsReportOhneKlient : DevExpress.XtraReports.UI.XtraReport, IBeWoReport
+ {
+ public EmployeeKilometerauswertungsReportOhneKlient()
+ {
+ InitializeComponent();
+ }
+
+ public void SetReportDataSource(EmployeeKilometerauswertungsRO pRO)
+ {
+ //pRO.CreateDistanceList();
+
+ objectDataSource1.DataSource = pRO;
+ }
+ }
+}
diff --git a/ReportImp/AkggMid/EmployeeKilometerauswertungsReportOhneKlient.designer.cs b/ReportImp/AkggMid/EmployeeKilometerauswertungsReportOhneKlient.designer.cs
new file mode 100644
index 000000000..a06c94511
--- /dev/null
+++ b/ReportImp/AkggMid/EmployeeKilometerauswertungsReportOhneKlient.designer.cs
@@ -0,0 +1,624 @@
+using BeWo.Report.ReportObjects;
+namespace AkggMid
+{
+ partial class EmployeeKilometerauswertungsReportOhneKlient
+ {
+ ///
+ /// 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();
+ this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+ this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrLabel13 = 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.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.objectDataSource1 = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components);
+ this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ 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.fieldGroupFLS = new DevExpress.XtraReports.UI.CalculatedField();
+ this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+ this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ this.KilometerVerguetung = new DevExpress.XtraReports.UI.CalculatedField();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).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.xrLabel13});
+ this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.Detail1.HeightF = 46.16668F;
+ this.Detail1.Name = "Detail1";
+ this.Detail1.StylePriority.UseFont = false;
+ //
+ // xrLabel13
+ //
+ this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalDistanceInMeters", "Kilometer gesamt: {0:0.##}")});
+ this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
+ this.xrLabel13.Name = "xrLabel13";
+ this.xrLabel13.SizeF = new System.Drawing.SizeF(677.0001F, 25F);
+ this.xrLabel13.StylePriority.UseFont = false;
+ this.xrLabel13.StylePriority.UsePadding = false;
+ this.xrLabel13.StylePriority.UseTextAlignment = false;
+ this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // DetailReport
+ //
+ this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail1,
+ this.DetailReport1});
+ this.DetailReport.DataSource = this.objectDataSource1;
+ this.DetailReport.Level = 0;
+ this.DetailReport.Name = "DetailReport";
+ //
+ // DetailReport1
+ //
+ this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail2,
+ this.GroupFooter1,
+ this.GroupHeader2});
+ this.DetailReport1.DataMember = "Entries";
+ this.DetailReport1.DataSource = this.objectDataSource1;
+ 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.KeepTogether = true;
+ this.Detail2.KeepTogetherWithDetailReports = true;
+ 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.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow4});
+ this.xrTable4.SizeF = new System.Drawing.SizeF(677F, 25F);
+ this.xrTable4.StylePriority.UseBorders = false;
+ this.xrTable4.StylePriority.UsePadding = false;
+ //
+ // xrTableRow4
+ //
+ this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell3,
+ this.xrTableCell2,
+ this.xrTableCell8});
+ this.xrTableRow4.Name = "xrTableRow4";
+ this.xrTableRow4.Weight = 1D;
+ //
+ // xrTableCell3
+ //
+ this.xrTableCell3.CanGrow = false;
+ this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.Datum", "{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.StylePriority.UseTextAlignment = false;
+ this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell3.Weight = 0.6802721106538383D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.Notice2")});
+ this.xrTableCell2.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.StylePriority.UseFont = false;
+ this.xrTableCell2.StylePriority.UseTextAlignment = false;
+ this.xrTableCell2.Text = "xrTableCell2";
+ this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell2.Weight = 2.9379003037662041D;
+ //
+ // xrTableCell8
+ //
+ this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.DistanceInMeters")});
+ this.xrTableCell8.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell8.Name = "xrTableCell8";
+ this.xrTableCell8.StylePriority.UseFont = false;
+ this.xrTableCell8.StylePriority.UseTextAlignment = false;
+ this.xrTableCell8.Text = "xrTableCell8";
+ this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell8.Weight = 0.987269848501449D;
+ //
+ // GroupFooter1
+ //
+ this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable2,
+ this.xrTable5});
+ this.GroupFooter1.HeightF = 50F;
+ this.GroupFooter1.Name = "GroupFooter1";
+ this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
+ //
+ // 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.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow2});
+ this.xrTable2.SizeF = new System.Drawing.SizeF(677F, 25F);
+ this.xrTable2.StylePriority.UseBorders = false;
+ this.xrTable2.StylePriority.UsePadding = false;
+ //
+ // xrTableRow2
+ //
+ this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell1,
+ this.xrTableCell4,
+ this.xrTableCell5,
+ this.xrTableCell6});
+ this.xrTableRow2.Name = "xrTableRow2";
+ this.xrTableRow2.Weight = 1D;
+ //
+ // xrTableCell1
+ //
+ this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell1.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.StylePriority.UseBorders = false;
+ this.xrTableCell1.StylePriority.UseFont = false;
+ this.xrTableCell1.StylePriority.UseTextAlignment = false;
+ this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell1.Weight = 0.6802721055263049D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.StylePriority.UseBorders = false;
+ this.xrTableCell4.StylePriority.UseFont = false;
+ this.xrTableCell4.StylePriority.UseTextAlignment = false;
+ this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell4.Weight = 1.3180271922314462D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell5.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F);
+ this.xrTableCell5.StylePriority.UseBorders = false;
+ this.xrTableCell5.StylePriority.UseFont = false;
+ this.xrTableCell5.StylePriority.UsePadding = false;
+ this.xrTableCell5.StylePriority.UseTextAlignment = false;
+ this.xrTableCell5.Text = "Summe aller gefahrener Kilometer";
+ this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell5.Weight = 1.6198739714748316D;
+ //
+ // xrTableCell6
+ //
+ this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalDistanceInMeters", "{0:0.00}")});
+ this.xrTableCell6.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell6.Name = "xrTableCell6";
+ this.xrTableCell6.StylePriority.UseFont = false;
+ this.xrTableCell6.StylePriority.UseTextAlignment = false;
+ this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell6.Weight = 0.98726869060612354D;
+ //
+ // 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, 25F);
+ this.xrTable5.Name = "xrTable5";
+ this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow5});
+ this.xrTable5.SizeF = new System.Drawing.SizeF(677F, 25F);
+ this.xrTable5.StylePriority.UseBorders = false;
+ this.xrTable5.StylePriority.UsePadding = false;
+ //
+ // xrTableRow5
+ //
+ this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell7,
+ this.xrTableCell10,
+ this.xrTableCell14,
+ this.xrTableCell17});
+ this.xrTableRow5.Name = "xrTableRow5";
+ this.xrTableRow5.Weight = 1D;
+ //
+ // xrTableCell7
+ //
+ this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell7.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell7.Name = "xrTableCell7";
+ this.xrTableCell7.StylePriority.UseBorders = false;
+ this.xrTableCell7.StylePriority.UseFont = false;
+ this.xrTableCell7.StylePriority.UseTextAlignment = false;
+ this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell7.Weight = 0.6802721055263049D;
+ //
+ // xrTableCell10
+ //
+ this.xrTableCell10.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell10.Name = "xrTableCell10";
+ this.xrTableCell10.StylePriority.UseBorders = false;
+ this.xrTableCell10.StylePriority.UseFont = false;
+ this.xrTableCell10.StylePriority.UseTextAlignment = false;
+ this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell10.Weight = 1.3180271922314462D;
+ //
+ // xrTableCell14
+ //
+ this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell14.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell14.Name = "xrTableCell14";
+ this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F);
+ this.xrTableCell14.StylePriority.UseBorders = false;
+ this.xrTableCell14.StylePriority.UseFont = false;
+ this.xrTableCell14.StylePriority.UsePadding = false;
+ this.xrTableCell14.StylePriority.UseTextAlignment = false;
+ this.xrTableCell14.Text = "Kilometer x 0,35 €";
+ this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell14.Weight = 1.6198739714748316D;
+ //
+ // xrTableCell17
+ //
+ this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "KilometerVerguetung", "{0:c}")});
+ this.xrTableCell17.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell17.Name = "xrTableCell17";
+ this.xrTableCell17.StylePriority.UseFont = false;
+ this.xrTableCell17.StylePriority.UseTextAlignment = false;
+ this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell17.Weight = 0.98726869060612354D;
+ //
+ // GroupHeader2
+ //
+ this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable3});
+ this.GroupHeader2.HeightF = 44.79167F;
+ this.GroupHeader2.Name = "GroupHeader2";
+ this.GroupHeader2.RepeatEveryPage = true;
+ //
+ // xrTable3
+ //
+ this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable3.Name = "xrTable3";
+ this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow3});
+ this.xrTable3.SizeF = new System.Drawing.SizeF(677F, 44.79167F);
+ this.xrTable3.StylePriority.UseBorders = false;
+ this.xrTable3.StylePriority.UseFont = false;
+ this.xrTable3.StylePriority.UsePadding = false;
+ //
+ // xrTableRow3
+ //
+ this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell12,
+ this.xrTableCell13,
+ this.xrTableCell16});
+ this.xrTableRow3.Name = "xrTableRow3";
+ this.xrTableRow3.Weight = 1D;
+ //
+ // xrTableCell12
+ //
+ this.xrTableCell12.Name = "xrTableCell12";
+ this.xrTableCell12.StylePriority.UseTextAlignment = false;
+ this.xrTableCell12.Text = "Datum";
+ this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell12.Weight = 0.68027211962967382D;
+ //
+ // xrTableCell13
+ //
+ this.xrTableCell13.Name = "xrTableCell13";
+ this.xrTableCell13.StylePriority.UseTextAlignment = false;
+ this.xrTableCell13.Text = "Fahrstrecke";
+ this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell13.Weight = 2.9379005024040294D;
+ //
+ // xrTableCell16
+ //
+ this.xrTableCell16.Multiline = true;
+ this.xrTableCell16.Name = "xrTableCell16";
+ this.xrTableCell16.StylePriority.UseTextAlignment = false;
+ this.xrTableCell16.Text = "Km /\r\nSchulassistenz";
+ this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell16.Weight = 0.98726987452955961D;
+ //
+ // objectDataSource1
+ //
+ this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.EmployeeKilometerauswertungsRO);
+ this.objectDataSource1.Name = "objectDataSource1";
+ //
+ // ReportHeader
+ //
+ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel2,
+ this.xrLabel1});
+ this.ReportHeader.HeightF = 50F;
+ this.ReportHeader.Name = "ReportHeader";
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonthInformation", "Zeitraum: {0:MMMM yyyy}")});
+ this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 24.99999F);
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(677.0001F, 25F);
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.StylePriority.UsePadding = false;
+ //
+ // 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(677.0001F, 25F);
+ this.xrLabel1.StyleName = "Title";
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "Auswertung über gefahrene Kilometer für [EmployeeName]";
+ //
+ // 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(433.6664F, 25F);
+ this.xrPageInfo2.Name = "xrPageInfo2";
+ this.xrPageInfo2.SizeF = new System.Drawing.SizeF(243.3336F, 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(223.25F, 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.FLSReportDetails";
+ this.fieldFLS.Expression = "[TotalFLM] / 60\r\n";
+ this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldFLS.Name = "fieldFLS";
+ //
+ // fieldGroupFLS
+ //
+ this.fieldGroupFLS.DataMember = "FLSReportGroups";
+ this.fieldGroupFLS.Expression = "[TotalFLM]/60";
+ this.fieldGroupFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldGroupFLS.Name = "fieldGroupFLS";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 50F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 50F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // KilometerVerguetung
+ //
+ this.KilometerVerguetung.Expression = "[TotalDistanceInMeters] * 0.35";
+ this.KilometerVerguetung.Name = "KilometerVerguetung";
+ //
+ // EmployeeKilometerauswertungsReportOhneKlient
+ //
+ 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.fieldFLS,
+ this.fieldGroupFLS,
+ this.KilometerVerguetung});
+ this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] {
+ this.objectDataSource1});
+ this.DataSource = this.objectDataSource1;
+ this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 50);
+ this.PageHeight = 1169;
+ this.PageWidth = 827;
+ 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 = "17.1";
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraReports.UI.DetailBand Detail;
+ private DevExpress.XtraReports.UI.DetailBand Detail1;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+ private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
+ private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
+ private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
+ 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.DetailReportBand DetailReport1;
+ private DevExpress.XtraReports.UI.DetailBand Detail2;
+ private DevExpress.XtraReports.UI.XRTable xrTable4;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel13;
+ private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
+ private DevExpress.XtraReports.UI.CalculatedField fieldGroupFLS;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+ private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+ private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+ private DevExpress.DataAccess.ObjectBinding.ObjectDataSource objectDataSource1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+ private DevExpress.XtraReports.UI.XRTable xrTable3;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+ private DevExpress.XtraReports.UI.XRTable xrTable2;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+ private DevExpress.XtraReports.UI.XRTable xrTable5;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+ private DevExpress.XtraReports.UI.CalculatedField KilometerVerguetung;
+ }
+}
diff --git a/ReportImp/AkggMid/EmployeeKilometerauswertungsReportOhneKlient.resx b/ReportImp/AkggMid/EmployeeKilometerauswertungsReportOhneKlient.resx
new file mode 100644
index 000000000..2662eac07
--- /dev/null
+++ b/ReportImp/AkggMid/EmployeeKilometerauswertungsReportOhneKlient.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/AsbRuhr/Export/FibuNetExporter.cs b/ReportImp/AsbRuhr/Export/FibuNetExporter.cs
index 4f91387fe..2c2a46096 100644
--- a/ReportImp/AsbRuhr/Export/FibuNetExporter.cs
+++ b/ReportImp/AsbRuhr/Export/FibuNetExporter.cs
@@ -347,7 +347,7 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
sb.Append("( ):1100;");
sb.Append(String.Format("{0:0};;;", ds.Betrag)); // Betrag
sb.Append(ds.Erloeskonto); // HabenKonto
- sb.Append(";1;1;");
+ sb.Append(";;0;");
sb.Append(ds.Belegnr); // Belegnummer
sb.Append(";;");
sb.Append(String.Format("{0:ddMMyyyy}", ds.Belegdatum)); // Belegdatum
@@ -371,7 +371,7 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
sb.Append(ds.Debitor);
sb.Append(";");
sb.Append(ds.Erloeskonto); // HabenKonto
- sb.Append(";1;0;"); //
+ sb.Append(";;0;"); //
sb.Append(ds.Belegnr); // Belegnummer
sb.Append(";;");
sb.Append(String.Format("{0:ddMMyyyy}", ds.Belegdatum)); // Belegdatum
diff --git a/ReportImp/DiePerspektive/Export/FibuNetExporter.cs b/ReportImp/DiePerspektive/Export/FibuNetExporter.cs
index 295cfe642..5268e1654 100644
--- a/ReportImp/DiePerspektive/Export/FibuNetExporter.cs
+++ b/ReportImp/DiePerspektive/Export/FibuNetExporter.cs
@@ -347,7 +347,7 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
sb.Append("( ):1100;");
sb.Append(String.Format("{0:0};;;", ds.Betrag)); // Betrag
sb.Append(ds.Erloeskonto); // HabenKonto
- sb.Append(";1;1;");
+ sb.Append(";;0;");
sb.Append(ds.Belegnr); // Belegnummer
sb.Append(";;");
sb.Append(String.Format("{0:ddMMyyyy}", ds.Belegdatum)); // Belegdatum
@@ -371,7 +371,7 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
sb.Append(ds.Debitor);
sb.Append(";");
sb.Append(ds.Erloeskonto); // HabenKonto
- sb.Append(";1;0;"); //
+ sb.Append(";;0;"); //
sb.Append(ds.Belegnr); // Belegnummer
sb.Append(";;");
sb.Append(String.Format("{0:ddMMyyyy}", ds.Belegdatum)); // Belegdatum
diff --git a/ReportImp/GpzBiberachReports/Invoicing/SoziotherapieInvoiceCreation.cs b/ReportImp/GpzBiberachReports/Invoicing/SoziotherapieInvoiceCreation.cs
index 6e6191944..ef9175ef0 100644
--- a/ReportImp/GpzBiberachReports/Invoicing/SoziotherapieInvoiceCreation.cs
+++ b/ReportImp/GpzBiberachReports/Invoicing/SoziotherapieInvoiceCreation.cs
@@ -4,7 +4,9 @@ using System.Linq;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
+using BeWo.Service.DCEntityMapper;
using BeWo.Service.Invoicing;
+using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
@@ -28,6 +30,7 @@ namespace BeWo.GpzBiberachReports.Invoicing
private const decimal AMOUNTPERUNIT_HAUSBESUCH_AB_APRIL_19 = 4.9m;
private const decimal AMOUNTPERUNIT_HAUSBESUCH_AB_APRIL_21 = 5.21m;
private const decimal AMOUNTPERUNIT_HAUSBESUCH_AB_APRIL_22 = 5.33m;
+ private const decimal AMOUNTPERUNIT_HAUSBESUCH_AB_APRIL_23 = 5.51m;
//private const decimal AMOUNTPERUNIT_AB_60_STUNDEN_VOR_APRIL_14 = 46.82m;
//private const decimal AMOUNTPERUNIT_AB_60_STUNDEN_AB_APRIL_14 = 48.14m;
@@ -59,6 +62,26 @@ namespace BeWo.GpzBiberachReports.Invoicing
base.SetServiceInvoicePeriods(invoice, c2s, invoicePeriod, serviceRecords);
}
+ public override bool ShouldCreateFixedAmounts(ServiceInvoicePeriod serviceInvoicePeriod, SupportConceptApprovalPeriodDC supportConceptApprovalPeriod, CostBearer2SupportConcept cb2sc)
+ {
+ return false;
+ }
+
+ public override void SetServiceInvoicePeriodAmounts(ServiceInvoice invoice)
+ {
+ foreach (ServiceInvoicePeriod iPeriod in invoice.ServiceInvoicePeriodList)
+ {
+ iPeriod.Claim = 0;
+
+ foreach (InvoiceItem item in iPeriod.InvoiceItemList)
+ {
+ if (item.GrossAmountTotal.HasValue)
+ iPeriod.Claim += item.GrossAmountTotal;
+ }
+ iPeriod.Claim = Math.Round(iPeriod.Claim.Value, 2, MidpointRounding.AwayFromZero);
+ }
+ }
+
public override IList CreateInvoiceItems(List serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc)
{
var list = base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc);
@@ -109,6 +132,26 @@ namespace BeWo.GpzBiberachReports.Invoicing
return invoiceItem;
}
+ private decimal GetHausbesuchspauschale(SupportConceptApprovalPeriod scap, String preisBezeichnung, DateTime datum)
+ {
+ var preise = DAOFactory.GenericDAO.GetAllActive();
+
+ var preis = preise.Where(p => p.Name.Contains(preisBezeichnung)).FirstOrDefault();
+ if (preis != null)
+ {
+ var crlist = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(preis.CostRatePeriods);
+
+ var cr = crlist.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, datum);
+ if (cr != null && cr.CostRateValue.HasValue)
+ {
+ return cr.CostRateValue.Value;
+ }
+ }
+
+ return 0;
+
+ }
+
public virtual IList CreateHausbesuchInvoiceItems(List serviceRecordsInPeriod, SupportConceptApprovalPeriod scap, Calculations calc)
{
//Dictionary differentDays = new Dictionary();
@@ -122,6 +165,7 @@ namespace BeWo.GpzBiberachReports.Invoicing
DateTime april19 = new DateTime(2019, 4, 1);
DateTime april21 = new DateTime(2021, 4, 1);
DateTime april22 = new DateTime(2022, 4, 1);
+ DateTime april23 = new DateTime(2023, 4, 1);
int countHausbesuchVorApril14 = 0;
int countHausbesuchAbApril14 = 0;
@@ -132,6 +176,7 @@ namespace BeWo.GpzBiberachReports.Invoicing
int countHausbesuchAbApril19 = 0;
int countHausbesuchAbApril21 = 0;
int countHausbesuchAbApril22 = 0;
+ int countHausbesuchAbApril23 = 0;
int countHausbesuchBg = 0;
foreach (var sr in serviceRecordsInPeriod)
@@ -157,8 +202,10 @@ namespace BeWo.GpzBiberachReports.Invoicing
countHausbesuchAbApril19++;
else if (sr.Start < april22)
countHausbesuchAbApril21++;
+ else if (sr.Start < april23)
+ countHausbesuchAbApril22++;
else
- countHausbesuchAbApril22++;
+ countHausbesuchAbApril23++;
}
else if (sr.ServiceDescription.Name.ToLower().Contains("st bg hb"))
{
@@ -355,6 +402,27 @@ namespace BeWo.GpzBiberachReports.Invoicing
items.Add(invoiceItem);
}
+ if (countHausbesuchAbApril23 > 0)
+ {
+ var invoiceItem = new InvoiceItem();
+
+ //decimal anzahlHausbesuche = differentDays.Count;
+ decimal anzahlHausbesuche = countHausbesuchAbApril23;
+
+
+ invoiceItem.AmountPerUnit = AMOUNTPERUNIT_HAUSBESUCH_AB_APRIL_23;
+ invoiceItem.UnitCount = anzahlHausbesuche;
+ invoiceItem.AmountTotal = anzahlHausbesuche * AMOUNTPERUNIT_HAUSBESUCH_AB_APRIL_23;
+ invoiceItem.ItemPeriodStart = scap.StartDate;
+ invoiceItem.ItemPeriodEnd = scap.EndDate;
+ invoiceItem.RateFactor = null;
+ invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
+ invoiceItem.ItemDescription = "Hausbesuchspauschale";
+ if (scap != null)
+ invoiceItem.SupportConceptApprovalPeriodOid = scap.Oid;
+
+ items.Add(invoiceItem);
+ }
if (countHausbesuchBg > 0)
{
var invoiceItem = new InvoiceItem();
diff --git a/ReportImp/GpzBiberachReports/ServiceInvoiceReportSoziotherapie.Designer.cs b/ReportImp/GpzBiberachReports/ServiceInvoiceReportSoziotherapie.Designer.cs
index bbb478920..6dbdfbe5e 100644
--- a/ReportImp/GpzBiberachReports/ServiceInvoiceReportSoziotherapie.Designer.cs
+++ b/ReportImp/GpzBiberachReports/ServiceInvoiceReportSoziotherapie.Designer.cs
@@ -56,7 +56,6 @@ namespace BeWo.GpzBiberachReports
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -88,6 +87,7 @@ namespace BeWo.GpzBiberachReports
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
@@ -96,8 +96,8 @@ namespace BeWo.GpzBiberachReports
((System.ComponentModel.ISupportInitialize)(this.xrRichText7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -341,10 +341,6 @@ namespace BeWo.GpzBiberachReports
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell5.Weight = 0.15384615384615388D;
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
- //
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -386,7 +382,7 @@ namespace BeWo.GpzBiberachReports
//
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Text = "Gespräche gesamt";
- this.xrTableCell6.Weight = 0.37833610134756746D;
+ this.xrTableCell6.Weight = 0.47449641879298182D;
//
// cellGespraecheGesamt
//
@@ -397,7 +393,7 @@ namespace BeWo.GpzBiberachReports
this.cellGespraecheGesamt.StylePriority.UsePadding = false;
this.cellGespraecheGesamt.StylePriority.UseTextAlignment = false;
this.cellGespraecheGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- this.cellGespraecheGesamt.Weight = 0.35941883865562718D;
+ this.cellGespraecheGesamt.Weight = 0.26325852121021281D;
//
// cellGespraecheBetrag
//
@@ -424,14 +420,14 @@ namespace BeWo.GpzBiberachReports
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Text = "Gruppengespräche";
- this.xrTableCell10.Weight = 0.3783360147533375D;
+ this.xrTableCell10.Weight = 0.47449630333401033D;
//
// cellGruppeGesamt
//
this.cellGruppeGesamt.Name = "cellGruppeGesamt";
this.cellGruppeGesamt.StylePriority.UseTextAlignment = false;
this.cellGruppeGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- this.cellGruppeGesamt.Weight = 0.35941895411460051D;
+ this.cellGruppeGesamt.Weight = 0.26325866553392768D;
//
// cellGruppeBetrag
//
@@ -452,15 +448,17 @@ namespace BeWo.GpzBiberachReports
// xrTableCell13
//
this.xrTableCell13.Name = "xrTableCell13";
- this.xrTableCell13.Text = "Hausbesuchspauschale";
- this.xrTableCell13.Weight = 0.37833607248282419D;
+ this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
+ this.xrTableCell13.StylePriority.UsePadding = false;
+ this.xrTableCell13.Text = "PN 2009690 Pauschale je Hausbesuch";
+ this.xrTableCell13.Weight = 0.47449630333401405D;
//
// cellHausbesuche
//
this.cellHausbesuche.Name = "cellHausbesuche";
this.cellHausbesuche.StylePriority.UseTextAlignment = false;
this.cellHausbesuche.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- this.cellHausbesuche.Weight = 0.35941883865562724D;
+ this.cellHausbesuche.Weight = 0.26325860780443744D;
//
// cellHausbesucheBetrag
//
@@ -482,14 +480,14 @@ namespace BeWo.GpzBiberachReports
//
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "Grundpauschale / Pauschale";
- this.xrTableCell16.Weight = 0.37833595702385087D;
+ this.xrTableCell16.Weight = 0.47449621673978215D;
//
// xrTableCell17
//
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- this.xrTableCell17.Weight = 0.35941906957357378D;
+ this.xrTableCell17.Weight = 0.2632588098576425D;
//
// cellGrundpauschaleBetrag
//
@@ -510,14 +508,14 @@ namespace BeWo.GpzBiberachReports
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
- this.xrTableCell8.Weight = 0.37833595702385087D;
+ this.xrTableCell8.Weight = 0.47449621673978215D;
//
// xrTableCell9
//
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- this.xrTableCell9.Weight = 0.35941895411460051D;
+ this.xrTableCell9.Weight = 0.26325869439866922D;
//
// xrTableCell11
//
@@ -538,7 +536,7 @@ namespace BeWo.GpzBiberachReports
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
- this.xrTableCell12.Weight = 0.3783360147533375D;
+ this.xrTableCell12.Weight = 0.47449630333401033D;
//
// xrTableCell14
//
@@ -548,7 +546,7 @@ namespace BeWo.GpzBiberachReports
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "Gesamt:";
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- this.xrTableCell14.Weight = 0.35941883865562718D;
+ this.xrTableCell14.Weight = 0.26325855007495436D;
//
// cellBetrag
//
@@ -623,6 +621,10 @@ namespace BeWo.GpzBiberachReports
this.PageFooter.Name = "PageFooter";
this.PageFooter.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.PageFooter_BeforePrint);
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
+ //
// RechnungSoziotherapie
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -655,8 +657,8 @@ namespace BeWo.GpzBiberachReports
((System.ComponentModel.ISupportInitialize)(this.xrRichText7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
diff --git a/ReportImp/Kette2/AuswertungSozialpsychiatrie.cs b/ReportImp/Kette2/AuswertungSozialpsychiatrie.cs
index 403cb7b7c..670674234 100644
--- a/ReportImp/Kette2/AuswertungSozialpsychiatrie.cs
+++ b/ReportImp/Kette2/AuswertungSozialpsychiatrie.cs
@@ -53,7 +53,7 @@ namespace KetteReports
//decimal flsKlientGesamt = 0;
//decimal flsKlientGesamt = 0;
//decimal hilfedauerInMonatenGesamt = 0;
- Dictionary custOidDict = new Dictionary();
+ Dictionary custOidDict = new Dictionary();
int idx = 1;
foreach (var row in queryRo.Rows)
@@ -70,172 +70,177 @@ namespace KetteReports
bool customerDoppeltVorhanden = false;
if (!custOidDict.ContainsKey(oid))
{
- custOidDict.Add(oid, true);
+ custOidDict.Add(oid, ro);
}
else
{
+ ro = custOidDict[oid];
customerDoppeltVorhanden = true;
}
+
if (!customerDoppeltVorhanden)
result.NummerCount++;
Customer c = DAOFactory.GenericDAO.LoadByID(oid);
- ro.Nummer = idx++;
- ro.NummerUndName = String.Format("{0}: {1}, {2}", ro.Nummer, c.Person.LastName, c.Person.FirstName);
-
- ro.Ort = String.Format("{0}", row.Field3);
- ro.Strasse = String.Format("{0}", row.Field4);
-
-
- var wp = GetWohnplatz(dict, ro.Strasse, ro.Ort);
- if (wp != null)
+ if (!customerDoppeltVorhanden)
{
- ro.Wohnplatz = wp.Wohnplatzname;
- ro.Strasse = wp.Strasse;
- ro.Hausnr = wp.HausNummer;
+ ro.Nummer = idx++;
- if (!customerDoppeltVorhanden)
- result.WohnplatzCount++;
- }
+ ro.NummerUndName = String.Format("{0}: {1}, {2}", ro.Nummer, c.Person.LastName, c.Person.FirstName);
- bool containsNewAngebot = c.VarFieldValueList.Exists(vv => vv.VarFieldDefOid >= 18 && vv.VarFieldDefOid <= 22);
+ ro.Ort = String.Format("{0}", row.Field3);
+ ro.Strasse = String.Format("{0}", row.Field4);
- //ro.Strasse = c.Person.FirstNameLastName;
- foreach (var vv in c.VarFieldValueList)
- {
- var varFieldValue = Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName));
- SetzeNationalitaet(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
-
- if (vv.VarFieldDefOid != 2 || !containsNewAngebot)
+ var wp = GetWohnplatz(dict, ro.Strasse, ro.Ort);
+ if (wp != null)
{
- SetzeAngebot(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
- }
-
- SetzeFahrdienst(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
- SetzeLebensumfeld(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
- SetzeErkrankung(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
- SetzeZugang(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
- SetzeOhneWohnplatz(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
- }
+ ro.Wohnplatz = wp.Wohnplatzname;
+ ro.Strasse = wp.Strasse;
+ ro.Hausnr = wp.HausNummer;
- int sex = 0;
-
- if (row.Field7 != null && Int32.TryParse(row.Field7.ToString(), out sex))
- {
- if ( sex == 1)
- {
- ro.Weiblich = "x";
if (!customerDoppeltVorhanden)
- result.WeiblichCount++;
+ result.WohnplatzCount++;
}
- else if (sex == 0)
+
+ bool containsNewAngebot = c.VarFieldValueList.Exists(vv => vv.VarFieldDefOid >= 18 && vv.VarFieldDefOid <= 22);
+
+ //ro.Strasse = c.Person.FirstNameLastName;
+ foreach (var vv in c.VarFieldValueList)
{
- ro.Maennlich = "x";
- if (!customerDoppeltVorhanden)
- result.MaennlichCount++;
+ var varFieldValue = Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName));
+
+ SetzeNationalitaet(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
+
+ if (vv.VarFieldDefOid != 2 || !containsNewAngebot)
+ {
+ SetzeAngebot(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
+ }
+
+ SetzeFahrdienst(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
+ SetzeLebensumfeld(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
+ SetzeErkrankung(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
+ SetzeZugang(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
+ SetzeOhneWohnplatz(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
}
+
+ int sex = 0;
+
+ if (row.Field7 != null && Int32.TryParse(row.Field7.ToString(), out sex))
+ {
+ if (sex == 1)
+ {
+ ro.Weiblich = "x";
+ if (!customerDoppeltVorhanden)
+ result.WeiblichCount++;
+ }
+ else if (sex == 0)
+ {
+ ro.Maennlich = "x";
+ if (!customerDoppeltVorhanden)
+ result.MaennlichCount++;
+ }
+ }
+ DateTime birthday = DateTime.MinValue;
+
+ if (row.Field12 != null)
+ {
+ DateTime.TryParse(row.Field12.ToString(), out reportStart);
+ //if (reportStart == DateTime.MinValue)
+ //{
+ // reportStart = DateTime.Now;
+ //}
+ }
+
+ if (row.Field13 != null)
+ {
+ DateTime.TryParse(row.Field13.ToString(), out reportEnd);
+ if (reportEnd >= DateTime.MaxValue.AddDays(-1))
+ {
+ reportEnd = DateTime.Now;
+ }
+ }
+
+ if (row.Field8 != null && DateTime.TryParse(row.Field8.ToString(), out birthday))
+ {
+
+
+ int alter = reportEnd.Year - birthday.Year;
+ birthday = birthday.AddYears(alter);
+ if (reportEnd.CompareTo(birthday) < 0)
+ {
+ alter--;
+ }
+
+ if (servicecategoryOid == 8)
+ {
+ cellAlter1.Text = "unter 60";
+ cellAlter2.Text = "60-70";
+ cellAlter3.Text = "71-80";
+ cellAlter4.Text = "81+";
+
+ if (alter < 60)
+ {
+ ro.AlterBis18 = "x";
+ if (!customerDoppeltVorhanden)
+ result.AlterBis18Count++;
+ }
+ else if (alter >= 60 && alter <= 70)
+ {
+ ro.Alter18_25 = "x";
+ if (!customerDoppeltVorhanden)
+ result.Alter18_25Count++;
+ }
+ else if (alter >= 71 && alter <= 80)
+ {
+ ro.Alter26_65 = "x";
+ if (!customerDoppeltVorhanden)
+ result.Alter26_65Count++;
+ }
+ else if (alter >= 81)
+ {
+ ro.AlterAb65 = "x";
+ if (!customerDoppeltVorhanden)
+ result.AlterAb65Count++;
+ }
+ }
+ else
+ {
+ if (alter < 18)
+ {
+ ro.AlterBis18 = "x";
+ if (!customerDoppeltVorhanden)
+ result.AlterBis18Count++;
+ }
+ else if (alter >= 18 && alter <= 25)
+ {
+ ro.Alter18_25 = "x";
+ if (!customerDoppeltVorhanden)
+ result.Alter18_25Count++;
+ }
+ else if (alter >= 26 && alter <= 65)
+ {
+ ro.Alter26_65 = "x";
+ if (!customerDoppeltVorhanden)
+ result.Alter26_65Count++;
+ }
+ else if (alter >= 66)
+ {
+ ro.AlterAb65 = "x";
+ if (!customerDoppeltVorhanden)
+ result.AlterAb65Count++;
+ }
+ }
+ }
+
+ ro.PrimaerErkrankung = CreateDiagnosisString(c.Diagnosis2CustomerList);
+ //ro.PrimaerErkrankung = c.Diagnosis2CustomerList.Select(s => s.ICD10DiagnosisCode).ToSeparatedString(", ");
+
+
+ SetzeVermittlung(result, ro, c, customerDoppeltVorhanden);
+ SetzeBeendigungsgrund(result, ro, c, customerDoppeltVorhanden);
}
- DateTime birthday = DateTime.MinValue;
-
- if (row.Field12 != null)
- {
- DateTime.TryParse(row.Field12.ToString(), out reportStart);
- //if (reportStart == DateTime.MinValue)
- //{
- // reportStart = DateTime.Now;
- //}
- }
-
- if (row.Field13 != null)
- {
- DateTime.TryParse(row.Field13.ToString(), out reportEnd);
- if (reportEnd >= DateTime.MaxValue.AddDays(-1))
- {
- reportEnd = DateTime.Now;
- }
- }
-
- if (row.Field8 != null && DateTime.TryParse(row.Field8.ToString(), out birthday))
- {
-
-
- int alter = reportEnd.Year - birthday.Year;
- birthday = birthday.AddYears(alter);
- if (reportEnd.CompareTo(birthday) < 0)
- {
- alter--;
- }
-
- if (servicecategoryOid == 8)
- {
- cellAlter1.Text = "unter 60";
- cellAlter2.Text = "60-70";
- cellAlter3.Text = "71-80";
- cellAlter4.Text = "81+";
-
- if (alter < 60)
- {
- ro.AlterBis18 = "x";
- if (!customerDoppeltVorhanden)
- result.AlterBis18Count++;
- }
- else if (alter >= 60 && alter <= 70)
- {
- ro.Alter18_25 = "x";
- if (!customerDoppeltVorhanden)
- result.Alter18_25Count++;
- }
- else if (alter >= 71 && alter <= 80)
- {
- ro.Alter26_65 = "x";
- if (!customerDoppeltVorhanden)
- result.Alter26_65Count++;
- }
- else if (alter >= 81)
- {
- ro.AlterAb65 = "x";
- if (!customerDoppeltVorhanden)
- result.AlterAb65Count++;
- }
- }
- else
- {
- if (alter < 18)
- {
- ro.AlterBis18 = "x";
- if (!customerDoppeltVorhanden)
- result.AlterBis18Count++;
- }
- else if (alter >= 18 && alter <= 25)
- {
- ro.Alter18_25 = "x";
- if (!customerDoppeltVorhanden)
- result.Alter18_25Count++;
- }
- else if (alter >= 26 && alter <= 65)
- {
- ro.Alter26_65 = "x";
- if (!customerDoppeltVorhanden)
- result.Alter26_65Count++;
- }
- else if (alter >= 66)
- {
- ro.AlterAb65 = "x";
- if (!customerDoppeltVorhanden)
- result.AlterAb65Count++;
- }
- }
- }
-
- ro.PrimaerErkrankung = CreateDiagnosisString(c.Diagnosis2CustomerList);
- //ro.PrimaerErkrankung = c.Diagnosis2CustomerList.Select(s => s.ICD10DiagnosisCode).ToSeparatedString(", ");
-
-
- SetzeVermittlung(result, ro, c, customerDoppeltVorhanden);
- SetzeBeendigungsgrund(result, ro, c, customerDoppeltVorhanden);
-
DateTime beantragtAb = DateTime.MinValue;
DateTime beantragtBis = DateTime.MinValue;
DateTime bewilligtAb = DateTime.MinValue;
@@ -260,26 +265,41 @@ namespace KetteReports
if (beantragtAb > DateTime.MinValue)
{
- ro.AnfrageHilfebeginn = beantragtAb;
+ if (!ro.AnfrageHilfebeginn.HasValue || beantragtAb < ro.AnfrageHilfebeginn.Value)
+ {
+ ro.AnfrageHilfebeginn = beantragtAb;
+ }
}
if (bewilligtAb > DateTime.MinValue)
{
- ro.AnfrageClearingbeginn = bewilligtAb;
+ if (!ro.AnfrageClearingbeginn.HasValue || bewilligtAb < ro.AnfrageClearingbeginn.Value)
+ {
+ ro.AnfrageClearingbeginn = bewilligtAb;
+ }
+
}
if (beantragtAb > DateTime.MinValue && bewilligtAb > DateTime.MinValue)
{
- ro.AnfrageWartezeit = (decimal)bewilligtAb.Subtract(beantragtAb).TotalDays;
+ if (!ro.AnfrageWartezeit.HasValue)
+ {
+ ro.AnfrageWartezeit = (decimal)bewilligtAb.Subtract(beantragtAb).TotalDays;
+ }
+
}
if (bewilligtBis > DateTime.MinValue)
{
- ro.HilfsdauerFallende = bewilligtBis;
+ if (!ro.HilfsdauerFallende.HasValue || bewilligtBis > ro.HilfsdauerFallende.Value)
+ {
+ ro.HilfsdauerFallende = bewilligtBis;
+ }
+
if (bewilligtAb > DateTime.MinValue)
{
- ro.HilfsdauerInMonaten = BerechneDauerInMonaten(bewilligtAb, bewilligtBis);
+ ro.HilfsdauerInMonaten += BerechneDauerInMonaten(bewilligtAb, bewilligtBis);
}
}
@@ -294,10 +314,10 @@ namespace KetteReports
result.FahrdienstNeinCount++;
}
- //if (add)
- //{
+ if (!customerDoppeltVorhanden)
+ {
result.DetailList.Add(ro);
- //}
+ }
}
return result;
}
@@ -429,9 +449,9 @@ namespace KetteReports
{
if (serviceRecord.ServiceDescription.ServiceCategory.Oid == servicecategoryOid)
{
- ro.GeleisteteFlsKlient += serviceRecord.RoundedDuration;
+ ro.GeleisteteFlsKlient += serviceRecord.RoundedDuration / 60;
- ro.GeleisteteFlsGesamt += serviceRecord.RoundedDuration;
+ ro.GeleisteteFlsGesamt += serviceRecord.RoundedDuration / 60;
}
}
//else
@@ -441,8 +461,6 @@ namespace KetteReports
}
- ro.GeleisteteFlsGesamt /= 60;
- ro.GeleisteteFlsKlient /= 60;
ro.GeleisteteFlsOhneKlient /= 60;
result.GeleisteteFlsGesamtCount += ro.GeleisteteFlsGesamt;
@@ -454,7 +472,7 @@ namespace KetteReports
var genehmigt = calc.GetApprovedHoursTotal(reldc, false);
- ro.AbrechnungVereinbarteFls = genehmigt ?? 0;
+ ro.AbrechnungVereinbarteFls += genehmigt ?? 0;
ro.AbrechnungDifferenz = ro.GeleisteteFlsGesamt - ro.AbrechnungVereinbarteFls;
result.AbrechnungVereinbarteFlsCount += ro.AbrechnungVereinbarteFls;
diff --git a/ReportImp/SicherlebenMichaelVoß/SicherlebenMichaelVoß.csproj b/ReportImp/SicherlebenMichaelVoß/SicherlebenMichaelVoß.csproj
index e1476649f..a2196ae51 100644
--- a/ReportImp/SicherlebenMichaelVoß/SicherlebenMichaelVoß.csproj
+++ b/ReportImp/SicherlebenMichaelVoß/SicherlebenMichaelVoß.csproj
@@ -32,6 +32,9 @@
+
+ False
+
diff --git a/Service/Invoicing/InvoiceCreation.cs b/Service/Invoicing/InvoiceCreation.cs
index 8d3a55574..8fa15ca08 100644
--- a/Service/Invoicing/InvoiceCreation.cs
+++ b/Service/Invoicing/InvoiceCreation.cs
@@ -786,6 +786,26 @@ namespace BeWo.Service.Invoicing
return invoiceItem;
}
+ public virtual decimal GetPreis(String preisBezeichnung, DateTime datum)
+ {
+
+ var preise = DAOFactory.GenericDAO.GetAllActive();
+
+ var preis = preise.Where(p => p.Name.Contains(preisBezeichnung)).FirstOrDefault();
+ if (preis != null)
+ {
+ var crlist = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(preis.CostRatePeriods);
+
+ var cr = crlist.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, datum);
+ if (cr != null && cr.CostRateValue.HasValue)
+ {
+ return cr.CostRateValue.Value;
+ }
+ }
+
+ return 0;
+ }
+
// public virtual void RemoveOrCropInvoiceItemsNotBillable(ServiceInvoicePeriod iPeriod)
// {
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index 00687bfa5..73623890a 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -169,7 +169,7 @@ namespace BeWo.Service.Plugins
//t = "8275654834"; // Twg Jonathan
//t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V. (FFS)
//t = "2632162696"; // Hand in Hand (ehemals Pro BeWo Düren)
- //t = "6340891020"; // Caritas Ahlen
+ t = "6340891020"; // Caritas Ahlen
//t = "3659854106"; // alpha e.V.
//t = "5809130435"; // Lebenshilfe Kusel
//t = "3367947706"; // PaS Mönchengladbach