diff --git a/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.designer.cs b/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.designer.cs index ccbde2b2b..5ec764e76 100644 --- a/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.designer.cs @@ -30,6 +30,9 @@ namespace SkmKrefeld private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); @@ -95,7 +98,8 @@ namespace SkmKrefeld // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableDetail}); - this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.Detail1.HeightF = 25F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; @@ -104,7 +108,8 @@ namespace SkmKrefeld // this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableDetail.Name = "xrTableDetail"; this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -195,9 +200,10 @@ namespace SkmKrefeld // xrTableCell6 // this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom15", "{0:n2}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom15")}); this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.Text = "xrTableCell6"; + this.xrTableCell6.TextFormatString = "{0:0.00}"; this.xrTableCell6.Weight = 0.058611361587015347D; // // DetailReport @@ -224,7 +230,7 @@ namespace SkmKrefeld this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableHeader.Name = "xrTableHeader"; this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -309,14 +315,15 @@ namespace SkmKrefeld // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1}); - this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.GroupFooter1.HeightF = 48.95833F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // // xrTable1 // - this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -356,12 +363,22 @@ namespace SkmKrefeld // // xrTableCell37 // + this.xrTableCell37.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax")}); this.xrTableCell37.Name = "xrTableCell37"; + xrSummary1.FormatString = "{0:0.00}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell37.Summary = xrSummary1; this.xrTableCell37.Weight = 0.081154151689479551D; // // xrTableCell39 // + this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit")}); this.xrTableCell39.Name = "xrTableCell39"; + xrSummary2.FormatString = "{0:0.00}"; + xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell39.Summary = xrSummary2; this.xrTableCell39.Weight = 0.094679919312514085D; // // cellSollGesamt @@ -398,7 +415,12 @@ namespace SkmKrefeld // // cellAusfallGesamt // + this.cellAusfallGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom15")}); this.cellAusfallGesamt.Name = "cellAusfallGesamt"; + xrSummary3.FormatString = "{0:0.00}"; + xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.cellAusfallGesamt.Summary = xrSummary3; this.cellAusfallGesamt.Weight = 0.058611416623224749D; // // bindingSource1 @@ -416,7 +438,7 @@ namespace SkmKrefeld // this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yyyy}")}); - this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); + this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold); this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.lblMonat.Multiline = true; this.lblMonat.Name = "lblMonat"; @@ -434,18 +456,18 @@ namespace SkmKrefeld // // xrPageInfo2 // - this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); - this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(890.0001F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 23F); this.xrPageInfo2.StyleName = "PageInfo"; this.xrPageInfo2.StylePriority.UseFont = false; this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; // // xrPageInfo1 // - this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); this.xrPageInfo1.Name = "xrPageInfo1"; this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; @@ -459,7 +481,7 @@ namespace SkmKrefeld 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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F); this.Title.ForeColor = System.Drawing.Color.Black; this.Title.Name = "Title"; // @@ -469,7 +491,7 @@ namespace SkmKrefeld 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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.FieldCaption.ForeColor = System.Drawing.Color.Black; this.FieldCaption.Name = "FieldCaption"; // @@ -479,7 +501,7 @@ namespace SkmKrefeld 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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.PageInfo.ForeColor = System.Drawing.Color.Black; this.PageInfo.Name = "PageInfo"; // @@ -489,7 +511,7 @@ namespace SkmKrefeld 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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; this.DataField.Name = "DataField"; // @@ -523,7 +545,7 @@ namespace SkmKrefeld this.fieldFLS}); this.DataSource = this.bindingSource1; this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(75, 61, 50, 30); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 61F, 50F, 30F); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -532,7 +554,7 @@ namespace SkmKrefeld this.FieldCaption, this.PageInfo, this.DataField}); - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); diff --git a/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.resx b/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.resx index d25f3eba2..d58980a38 100644 --- a/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.resx +++ b/ReportImp/SKMKrefeld/Mitarbeiterstundenkonto.resx @@ -117,7 +117,4 @@ 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/SKMKrefeld/MitarbeiterstundenkontoJahr.designer.cs b/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.designer.cs index 5c6fea1e6..8900105a4 100644 --- a/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.designer.cs +++ b/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.designer.cs @@ -34,6 +34,9 @@ namespace SkmKrefeld DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow(); @@ -102,7 +105,8 @@ namespace SkmKrefeld // this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableDetail.Name = "xrTableDetail"; this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -192,8 +196,9 @@ namespace SkmKrefeld // xrTableCell1 // this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Custom15", "{0:n2}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Custom15")}); this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.TextFormatString = "{0:0.00}"; this.xrTableCell1.Weight = 0.058611361587015361D; // // xrTableHeader @@ -201,7 +206,7 @@ namespace SkmKrefeld this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableHeader.Name = "xrTableHeader"; this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -284,7 +289,8 @@ namespace SkmKrefeld // // xrTable1 // - this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -324,12 +330,22 @@ namespace SkmKrefeld // // xrTableCell37 // + this.xrTableCell37.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollMax")}); this.xrTableCell37.Name = "xrTableCell37"; + xrSummary1.FormatString = "{0:0.00}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell37.Summary = xrSummary1; this.xrTableCell37.Weight = 0.081154151689479551D; // // xrTableCell39 // + this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UrlaubUndKrankheit")}); this.xrTableCell39.Name = "xrTableCell39"; + xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell39.Summary = xrSummary2; + this.xrTableCell39.TextFormatString = "{0:0.00}"; this.xrTableCell39.Weight = 0.094679919312514085D; // // cellSollGesamt @@ -337,9 +353,9 @@ namespace SkmKrefeld this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollOhneUrlaubKrankheit")}); this.cellSollGesamt.Name = "cellSollGesamt"; - xrSummary1.FormatString = "{0:0.00}"; - xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.cellSollGesamt.Summary = xrSummary1; + xrSummary3.FormatString = "{0:0.00}"; + xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.cellSollGesamt.Summary = xrSummary3; this.cellSollGesamt.Weight = 0.058611361587015326D; // // cellFLSSollGesamt @@ -347,9 +363,9 @@ namespace SkmKrefeld this.cellFLSSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsSoll")}); this.cellFLSSollGesamt.Name = "cellFLSSollGesamt"; - xrSummary2.FormatString = "{0:0.00}"; - xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.cellFLSSollGesamt.Summary = xrSummary2; + xrSummary4.FormatString = "{0:0.00}"; + xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.cellFLSSollGesamt.Summary = xrSummary4; this.cellFLSSollGesamt.Weight = 0.058611361587015333D; // // cellFLSIstGesamt @@ -357,9 +373,9 @@ namespace SkmKrefeld this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst")}); this.cellFLSIstGesamt.Name = "cellFLSIstGesamt"; - xrSummary3.FormatString = "{0:0.00}"; - xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.cellFLSIstGesamt.Summary = xrSummary3; + xrSummary5.FormatString = "{0:0.00}"; + xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.cellFLSIstGesamt.Summary = xrSummary5; this.cellFLSIstGesamt.Weight = 0.058611416623224784D; // // cellFLSPlusMinusGesamt @@ -367,14 +383,19 @@ namespace SkmKrefeld this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsDiff")}); this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt"; - xrSummary4.FormatString = "{0:0.00}"; - xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.cellFLSPlusMinusGesamt.Summary = xrSummary4; + xrSummary6.FormatString = "{0:0.00}"; + xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.cellFLSPlusMinusGesamt.Summary = xrSummary6; this.cellFLSPlusMinusGesamt.Weight = 0.0586113065508059D; // // cellAusfallGesamt // + this.cellAusfallGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Custom15")}); this.cellAusfallGesamt.Name = "cellAusfallGesamt"; + xrSummary7.FormatString = "{0:0.00}"; + xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.cellAusfallGesamt.Summary = xrSummary7; this.cellAusfallGesamt.Weight = 0.058611251514596466D; // // pageFooterBand1 @@ -382,23 +403,23 @@ namespace SkmKrefeld this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrPageInfo2, this.xrPageInfo1}); - this.pageFooterBand1.HeightF = 48F; + this.pageFooterBand1.HeightF = 49.25003F; this.pageFooterBand1.Name = "pageFooterBand1"; // // xrPageInfo2 // - this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); - this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(864.9999F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 23F); this.xrPageInfo2.StyleName = "PageInfo"; this.xrPageInfo2.StylePriority.UseFont = false; this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; // // xrPageInfo1 // - this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); this.xrPageInfo1.Name = "xrPageInfo1"; this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; @@ -412,7 +433,7 @@ namespace SkmKrefeld 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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F); this.Title.ForeColor = System.Drawing.Color.Black; this.Title.Name = "Title"; // @@ -422,7 +443,7 @@ namespace SkmKrefeld 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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.FieldCaption.ForeColor = System.Drawing.Color.Black; this.FieldCaption.Name = "FieldCaption"; // @@ -432,7 +453,7 @@ namespace SkmKrefeld 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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.PageInfo.ForeColor = System.Drawing.Color.Black; this.PageInfo.Name = "PageInfo"; // @@ -442,7 +463,7 @@ namespace SkmKrefeld 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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; this.DataField.Name = "DataField"; // @@ -495,7 +516,7 @@ namespace SkmKrefeld // this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableDetail}); - this.Detail3.Font = new System.Drawing.Font("Arial", 9.75F); + this.Detail3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.Detail3.HeightF = 25F; this.Detail3.Name = "Detail3"; this.Detail3.StylePriority.UseFont = false; @@ -517,7 +538,7 @@ namespace SkmKrefeld // // xrLabel1 // - this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; @@ -559,7 +580,7 @@ namespace SkmKrefeld this.DataSource = this.bindingSource1; this.DisplayName = "Mitarbeiterstundenkonto"; this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(75, 71, 50, 32); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 71F, 50F, 31.99997F); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -568,7 +589,7 @@ namespace SkmKrefeld this.FieldCaption, this.PageInfo, this.DataField}); - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); diff --git a/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.resx b/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.resx index d25f3eba2..d58980a38 100644 --- a/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.resx +++ b/ReportImp/SKMKrefeld/MitarbeiterstundenkontoJahr.resx @@ -117,7 +117,4 @@ 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/SKMKrefeld/Service/CustomCustomerService.cs b/ReportImp/SKMKrefeld/Service/CustomCustomerService.cs new file mode 100644 index 000000000..775f52138 --- /dev/null +++ b/ReportImp/SKMKrefeld/Service/CustomCustomerService.cs @@ -0,0 +1,83 @@ +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.Plugins; +using BS.Shared; +using BS.Shared.DataContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Text; +using System.Threading.Tasks; + + +namespace SkmKrefeld +{ + public class CustomCustomerService : CustomerService + { + + public override long InsertNewCustomer(CustomerDC pCustomerDc) + { + var cOid = base.InsertNewCustomer(pCustomerDc); + ErstelleOrdnerStruktur(cOid); + + return cOid; + } + + public override CustomerDC LoadCustomer(long pCustomerOid) + { + var dc = base.LoadCustomer(pCustomerOid); + var folder = DAOFactory.SearchDAO.FindBeWoFolders(TableID.Customer, pCustomerOid); + if (folder.Count == 0) + { + ErstelleOrdnerStruktur(pCustomerOid); + } + return dc; + } + + private void ErstelleOrdnerStruktur(long cOid) + { + // HIERACHIE LEVEL - 1 - + CreateBeWoFolder("Betreuungsvertrag", cOid, null); + CreateBeWoFolder("Bedarfsanzeigen", cOid, null); + CreateBeWoFolder("BEI_NRW", cOid, null); + CreateBeWoFolder("Bewilligungen", cOid, null); + CreateBeWoFolder("Einwilligungen", cOid, null); + CreateBeWoFolder("Schriftverkehr Kostenträger", cOid, null); + CreateBeWoFolder("Schriftverkehr Nutzer*in", cOid, null); + } + + private BeWoFolder CreateBeWoFolder(string name, long? cOid, long? parentOid) + { + BeWoFolder f = new BeWoFolder(); + f.Name = name; + f.ObjectOid = cOid; + f.ObjectTid = TableID.Customer; + f.ParentBeWoFolderOid = parentOid; + DAOFactory.GenericDAO.Insert(f); + + return f; + } + + private void SaveHierarchie(List folderList, long cOid, long? parentOid) + { + foreach (var item in folderList) + { + var f = CreateBeWoFolder(item.Name, cOid, parentOid); + SaveHierarchie(item.Subfolder, cOid, f.Oid); + } + } + } + + public class Folder + { + public Folder(String name) + { + Name = name; + Subfolder = new List(); + } + public String Name { get; set; } + + public List Subfolder { get; set; } + } +} diff --git a/ReportImp/SKMKrefeld/SkmKrefeld.csproj b/ReportImp/SKMKrefeld/SkmKrefeld.csproj index 140691272..27c801dec 100644 --- a/ReportImp/SKMKrefeld/SkmKrefeld.csproj +++ b/ReportImp/SKMKrefeld/SkmKrefeld.csproj @@ -89,6 +89,7 @@ Quittierungsbeleg.cs + Component