diff --git a/Data/Security/UserRightHelper.cs b/Data/Security/UserRightHelper.cs index 5608df57f..e02079741 100644 --- a/Data/Security/UserRightHelper.cs +++ b/Data/Security/UserRightHelper.cs @@ -143,6 +143,11 @@ namespace BeWo.Data.Security { return "3.17"; } + if (r == UserRightType.AdditionalService_Edit) + { + return "3.18"; + } + return "1.0"; } diff --git a/ReportImp/BundBBetreutesWohnen/BundBBetreutesWohnen.csproj b/ReportImp/BundBBetreutesWohnen/BundBBetreutesWohnen.csproj index 45a0bee0e..c7e217fe3 100644 --- a/ReportImp/BundBBetreutesWohnen/BundBBetreutesWohnen.csproj +++ b/ReportImp/BundBBetreutesWohnen/BundBBetreutesWohnen.csproj @@ -66,6 +66,13 @@ + + + Component + + + Mitarbeiterarbeitszeitkonto.cs + Component @@ -73,6 +80,12 @@ Mitarbeiterstundenkonto.cs + + Component + + + MitarbeiterstundenkontoJahr.cs + Component @@ -106,10 +119,17 @@ + + Mitarbeiterarbeitszeitkonto.cs + Mitarbeiterstundenkonto.cs Designer + + MitarbeiterstundenkontoJahr.cs + Designer + ServiceInvoiceReport.cs diff --git a/ReportImp/BundBBetreutesWohnen/CustomMitarbeiterstundenkontoBerechnungMonate.cs b/ReportImp/BundBBetreutesWohnen/CustomMitarbeiterstundenkontoBerechnungMonate.cs new file mode 100644 index 000000000..26c2b0793 --- /dev/null +++ b/ReportImp/BundBBetreutesWohnen/CustomMitarbeiterstundenkontoBerechnungMonate.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows.Forms; +using BeWo.Report; +using BeWo.Data.Entities; +using BeWo.Report.ReportObjects; + + +namespace BundBBetreutesWohnen +{ + public class CustomMitarbeiterstundenkontoBerechnungMonate : MitarbeiterstundenkontoBerechnungMonate + { + public override MitarbeiterstundenkontoBerechnung CreateMitarbeiterstundenkontoBerechnung() + { + return new CustomMitarbeiterstundenkontoBerechnung(); + } + } +} diff --git a/ReportImp/BundBBetreutesWohnen/Mitarbeiterarbeitszeitkonto.cs b/ReportImp/BundBBetreutesWohnen/Mitarbeiterarbeitszeitkonto.cs new file mode 100644 index 000000000..c14ea1170 --- /dev/null +++ b/ReportImp/BundBBetreutesWohnen/Mitarbeiterarbeitszeitkonto.cs @@ -0,0 +1,53 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using BeWo.Report; +using BeWo.Report.ReportObjects; + +using BS.Shared.Core; +using DevExpress.XtraReports.UI; + +namespace BundBBetreutesWohnen +{ + [IDSpecificClass(Identifier = "Mitarbeiterarbeitszeitkonto")] + public partial class Mitarbeiterarbeitszeitkonto : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + + public Mitarbeiterarbeitszeitkonto() + { + InitializeComponent(); + } + + public void SetReportDataSource(MitarbeiterstundenkontoRO pRO) + { + var msb = new CustomMitarbeiterstundenkontoBerechnung(); + msb.CreateReport(pRO); + + foreach (var ed in pRO.EmployeeDetailList) + { + var c = ed.Employee.GetValidContractForDate(pRO.ReportStartDate); + if (c != null) + { + if (c.MonthlyTotalHours.HasValue) + { + ed.Regelarbeitszeit = String.Format("{0:0.00} Stunden im Monat", c.MonthlyTotalHours); + } + else if (c.WeeklyTotalHours.HasValue) + { + ed.Regelarbeitszeit = String.Format("{0:0.00} Stunden pro Woche", c.WeeklyTotalHours); + } + } + + ed.UrlaubUndKrankheit = 0; + foreach (var day in ed.Days) + { + ed.UrlaubUndKrankheit += (day.HoursSick + day.HoursInVacation); + } + + } + this.bindingSource1.DataSource = pRO; + } + + } +} diff --git a/ReportImp/BundBBetreutesWohnen/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/BundBBetreutesWohnen/Mitarbeiterarbeitszeitkonto.designer.cs new file mode 100644 index 000000000..85adf7060 --- /dev/null +++ b/ReportImp/BundBBetreutesWohnen/Mitarbeiterarbeitszeitkonto.designer.cs @@ -0,0 +1,1108 @@ +using BeWo.Report.ReportObjects; +namespace BundBBetreutesWohnen +{ + partial class Mitarbeiterarbeitszeitkonto + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell67 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); + this.ruleIstFeiertagOderWE = new DevExpress.XtraReports.UI.FormattingRule(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellRegelarbeitszeit = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell64 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellSumMinutesTotalDecimal = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellSumHoursSickDecimal = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellSumHoursInVacationDecimal = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellSumMinutesTotalDecimal2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.sollStundenMonatLabelTableCell = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + 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.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.fieldSumSpecial = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldSumSonntag = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldSumFeiertag = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldHours = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldSick = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldVacation = new DevExpress.XtraReports.UI.CalculatedField(); + this.calculatedField1 = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldSumHours = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldSumHoliday2 = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + 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.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.HeightF = 0F; + this.Detail1.Name = "Detail1"; + this.Detail1.StylePriority.UseFont = false; + // + // xrTableDetail + // + 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", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((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); + this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRowDetail}); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(670F, 22F); + this.xrTableDetail.StylePriority.UseBorders = false; + this.xrTableDetail.StylePriority.UseFont = false; + this.xrTableDetail.StylePriority.UsePadding = false; + this.xrTableDetail.StylePriority.UseTextAlignment = false; + this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRowDetail + // + this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell20, + this.xrTableCell31, + this.xrTableCell67, + this.xrTableCell27}); + this.xrTableRowDetail.FormattingRules.Add(this.ruleIstFeiertagOderWE); + this.xrTableRowDetail.Name = "xrTableRowDetail"; + this.xrTableRowDetail.Weight = 0.88D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.Date", "{0:ddd. dd.MM.}")}); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell3.Weight = 0.090171325518485154D; + this.xrTableCell3.XlsxFormatString = "ddd. dd.MM.yyyy"; + // + // xrTableCell20 + // + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.ZeitraeumeString", "{0:HH:mm}")}); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.Text = "xrTableCell20"; + this.xrTableCell20.Weight = 0.27051398343498156D; + // + // xrTableCell31 + // + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldHours", "{0:0.00}")}); + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.StylePriority.UseTextAlignment = false; + this.xrTableCell31.Text = "xrTableCell31"; + this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell31.Weight = 0.08115419554645896D; + // + // xrTableCell67 + // + this.xrTableCell67.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursSick", "{0:0.00}")}); + this.xrTableCell67.Name = "xrTableCell67"; + this.xrTableCell67.StylePriority.UseTextAlignment = false; + this.xrTableCell67.Text = "xrTableCell67"; + this.xrTableCell67.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell67.Weight = 0.081154197266340475D; + // + // xrTableCell27 + // + this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursInVacation", "{0:0.00}")}); + this.xrTableCell27.Name = "xrTableCell27"; + this.xrTableCell27.StylePriority.UseTextAlignment = false; + this.xrTableCell27.Text = "xrTableCell27"; + this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell27.Weight = 0.08115417920758361D; + // + // ruleIstFeiertagOderWE + // + this.ruleIstFeiertagOderWE.Condition = "[IstFeiertag] Or [IstSamstag] Or [IstSonntag]"; + this.ruleIstFeiertagOderWE.DataMember = "EmployeeDetailList.Days"; + this.ruleIstFeiertagOderWE.Formatting.BackColor = System.Drawing.Color.LightSteelBlue; + this.ruleIstFeiertagOderWE.Name = "ruleIstFeiertagOderWE"; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport1}); + this.DetailReport.DataMember = "EmployeeDetailList"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // DetailReport1 + // + this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail2, + this.GroupHeader2, + this.GroupHeader3, + this.GroupFooter2}); + this.DetailReport1.DataMember = "EmployeeDetailList.Days"; + this.DetailReport1.DataSource = this.bindingSource1; + this.DetailReport1.Level = 0; + this.DetailReport1.Name = "DetailReport1"; + // + // Detail2 + // + this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableDetail}); + this.Detail2.Font = new System.Drawing.Font("Arial", 8F); + this.Detail2.HeightF = 22F; + this.Detail2.Name = "Detail2"; + this.Detail2.StylePriority.UseFont = false; + // + // GroupHeader2 + // + this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableHeader}); + this.GroupHeader2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.GroupHeader2.HeightF = 30F; + this.GroupHeader2.Name = "GroupHeader2"; + this.GroupHeader2.StylePriority.UseFont = false; + // + // xrTableHeader + // + this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + 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); + this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRowHeader}); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(670F, 30F); + this.xrTableHeader.StylePriority.UseBackColor = false; + this.xrTableHeader.StylePriority.UseBorders = false; + this.xrTableHeader.StylePriority.UseFont = false; + this.xrTableHeader.StylePriority.UsePadding = false; + this.xrTableHeader.StylePriority.UseTextAlignment = false; + this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRowHeader + // + this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell2, + this.xrTableCell7, + this.xrTableCell8, + this.xrTableCell10}); + this.xrTableRowHeader.Name = "xrTableRowHeader"; + this.xrTableRowHeader.Weight = 0.79999999999999982D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Datum"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell5.Weight = 0.090171325629990237D; + // + // xrTableCell2 + // + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "Uhrzeit"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell2.Weight = 0.27051397637806085D; + // + // xrTableCell7 + // + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "Stunden"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell7.Weight = 0.081154194025935031D; + // + // xrTableCell8 + // + this.xrTableCell8.Multiline = true; + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "Krank"; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell8.Weight = 0.081154199562331691D; + // + // xrTableCell10 + // + this.xrTableCell10.Multiline = true; + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.StylePriority.UseBackColor = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.Text = "Urlaub"; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell10.Weight = 0.0811541853775325D; + // + // GroupHeader3 + // + this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblMonat, + this.xrTable2}); + this.GroupHeader3.Font = new System.Drawing.Font("Arial", 10F); + this.GroupHeader3.HeightF = 120F; + this.GroupHeader3.Level = 1; + this.GroupHeader3.Name = "GroupHeader3"; + this.GroupHeader3.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand; + this.GroupHeader3.StylePriority.UseFont = false; + // + // lblMonat + // + this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yy}")}); + this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); + this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.lblMonat.Multiline = true; + this.lblMonat.Name = "lblMonat"; + this.lblMonat.SizeF = new System.Drawing.SizeF(700.0001F, 25F); + this.lblMonat.StyleName = "Title"; + this.lblMonat.StylePriority.UseFont = false; + this.lblMonat.Text = "lblMonat"; + // + // xrTable2 + // + this.xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 47.91663F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1, + this.xrTableRow8, + this.xrTableRow10}); + this.xrTable2.SizeF = new System.Drawing.SizeF(552.2002F, 54F); + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + this.xrTable2.StylePriority.UsePadding = false; + this.xrTable2.StylePriority.UseTextAlignment = false; + this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.xrTableCell25}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.75540991165010141D; + // + // xrTableCell1 + // + this.xrTableCell1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.StylePriority.UseTextAlignment = false; + this.xrTableCell1.Text = "Mitarbeiter/in:"; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell1.Weight = 0.138246012405208D; + // + // xrTableCell25 + // + this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")}); + this.xrTableCell25.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell25.Multiline = true; + this.xrTableCell25.Name = "xrTableCell25"; + this.xrTableCell25.StylePriority.UseFont = false; + this.xrTableCell25.StylePriority.UseTextAlignment = false; + this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell25.Weight = 0.49791629021026568D; + // + // xrTableRow8 + // + this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell6, + this.cellRegelarbeitszeit}); + this.xrTableRow8.Name = "xrTableRow8"; + this.xrTableRow8.Weight = 0.75540991165010141D; + // + // xrTableCell6 + // + this.xrTableCell6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell6.StylePriority.UseFont = false; + this.xrTableCell6.StylePriority.UsePadding = false; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "Regelarbeitszeit:"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell6.Weight = 0.138246012405208D; + // + // cellRegelarbeitszeit + // + this.cellRegelarbeitszeit.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Regelarbeitszeit")}); + this.cellRegelarbeitszeit.Name = "cellRegelarbeitszeit"; + this.cellRegelarbeitszeit.StylePriority.UseFont = false; + this.cellRegelarbeitszeit.StylePriority.UseTextAlignment = false; + this.cellRegelarbeitszeit.Text = "cellRegelarbeitszeit"; + this.cellRegelarbeitszeit.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.cellRegelarbeitszeit.Weight = 0.49791629021026573D; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell21, + this.xrTableCell24, + this.xrTableCell28, + this.xrTableCell23}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 0.75540991165010141D; + // + // xrTableCell21 + // + this.xrTableCell21.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell21.StylePriority.UseFont = false; + this.xrTableCell21.StylePriority.UsePadding = false; + this.xrTableCell21.StylePriority.UseTextAlignment = false; + this.xrTableCell21.Text = "Soll-Stunden:"; + this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell21.Weight = 0.138246012405208D; + // + // xrTableCell24 + // + this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")}); + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.StylePriority.UseTextAlignment = false; + this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell24.Weight = 0.17215478017129932D; + // + // xrTableCell28 + // + this.xrTableCell28.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.StylePriority.UseFont = false; + this.xrTableCell28.StylePriority.UseTextAlignment = false; + this.xrTableCell28.Text = "Arbeitstage diesen Monat:"; + this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell28.Weight = 0.213129273221085D; + // + // xrTableCell23 + // + this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.ArbeitstageImBerichtszeitraum", "{0:0}")}); + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.StylePriority.UseFont = false; + this.xrTableCell23.StylePriority.UseTextAlignment = false; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell23.Weight = 0.11263223681788141D; + // + // GroupFooter2 + // + this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4, + this.xrTable1}); + this.GroupFooter2.Font = new System.Drawing.Font("Arial", 10F); + this.GroupFooter2.HeightF = 116.6667F; + this.GroupFooter2.KeepTogether = true; + this.GroupFooter2.Name = "GroupFooter2"; + this.GroupFooter2.StylePriority.UseFont = false; + // + // xrTable4 + // + this.xrTable4.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(110F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow9}); + this.xrTable4.SizeF = new System.Drawing.SizeF(560F, 22F); + this.xrTable4.StylePriority.UseBorders = false; + this.xrTable4.StylePriority.UseFont = false; + this.xrTable4.StylePriority.UsePadding = false; + this.xrTable4.StylePriority.UseTextAlignment = false; + this.xrTable4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow9 + // + this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell64, + this.cellSumMinutesTotalDecimal, + this.cellSumHoursSickDecimal, + this.cellSumHoursInVacationDecimal}); + this.xrTableRow9.Name = "xrTableRow9"; + this.xrTableRow9.Weight = 0.87999999999999978D; + // + // xrTableCell64 + // + this.xrTableCell64.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell64.Name = "xrTableCell64"; + this.xrTableCell64.StylePriority.UseFont = false; + this.xrTableCell64.StylePriority.UseTextAlignment = false; + this.xrTableCell64.Text = "Summe:"; + this.xrTableCell64.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell64.Weight = 0.26149405118689462D; + // + // cellSumMinutesTotalDecimal + // + this.cellSumMinutesTotalDecimal.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldHours")}); + this.cellSumMinutesTotalDecimal.Name = "cellSumMinutesTotalDecimal"; + this.cellSumMinutesTotalDecimal.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:0.00}"; + xrSummary1.IgnoreNullValues = true; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.cellSumMinutesTotalDecimal.Summary = xrSummary1; + this.cellSumMinutesTotalDecimal.Text = "cellSumMinutesTotalDecimal"; + this.cellSumMinutesTotalDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellSumMinutesTotalDecimal.Weight = 0.081153321921416444D; + // + // cellSumHoursSickDecimal + // + this.cellSumHoursSickDecimal.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursSick")}); + this.cellSumHoursSickDecimal.Multiline = true; + this.cellSumHoursSickDecimal.Name = "cellSumHoursSickDecimal"; + this.cellSumHoursSickDecimal.StylePriority.UseTextAlignment = false; + xrSummary2.FormatString = "{0:0.00}"; + xrSummary2.IgnoreNullValues = true; + xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.cellSumHoursSickDecimal.Summary = xrSummary2; + this.cellSumHoursSickDecimal.Text = "cellSumHoursSickDecimal"; + this.cellSumHoursSickDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellSumHoursSickDecimal.Weight = 0.081153328404945282D; + // + // cellSumHoursInVacationDecimal + // + this.cellSumHoursInVacationDecimal.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursInVacation")}); + this.cellSumHoursInVacationDecimal.Multiline = true; + this.cellSumHoursInVacationDecimal.Name = "cellSumHoursInVacationDecimal"; + this.cellSumHoursInVacationDecimal.StylePriority.UseBackColor = false; + this.cellSumHoursInVacationDecimal.StylePriority.UseTextAlignment = false; + xrSummary3.FormatString = "{0:0.00}"; + xrSummary3.IgnoreNullValues = true; + xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.cellSumHoursInVacationDecimal.Summary = xrSummary3; + this.cellSumHoursInVacationDecimal.Text = "cellSumHoursInVacationDecimal"; + this.cellSumHoursInVacationDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellSumHoursInVacationDecimal.Weight = 0.081153321723263658D; + // + // xrTable1 + // + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 36.66667F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow4, + this.xrTableRow2, + this.xrTableRow5, + this.xrTableRow6}); + this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 80F); + this.xrTable1.StylePriority.UseBorders = false; + this.xrTable1.StylePriority.UseFont = false; + this.xrTable1.StylePriority.UsePadding = false; + this.xrTable1.StylePriority.UseTextAlignment = false; + this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell46, + this.cellSumMinutesTotalDecimal2, + this.xrTableCell17, + this.xrTableCell15}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 0.8D; + // + // xrTableCell46 + // + this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); + this.xrTableCell46.Name = "xrTableCell46"; + this.xrTableCell46.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); + this.xrTableCell46.StylePriority.UseBorders = false; + this.xrTableCell46.StylePriority.UsePadding = false; + this.xrTableCell46.StylePriority.UseTextAlignment = false; + this.xrTableCell46.Text = "Reguläre Soll-Stunden:"; + this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell46.Weight = 0.17987241552156494D; + // + // cellSumMinutesTotalDecimal2 + // + this.cellSumMinutesTotalDecimal2.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.cellSumMinutesTotalDecimal2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")}); + this.cellSumMinutesTotalDecimal2.Name = "cellSumMinutesTotalDecimal2"; + this.cellSumMinutesTotalDecimal2.StylePriority.UseBorders = false; + this.cellSumMinutesTotalDecimal2.StylePriority.UseTextAlignment = false; + this.cellSumMinutesTotalDecimal2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellSumMinutesTotalDecimal2.Weight = 0.089936205759550983D; + // + // xrTableCell17 + // + this.xrTableCell17.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); + this.xrTableCell17.StylePriority.UseBorders = false; + this.xrTableCell17.StylePriority.UsePadding = false; + this.xrTableCell17.StylePriority.UseTextAlignment = false; + this.xrTableCell17.Text = "Überstunden neu:"; + this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell17.Weight = 0.22133305845875073D; + // + // xrTableCell15 + // + this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")}); + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.StylePriority.UseBorders = false; + this.xrTableCell15.StylePriority.UseTextAlignment = false; + this.xrTableCell15.Text = "xrTableCell15"; + this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell15.Weight = 0.11143078651026214D; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell4, + this.xrTableCell9, + this.xrTableCell16, + this.xrTableCell19}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 0.8D; + // + // xrTableCell4 + // + this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); + this.xrTableCell4.StylePriority.UseBorders = false; + this.xrTableCell4.StylePriority.UsePadding = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.Text = "Stunden Urlaub/Krankheit:"; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell4.Weight = 0.17987241552156494D; + // + // xrTableCell9 + // + this.xrTableCell9.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")}); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell9.Weight = 0.089936205759550983D; + // + // xrTableCell16 + // + this.xrTableCell16.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); + this.xrTableCell16.StylePriority.UseBorders = false; + this.xrTableCell16.StylePriority.UsePadding = false; + this.xrTableCell16.StylePriority.UseTextAlignment = false; + this.xrTableCell16.Text = "Überstunden Vormonat:"; + this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell16.Weight = 0.22133304473557486D; + // + // xrTableCell19 + // + this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")}); + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.StylePriority.UseBorders = false; + this.xrTableCell19.StylePriority.UseTextAlignment = false; + this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell19.Weight = 0.11143080023343803D; + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.sollStundenMonatLabelTableCell, + this.xrTableCell50, + this.xrTableCell51, + this.xrTableCell18}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 0.8D; + // + // sollStundenMonatLabelTableCell + // + this.sollStundenMonatLabelTableCell.Borders = DevExpress.XtraPrinting.BorderSide.Left; + this.sollStundenMonatLabelTableCell.Name = "sollStundenMonatLabelTableCell"; + this.sollStundenMonatLabelTableCell.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); + this.sollStundenMonatLabelTableCell.StylePriority.UseBorders = false; + this.sollStundenMonatLabelTableCell.StylePriority.UsePadding = false; + this.sollStundenMonatLabelTableCell.StylePriority.UseTextAlignment = false; + this.sollStundenMonatLabelTableCell.Text = "Tatsächliche Soll-Stunden:"; + this.sollStundenMonatLabelTableCell.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.sollStundenMonatLabelTableCell.Weight = 0.17987240787980183D; + // + // xrTableCell50 + // + this.xrTableCell50.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")}); + this.xrTableCell50.Name = "xrTableCell50"; + this.xrTableCell50.StylePriority.UseBorders = false; + this.xrTableCell50.StylePriority.UseTextAlignment = false; + this.xrTableCell50.Text = "xrTableCell50"; + this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell50.Weight = 0.089936204907624953D; + // + // xrTableCell51 + // + this.xrTableCell51.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell51.Name = "xrTableCell51"; + this.xrTableCell51.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); + this.xrTableCell51.StylePriority.UseBorders = false; + this.xrTableCell51.StylePriority.UseFont = false; + this.xrTableCell51.StylePriority.UsePadding = false; + this.xrTableCell51.StylePriority.UseTextAlignment = false; + this.xrTableCell51.Text = "davon ausbezahlt:"; + this.xrTableCell51.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell51.Weight = 0.22133303497678214D; + // + // xrTableCell18 + // + this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenAusbezahlt", "{0:0.00}")}); + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseBorders = false; + this.xrTableCell18.StylePriority.UseTextAlignment = false; + this.xrTableCell18.Text = "xrTableCell18"; + this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell18.Weight = 0.11143081848591993D; + // + // xrTableRow6 + // + this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell48, + this.xrTableCell57, + this.xrTableCell58, + this.xrTableCell26}); + this.xrTableRow6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableRow6.Name = "xrTableRow6"; + this.xrTableRow6.StylePriority.UseFont = false; + this.xrTableRow6.Weight = 0.8D; + // + // xrTableCell48 + // + this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell48.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell48.Name = "xrTableCell48"; + this.xrTableCell48.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); + this.xrTableCell48.StylePriority.UseBorders = false; + this.xrTableCell48.StylePriority.UseFont = false; + this.xrTableCell48.StylePriority.UsePadding = false; + this.xrTableCell48.StylePriority.UseTextAlignment = false; + this.xrTableCell48.Text = "Arbeitszeit:"; + this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell48.Weight = 0.17987240787980294D; + // + // xrTableCell57 + // + this.xrTableCell57.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell57.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldHours")}); + this.xrTableCell57.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell57.Name = "xrTableCell57"; + this.xrTableCell57.StylePriority.UseBorders = false; + this.xrTableCell57.StylePriority.UseFont = false; + this.xrTableCell57.StylePriority.UseTextAlignment = false; + xrSummary4.FormatString = "{0:0.00}"; + xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell57.Summary = xrSummary4; + this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell57.Weight = 0.089936204907626063D; + // + // xrTableCell58 + // + this.xrTableCell58.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell58.Name = "xrTableCell58"; + this.xrTableCell58.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); + this.xrTableCell58.StylePriority.UseBorders = false; + this.xrTableCell58.StylePriority.UseFont = false; + this.xrTableCell58.StylePriority.UsePadding = false; + this.xrTableCell58.StylePriority.UseTextAlignment = false; + this.xrTableCell58.Text = "Überstunden Gesamt:"; + this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell58.Weight = 0.22133303497678158D; + // + // xrTableCell26 + // + this.xrTableCell26.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")}); + this.xrTableCell26.Name = "xrTableCell26"; + this.xrTableCell26.StylePriority.UseBorders = false; + this.xrTableCell26.StylePriority.UseTextAlignment = false; + this.xrTableCell26.Text = "xrTableCell26"; + this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell26.Weight = 0.11143081848591821D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // + // 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"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 50F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // fieldSumSpecial + // + this.fieldSumSpecial.DataMember = "EmployeeDetailList.Days"; + this.fieldSumSpecial.Expression = "Sum([SpecialHours])"; + this.fieldSumSpecial.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldSumSpecial.Name = "fieldSumSpecial"; + // + // fieldSumSonntag + // + this.fieldSumSonntag.DataMember = "EmployeeDetailList.Days"; + this.fieldSumSonntag.Expression = "Sum([HoursSunday])"; + this.fieldSumSonntag.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldSumSonntag.Name = "fieldSumSonntag"; + // + // fieldSumFeiertag + // + this.fieldSumFeiertag.DataMember = "EmployeeDetailList.Days"; + this.fieldSumFeiertag.Expression = "Sum([HoursHoliday])"; + this.fieldSumFeiertag.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldSumFeiertag.Name = "fieldSumFeiertag"; + // + // fieldHours + // + this.fieldHours.DataMember = "EmployeeDetailList.Days"; + this.fieldHours.Expression = "[MinutesTotal]/60"; + this.fieldHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldHours.Name = "fieldHours"; + // + // fieldSick + // + this.fieldSick.DataMember = "EmployeeDetailList.Days"; + this.fieldSick.Expression = "Iif([HoursSick] > 0, \'x\', \'\')"; + this.fieldSick.FieldType = DevExpress.XtraReports.UI.FieldType.String; + this.fieldSick.Name = "fieldSick"; + // + // fieldVacation + // + this.fieldVacation.DataMember = "EmployeeDetailList.Days"; + this.fieldVacation.Expression = "Iif([HoursInVacation] > 0, \'x\', \'\')"; + this.fieldVacation.FieldType = DevExpress.XtraReports.UI.FieldType.String; + this.fieldVacation.Name = "fieldVacation"; + // + // calculatedField1 + // + this.calculatedField1.DataMember = "EmployeeDetailList.Days"; + this.calculatedField1.DisplayName = "fieldSumSamstag"; + this.calculatedField1.Expression = "Sum([HoursSaturday])"; + this.calculatedField1.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.calculatedField1.Name = "calculatedField1"; + // + // fieldSumHours + // + this.fieldSumHours.DataMember = "EmployeeDetailList.Days"; + this.fieldSumHours.Expression = "Sum([MinutesTotal]/60)"; + this.fieldSumHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldSumHours.Name = "fieldSumHours"; + // + // fieldSumHoliday2 + // + this.fieldSumHoliday2.DataMember = "EmployeeDetailList.Days"; + this.fieldSumHoliday2.Expression = "Sum([HoursHoliday2])"; + this.fieldSumHoliday2.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldSumHoliday2.Name = "fieldSumHoliday2"; + // + // fieldIstArbeitszeit + // + this.fieldIstArbeitszeit.DataMember = "EmployeeDetailList"; + this.fieldIstArbeitszeit.Expression = "[StundenGesamtIst]+[UeberstundenVormonat]"; + this.fieldIstArbeitszeit.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldIstArbeitszeit.Name = "fieldIstArbeitszeit"; + // + // fieldUeberstundenGesamt + // + this.fieldUeberstundenGesamt.DataMember = "EmployeeDetailList"; + this.fieldUeberstundenGesamt.Expression = "Iif([Ueberstunden] == ?, 0, [Ueberstunden])+Iif([UeberstundenVormonat] == ?, 0," + + " [UeberstundenVormonat])"; + this.fieldUeberstundenGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldUeberstundenGesamt.Name = "fieldUeberstundenGesamt"; + // + // Mitarbeiterarbeitszeitkonto + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.DetailReport, + this.topMarginBand1, + this.bottomMarginBand1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldSumSpecial, + this.fieldSumSonntag, + this.fieldSumFeiertag, + this.fieldHours, + this.fieldSick, + this.fieldVacation, + this.calculatedField1, + this.fieldSumHours, + this.fieldSumHoliday2, + this.fieldIstArbeitszeit, + this.fieldUeberstundenGesamt}); + this.DataSource = this.bindingSource1; + this.DisplayName = "Mitarbeiterstundenkonto"; + this.Font = new System.Drawing.Font("Arial", 8F); + this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { + this.ruleIstFeiertagOderWE}); + this.Margins = new System.Drawing.Printing.Margins(75, 50, 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.xrTableDetail)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private System.Windows.Forms.BindingSource bindingSource1; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.XRControlStyle Title; + private DevExpress.XtraReports.UI.XRControlStyle FieldCaption; + private DevExpress.XtraReports.UI.XRControlStyle PageInfo; + private DevExpress.XtraReports.UI.XRControlStyle DataField; + private DevExpress.XtraReports.UI.XRTable xrTableHeader; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTable xrTableDetail; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell27; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; + private DevExpress.XtraReports.UI.DetailBand Detail2; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader3; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell51; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell57; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell58; + private DevExpress.XtraReports.UI.CalculatedField fieldSumSpecial; + private DevExpress.XtraReports.UI.CalculatedField fieldSumSonntag; + private DevExpress.XtraReports.UI.CalculatedField fieldSumFeiertag; + private DevExpress.XtraReports.UI.CalculatedField fieldHours; + private DevExpress.XtraReports.UI.CalculatedField fieldSick; + private DevExpress.XtraReports.UI.CalculatedField fieldVacation; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell46; + private DevExpress.XtraReports.UI.XRTableCell sollStundenMonatLabelTableCell; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; + private DevExpress.XtraReports.UI.XRTableCell cellSumMinutesTotalDecimal2; + private DevExpress.XtraReports.UI.CalculatedField calculatedField1; + private DevExpress.XtraReports.UI.CalculatedField fieldSumHours; + private DevExpress.XtraReports.UI.CalculatedField fieldSumHoliday2; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell64; + private DevExpress.XtraReports.UI.XRTableCell cellSumMinutesTotalDecimal; + private DevExpress.XtraReports.UI.XRTableCell cellSumHoursSickDecimal; + private DevExpress.XtraReports.UI.XRTableCell cellSumHoursInVacationDecimal; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell67; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; + private DevExpress.XtraReports.UI.CalculatedField fieldIstArbeitszeit; + private DevExpress.XtraReports.UI.XRLabel lblMonat; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell cellRegelarbeitszeit; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.CalculatedField fieldUeberstundenGesamt; + private DevExpress.XtraReports.UI.FormattingRule ruleIstFeiertagOderWE; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + } +} diff --git a/ReportImp/BundBBetreutesWohnen/Mitarbeiterarbeitszeitkonto.resx b/ReportImp/BundBBetreutesWohnen/Mitarbeiterarbeitszeitkonto.resx new file mode 100644 index 000000000..d25f3eba2 --- /dev/null +++ b/ReportImp/BundBBetreutesWohnen/Mitarbeiterarbeitszeitkonto.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/BundBBetreutesWohnen/MitarbeiterstundenkontoBerechnung.cs b/ReportImp/BundBBetreutesWohnen/MitarbeiterstundenkontoBerechnung.cs index 717a06e07..83020991f 100644 --- a/ReportImp/BundBBetreutesWohnen/MitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/BundBBetreutesWohnen/MitarbeiterstundenkontoBerechnung.cs @@ -8,9 +8,22 @@ namespace BundBBetreutesWohnen { public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung { + public override bool ShouldCreateDayDetails() + { + return true; + } + public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) + { + var dd = base.CreateDayDetail(date, ed); + dd.MaxHoursUntilBreak = null; + dd.MaxHoursUntilBreak2 = null; + dd.BreakMinutes = null; + dd.BreakMinutes2 = null; + return dd; + } - public override List GetFeiertage(int year) + public override List GetFeiertage(int year) { var list = base.GetFeiertage(year); diff --git a/ReportImp/BundBBetreutesWohnen/MitarbeiterstundenkontoJahr.cs b/ReportImp/BundBBetreutesWohnen/MitarbeiterstundenkontoJahr.cs new file mode 100644 index 000000000..28de2ed25 --- /dev/null +++ b/ReportImp/BundBBetreutesWohnen/MitarbeiterstundenkontoJahr.cs @@ -0,0 +1,28 @@ +using System; +using BeWo.Report; +using BeWo.Report.ReportObjects; +using BS.Shared.Core; + + +namespace BundBBetreutesWohnen +{ + [IDSpecificClass(Identifier = "MitarbeiterstundenkontoJahr")] + public partial class MitarbeiterstundenkontoJahr : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + + + public MitarbeiterstundenkontoJahr() + { + InitializeComponent(); + } + + public void SetReportDataSource(MitarbeiterstundenkontoMonateRO pRO) + { + var msb = new CustomMitarbeiterstundenkontoBerechnungMonate(); + msb.CreateReport(pRO); + + this.bindingSource1.DataSource = pRO; + } + + } +} diff --git a/ReportImp/BundBBetreutesWohnen/MitarbeiterstundenkontoJahr.designer.cs b/ReportImp/BundBBetreutesWohnen/MitarbeiterstundenkontoJahr.designer.cs new file mode 100644 index 000000000..895e2d54a --- /dev/null +++ b/ReportImp/BundBBetreutesWohnen/MitarbeiterstundenkontoJahr.designer.cs @@ -0,0 +1,761 @@ +using BeWo.Report.ReportObjects; +namespace BundBBetreutesWohnen +{ + partial class MitarbeiterstundenkontoJahr + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); + this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); + this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); + this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); + this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); + this.DataField = new DevExpress.XtraReports.UI.XRControlStyle(); + this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail3 = new DevExpress.XtraReports.UI.DetailBand(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + this.Detail.HeightF = 0F; + this.Detail.Name = "Detail"; + this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrTableDetail + // + 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.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableDetail.Name = "xrTableDetail"; + this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRowDetail}); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(1005F, 25F); + this.xrTableDetail.StylePriority.UseBorders = false; + this.xrTableDetail.StylePriority.UseFont = false; + this.xrTableDetail.StylePriority.UsePadding = false; + this.xrTableDetail.StylePriority.UseTextAlignment = false; + this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRowDetail + // + this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell19, + this.xrTableCell20, + this.xrTableCell28, + this.xrTableCell16, + this.xrTableCell27, + this.xrTableCell22, + this.xrTableCell23, + this.xrTableCell21, + this.xrTableCell25, + this.xrTableCell24, + this.xrTableCell26}); + this.xrTableRowDetail.Name = "xrTableRowDetail"; + this.xrTableRowDetail.Weight = 1D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.Monat", "{0:MMMM}")}); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell3.Weight = 0.15329125338142471D; + // + // xrTableCell19 + // + this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollMax", "{0:0.00}")}); + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.Text = "xrTableCell19"; + this.xrTableCell19.Weight = 0.081154151689479551D; + // + // xrTableCell20 + // + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UrlaubUndKrankheit", "{0:0.00}")}); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.Text = "xrTableCell20"; + this.xrTableCell20.Weight = 0.094679933071566441D; + // + // xrTableCell28 + // + this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollOhneUrlaubKrankheit", "{0:0.00}")}); + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.Text = "xrTableCell28"; + this.xrTableCell28.Weight = 0.0721370604147881D; + // + // xrTableCell16 + // + this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsSoll", "{0:0.00}")}); + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Text = "xrTableCell16"; + this.xrTableCell16.Weight = 0.063119927862939587D; + // + // xrTableCell27 + // + this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst", "{0:0.00}")}); + this.xrTableCell27.Name = "xrTableCell27"; + this.xrTableCell27.Text = "xrTableCell27"; + this.xrTableCell27.Weight = 0.063119927862939615D; + // + // xrTableCell22 + // + this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsDiff", "{0:0.00}")}); + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.Text = "xrTableCell22"; + this.xrTableCell22.Weight = 0.063119927862939587D; + // + // xrTableCell23 + // + this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst", "{0:0.00}")}); + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.Text = "xrTableCell23"; + this.xrTableCell23.Weight = 0.063119927862939559D; + // + // xrTableCell21 + // + this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.RelationFlsZuMittelbar", "{0:0.00}")}); + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.Text = "xrTableCell21"; + this.xrTableCell21.Weight = 0.063119927862939615D; + // + // xrTableCell25 + // + this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Ueberstunden", "{0:0.00}")}); + this.xrTableCell25.Name = "xrTableCell25"; + this.xrTableCell25.Text = "xrTableCell25"; + this.xrTableCell25.Weight = 0.063119927862939587D; + // + // xrTableCell24 + // + this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.LaufendeGesamtsumme", "{0:0.00}")}); + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.Text = "xrTableCell24"; + this.xrTableCell24.Weight = 0.0631199278629396D; + // + // xrTableCell26 + // + this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenGesamt", "{0:0.00}")}); + this.xrTableCell26.Name = "xrTableCell26"; + this.xrTableCell26.Text = "xrTableCell26"; + this.xrTableCell26.Weight = 0.063119927862939573D; + // + // xrTableHeader + // + 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.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableHeader.Name = "xrTableHeader"; + this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRowHeader}); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(1005F, 70F); + this.xrTableHeader.StylePriority.UseBorders = false; + this.xrTableHeader.StylePriority.UseFont = false; + this.xrTableHeader.StylePriority.UsePadding = false; + this.xrTableHeader.StylePriority.UseTextAlignment = false; + this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRowHeader + // + this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell4, + this.xrTableCell2, + this.xrTableCell9, + this.xrTableCell8, + this.xrTableCell10, + this.xrTableCell7, + this.xrTableCell11, + this.xrTableCell12, + this.xrTableCell13, + this.xrTableCell14, + this.xrTableCell15}); + this.xrTableRowHeader.Name = "xrTableRowHeader"; + this.xrTableRowHeader.Weight = 2.8D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Monat"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell5.Weight = 0.15329125016467182D; + // + // xrTableCell4 + // + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Text = "Reguläre SOLL Stunden"; + this.xrTableCell4.Weight = 0.081154192324637608D; + // + // xrTableCell2 + // + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)"; + this.xrTableCell2.Weight = 0.094679896646570338D; + // + // xrTableCell9 + // + this.xrTableCell9.Multiline = true; + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Text = "Tatsächliche SOLL Stunden"; + this.xrTableCell9.Weight = 0.072137063712635591D; + // + // xrTableCell8 + // + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Text = "FLS Stunden SOLL"; + this.xrTableCell8.Weight = 0.063119927721024038D; + // + // xrTableCell10 + // + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.StylePriority.UseBackColor = false; + this.xrTableCell10.Text = "FLS IST lfd. Monat"; + this.xrTableCell10.Weight = 0.063119927721024D; + // + // xrTableCell7 + // + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat"; + this.xrTableCell7.Weight = 0.06311992757910842D; + // + // xrTableCell11 + // + this.xrTableCell11.Multiline = true; + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.StylePriority.UseBackColor = false; + this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat"; + this.xrTableCell11.Weight = 0.063119927721024011D; + // + // xrTableCell12 + // + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)"; + this.xrTableCell12.Weight = 0.063119929511863376D; + // + // xrTableCell13 + // + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Text = "Überstd. neu"; + this.xrTableCell13.Weight = 0.063119928687401447D; + // + // xrTableCell14 + // + this.xrTableCell14.Multiline = true; + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.StylePriority.UseBackColor = false; + this.xrTableCell14.Text = "Überstd.\r\ndieses Jahr"; + this.xrTableCell14.Weight = 0.063119928275170531D; + // + // xrTableCell15 + // + this.xrTableCell15.Multiline = true; + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Text = "Überstd. Gesamt"; + this.xrTableCell15.Weight = 0.0631199213956443D; + // + // xrTable1 + // + this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((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); + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F); + this.xrTable1.StylePriority.UseBorders = false; + this.xrTable1.StylePriority.UseFont = false; + this.xrTable1.StylePriority.UsePadding = false; + this.xrTable1.StylePriority.UseTextAlignment = false; + this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell35, + this.xrTableCell37, + this.xrTableCell39, + this.cellSollGesamt, + this.cellFLSSollGesamt, + this.cellFLSIstGesamt, + this.cellFLSPlusMinusGesamt, + this.cellGesamtGesamt, + this.cellRelationGesamt, + this.xrTableCell47, + this.xrTableCell48, + this.xrTableCell51}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 1D; + // + // xrTableCell35 + // + this.xrTableCell35.Name = "xrTableCell35"; + this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell35.StylePriority.UseFont = false; + this.xrTableCell35.StylePriority.UsePadding = false; + this.xrTableCell35.StylePriority.UseTextAlignment = false; + this.xrTableCell35.Text = "Gesamt"; + this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell35.Weight = 0.15329126714047708D; + // + // xrTableCell37 + // + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.Weight = 0.081154151689479551D; + // + // xrTableCell39 + // + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.Weight = 0.094679919312514085D; + // + // cellSollGesamt + // + 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; + this.cellSollGesamt.Weight = 0.0721370604147881D; + // + // cellFLSSollGesamt + // + 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; + this.cellFLSSollGesamt.Weight = 0.063119927862939587D; + // + // cellFLSIstGesamt + // + 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; + this.cellFLSIstGesamt.Weight = 0.063119927862939615D; + // + // cellFLSPlusMinusGesamt + // + 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; + this.cellFLSPlusMinusGesamt.Weight = 0.063119927862939587D; + // + // cellGesamtGesamt + // + this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst")}); + this.cellGesamtGesamt.Name = "cellGesamtGesamt"; + xrSummary5.FormatString = "{0:0.00}"; + xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.cellGesamtGesamt.Summary = xrSummary5; + this.cellGesamtGesamt.Weight = 0.063119927862939573D; + // + // cellRelationGesamt + // + this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.fieldRelationGesamt", "{0:0.00}")}); + this.cellRelationGesamt.Name = "cellRelationGesamt"; + this.cellRelationGesamt.Text = "cellRelationGesamt"; + this.cellRelationGesamt.Weight = 0.0631199278629396D; + // + // xrTableCell47 + // + this.xrTableCell47.Name = "xrTableCell47"; + this.xrTableCell47.Weight = 0.063119927862939587D; + // + // xrTableCell48 + // + this.xrTableCell48.Name = "xrTableCell48"; + this.xrTableCell48.Weight = 0.063119927862939587D; + // + // xrTableCell51 + // + this.xrTableCell51.Name = "xrTableCell51"; + this.xrTableCell51.Weight = 0.063119927862939573D; + // + // 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(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; + // + // xrPageInfo1 + // + this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrPageInfo1.Name = "xrPageInfo1"; + this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(260.0001F, 23F); + this.xrPageInfo1.StyleName = "PageInfo"; + this.xrPageInfo1.StylePriority.UseFont = false; + // + // Title + // + this.Title.BackColor = System.Drawing.Color.White; + this.Title.BorderColor = System.Drawing.SystemColors.ControlText; + this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.Title.BorderWidth = 1F; + this.Title.Font = new System.Drawing.Font("Times New Roman", 24F); + this.Title.ForeColor = System.Drawing.Color.Black; + this.Title.Name = "Title"; + // + // FieldCaption + // + this.FieldCaption.BackColor = System.Drawing.Color.White; + this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; + this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.FieldCaption.BorderWidth = 1F; + this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold); + this.FieldCaption.ForeColor = System.Drawing.Color.Black; + this.FieldCaption.Name = "FieldCaption"; + // + // PageInfo + // + this.PageInfo.BackColor = System.Drawing.Color.White; + this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; + this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.PageInfo.BorderWidth = 1F; + this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F); + this.PageInfo.ForeColor = System.Drawing.Color.Black; + this.PageInfo.Name = "PageInfo"; + // + // DataField + // + this.DataField.BackColor = System.Drawing.Color.White; + this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; + this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.DataField.BorderWidth = 1F; + this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F); + this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; + this.DataField.Name = "DataField"; + // + // fieldFLS + // + this.fieldFLS.DataMember = "FLSReportGroups"; + this.fieldFLS.Expression = "[TotalFLM] / 60"; + this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldFLS.Name = "fieldFLS"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 30F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // DetailReport1 + // + this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail2, + this.DetailReport2}); + this.DetailReport1.DataMember = "EmployeeInfoList"; + this.DetailReport1.DataSource = this.bindingSource1; + this.DetailReport1.Level = 0; + this.DetailReport1.Name = "DetailReport1"; + // + // Detail2 + // + this.Detail2.HeightF = 0F; + this.Detail2.Name = "Detail2"; + this.Detail2.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBandExceptFirstEntry; + // + // DetailReport2 + // + this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail3, + this.GroupHeader2, + this.GroupHeader3, + this.GroupFooter2}); + this.DetailReport2.DataMember = "EmployeeInfoList.EmployeeDetails"; + this.DetailReport2.DataSource = this.bindingSource1; + this.DetailReport2.Level = 0; + this.DetailReport2.Name = "DetailReport2"; + // + // Detail3 + // + this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableDetail}); + this.Detail3.Font = new System.Drawing.Font("Arial", 9.75F); + this.Detail3.HeightF = 25F; + this.Detail3.Name = "Detail3"; + this.Detail3.StylePriority.UseFont = false; + // + // GroupHeader2 + // + this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableHeader}); + this.GroupHeader2.HeightF = 70F; + this.GroupHeader2.Name = "GroupHeader2"; + // + // GroupHeader3 + // + this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel1}); + this.GroupHeader3.HeightF = 35F; + this.GroupHeader3.Level = 1; + this.GroupHeader3.Name = "GroupHeader3"; + // + // xrLabel1 + // + this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.SizeF = new System.Drawing.SizeF(1005F, 25F); + this.xrLabel1.StyleName = "Title"; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Stundenkonto [EmployeeInfoList.LastName], [EmployeeInfoList.FirstName] [ReportSta" + + "rtDate!yyyy]"; + // + // GroupFooter2 + // + this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.GroupFooter2.HeightF = 25F; + this.GroupFooter2.Name = "GroupFooter2"; + // + // fieldRelationGesamt + // + this.fieldRelationGesamt.DataMember = "EmployeeInfoList.EmployeeDetails"; + this.fieldRelationGesamt.Expression = "(Sum([EmployeeDetail.FlsIst]) / Sum([EmployeeDetail.StundenGesamtIst])) * 100"; + this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldRelationGesamt.Name = "fieldRelationGesamt"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoMonateRO); + // + // MitarbeiterstundenkontoJahr + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.pageFooterBand1, + this.topMarginBand1, + this.bottomMarginBand1, + this.DetailReport1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldFLS, + this.fieldRelationGesamt}); + this.DataSource = this.bindingSource1; + this.DisplayName = "Mitarbeiterstundenkonto"; + this.Landscape = true; + this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 30); + this.PageHeight = 827; + this.PageWidth = 1169; + this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { + this.Title, + this.FieldCaption, + this.PageInfo, + this.DataField}); + this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private System.Windows.Forms.BindingSource bindingSource1; + private DevExpress.XtraReports.UI.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.XRTable xrTableHeader; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTable xrTableDetail; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.CalculatedField fieldFLS; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell27; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; + private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt; + private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt; + private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt; + private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt; + private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt; + private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell51; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; + private DevExpress.XtraReports.UI.DetailBand Detail2; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport2; + private DevExpress.XtraReports.UI.DetailBand Detail3; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader3; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; + private DevExpress.XtraReports.UI.CalculatedField fieldRelationGesamt; + } +} diff --git a/ReportImp/BundBBetreutesWohnen/MitarbeiterstundenkontoJahr.resx b/ReportImp/BundBBetreutesWohnen/MitarbeiterstundenkontoJahr.resx new file mode 100644 index 000000000..d25f3eba2 --- /dev/null +++ b/ReportImp/BundBBetreutesWohnen/MitarbeiterstundenkontoJahr.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/DomizielAnsbach/Service/CustomOperationService.cs b/ReportImp/DomizielAnsbach/Service/CustomOperationService.cs index 5d54f7c97..db994105b 100644 --- a/ReportImp/DomizielAnsbach/Service/CustomOperationService.cs +++ b/ReportImp/DomizielAnsbach/Service/CustomOperationService.cs @@ -109,7 +109,7 @@ namespace DomizielAnsbach.Service { foreach (var ap in c2s.ApprovalPeriodList) { - if (ap.ServiceCategory.Name == "Zuverdienst - Arbeitszeit") + if (ap.ServiceCategory != null && ap.ServiceCategory.Name == "Zuverdienst - Arbeitszeit") { var desc = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(ap.ServiceCategory.Oid.Value); diff --git a/ReportImp/Fortis/ZeitdokumentationPlanIstUebersicht.cs b/ReportImp/Fortis/ZeitdokumentationPlanIstUebersicht.cs index 539093a6d..1aae0a4d0 100644 --- a/ReportImp/Fortis/ZeitdokumentationPlanIstUebersicht.cs +++ b/ReportImp/Fortis/ZeitdokumentationPlanIstUebersicht.cs @@ -46,10 +46,109 @@ namespace Fortis { ro.AnzahlTagePlan = (int)ro.DokuzeitraumEnde.Value.Subtract(ro.DokuzeitraumEnde.Value).TotalDays + 1; } + ro.StufeGeplant = ""; + if (pRO.ApprovedFLSPerWeek > 0) { - + + decimal minuten = pRO.ApprovedFLSPerWeek / 60; + if (minuten < 30) + { + ro.StufeGeplant = ""; + ro.KorridorVon = 0; + ro.KorridorBis = 30; + } + else if (minuten < 60) + { + ro.StufeGeplant = "1"; + ro.KorridorVon = 30; + ro.KorridorBis = 60; + } + else if (minuten < 90) + { + ro.StufeGeplant = "2"; + ro.KorridorVon = 60; + ro.KorridorBis = 90; + } + else if (minuten < 120) + { + ro.StufeGeplant = "3"; + ro.KorridorVon = 90; + ro.KorridorBis = 120; + } + else if (minuten < 150) + { + ro.StufeGeplant = "4"; + ro.KorridorVon = 120; + ro.KorridorBis = 150; + } + else if (minuten < 180) + { + ro.StufeGeplant = "5"; + ro.KorridorVon = 150; + ro.KorridorBis = 180; + } + else if (minuten < 210) + { + ro.StufeGeplant = "6"; + ro.KorridorVon = 180; + ro.KorridorBis = 210; + } + else if (minuten < 240) + { + ro.StufeGeplant = "7"; + ro.KorridorVon = 210; + ro.KorridorBis = 240; + } + else if (minuten < 270) + { + ro.StufeGeplant = "8"; + ro.KorridorVon = 240; + ro.KorridorBis = 270; + } + else if (minuten < 300) + { + ro.StufeGeplant = "9"; + ro.KorridorVon = 270; + ro.KorridorBis = 300; + } + else if (minuten < 330) + { + ro.StufeGeplant = "10"; + ro.KorridorVon = 300; + ro.KorridorBis = 330; + } + else if (minuten < 360) + { + ro.StufeGeplant = "11"; + ro.KorridorVon = 330; + ro.KorridorBis = 360; + } + else if (minuten < 390) + { + ro.StufeGeplant = "12"; + ro.KorridorVon = 360; + ro.KorridorBis = 390; + } + else if (minuten < 420) + { + ro.StufeGeplant = "13"; + ro.KorridorVon = 390; + ro.KorridorBis = 420; + } + else if (minuten < 450) + { + ro.StufeGeplant = "14"; + ro.KorridorVon = 420; + ro.KorridorBis = 450; + } + else if (minuten < 480) + { + ro.StufeGeplant = "15"; + ro.KorridorVon = 450; + ro.KorridorBis = 480; + } } ro.AktuellesDatum = DateTime.Now.Date; diff --git a/ReportImp/SeWo/Zeitzuschlagsbeleg.Designer.cs b/ReportImp/SeWo/Zeitzuschlagsbeleg.Designer.cs index 2c74498e2..5e89715f9 100644 --- a/ReportImp/SeWo/Zeitzuschlagsbeleg.Designer.cs +++ b/ReportImp/SeWo/Zeitzuschlagsbeleg.Designer.cs @@ -878,10 +878,10 @@ namespace BeWo.SeWo this.xrTableRow2, this.xrTableRow3, this.xrTableRow4, - this.xrTableRow13, - this.xrTableRow14, this.xrTableRow6, this.xrTableRow7, + this.xrTableRow13, + this.xrTableRow14, this.xrTableRow10, this.xrTableRow11}); this.table1.SizeF = new System.Drawing.SizeF(1044F, 340F); diff --git a/ReportImp/SeWo/Zeitzuschlagsbeleg.cs b/ReportImp/SeWo/Zeitzuschlagsbeleg.cs index 69b54c2d5..9b4ce2daf 100644 --- a/ReportImp/SeWo/Zeitzuschlagsbeleg.cs +++ b/ReportImp/SeWo/Zeitzuschlagsbeleg.cs @@ -93,8 +93,8 @@ namespace BeWo.SeWo BerechneGesamtsumme(table1.Rows[1], samstag2Minuten); BerechneGesamtsumme(table1.Rows[4], sonntag2Minuten); BerechneGesamtsumme(table1.Rows[7], nachtSchlaf2Minuten); - BerechneGesamtsumme(table1.Rows[9], nachtWache2Minuten); - BerechneGesamtsumme(table1.Rows[11], feiertag2Minuten); + BerechneGesamtsumme(table1.Rows[9], feiertag2Minuten); + BerechneGesamtsumme(table1.Rows[11], nachtWache2Minuten); BerechneGesamtsumme(table1.Rows[13], heiligSil2Minuten); } @@ -121,14 +121,11 @@ namespace BeWo.SeWo if (rowIdx > 0) { bool isHeaderRow = false; - - int maxDays = 31; + + int maxDays = DateTime.DaysInMonth(monat.Year, monat.Month); if (rowIdx == 1 || rowIdx == 4 || rowIdx == 7 || rowIdx == 9 || rowIdx == 11 || rowIdx == 13) { isHeaderRow = true; - int days = DateTime.DaysInMonth(monat.Year, monat.Month); - - maxDays = days; } int cellIdx = 0; @@ -143,9 +140,7 @@ namespace BeWo.SeWo cell.Font = new Font(cell.Font.FontFamily, 8, FontStyle.Regular); } - bool setBackground = false; - - setBackground = !isHeaderRow || (maxDays < 31 && cellIdx > maxDays + 1 && cellIdx <= 32); + bool setBackground = maxDays < 31 && cellIdx > maxDays + 1 && cellIdx <= 32; if (setBackground) { @@ -171,10 +166,9 @@ namespace BeWo.SeWo var zs = BerechneZuschlag(sr); - if (zs.MinutenFeiertag6_22 > 0) { - AddValueToCell(zs.MinutenFeiertag6_22, datum, table1.Rows[11], feiertag2Minuten); + AddValueToCell(zs.MinutenFeiertag6_22, datum, table1.Rows[9], feiertag2Minuten); } if (zs.MinutenNachtSchlaf22_6 > 0) { @@ -182,7 +176,7 @@ namespace BeWo.SeWo } if (zs.MinutenNachtwache22_6 > 0) { - AddValueToCell(zs.MinutenNachtwache22_6, datum, table1.Rows[9], nachtWache2Minuten); + AddValueToCell(zs.MinutenNachtwache22_6, datum, table1.Rows[11], nachtWache2Minuten); } if (zs.MinutenSamstag13_22 > 0) { diff --git a/Service/Plugins/CustomerService.cs b/Service/Plugins/CustomerService.cs index 16e891cd5..b1aad63db 100644 --- a/Service/Plugins/CustomerService.cs +++ b/Service/Plugins/CustomerService.cs @@ -572,15 +572,19 @@ namespace BeWo.Service.Plugins private bool UserIsAllowedToViewPerson(Person person, List person2CustomerList, List allowedCustomerOids, bool darfFamilieSehen, bool darfAlleKlientenSehen, bool darfKlientenDesTeamsSehen, bool darfSeineKlientenSehen) { - if (darfFamilieSehen && darfAlleKlientenSehen) + if (person.LastName == "Aßmann") + { + int test = 0; + } + if (darfFamilieSehen && darfAlleKlientenSehen) { return true; } - if (!darfFamilieSehen) - { - return person2CustomerList.Count(p => p.IstFamilie) == 0; - } + //if (!darfFamilieSehen) + //{ + // return person2CustomerList.Count(p => p.IstFamilie) > 0; + //} if (darfAlleKlientenSehen) { return true; diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index b38f5c12f..367b00d22 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -35,7 +35,7 @@ namespace BeWo.Service.Plugins //t = "1193188501"; // Aids Hilfe Dortmund //t = "7860351957"; // SKF Alsdorf //t = "3311520228"; // Die Düne - t = "1352143437"; // Sewo + //t = "1352143437"; // Sewo //t = "7107514623"; // BeWo Neuss //t = "9098141768"; // Fib e.V. Marburg //t = "1505148718"; // VSD Hamm @@ -173,7 +173,7 @@ namespace BeWo.Service.Plugins //t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V. (FFS) //t = "2632162696"; // Hand in Hand (ehemals Pro BeWo Düren) //t = "6340891020"; // Caritas Ahlen - t = "3659854106"; // alpha e.V. + //t = "3659854106"; // alpha e.V. //t = "5809130435"; // Lebenshilfe Kusel //t = "3367947706"; // PaS Mönchengladbach //t = "2331203795"; // BeWo für dich diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs index 5e4f9d2d9..f99658a41 100644 --- a/Shared/BeWoEntityEnums.cs +++ b/Shared/BeWoEntityEnums.cs @@ -433,6 +433,7 @@ namespace BS.Shared GroupOfPeopleView_Delete = 20102, AdditionalService_View = 20200, + AdditionalService_Edit = 20201, OvertimeView = 20300, //ServiceRecord_AllowCreateIfAbsenceTimeExceeded = 20300, diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs index e8e6b7380..1326826ab 100644 --- a/Shared/Core/EnumTranslations.cs +++ b/Shared/Core/EnumTranslations.cs @@ -224,8 +224,11 @@ namespace BS.Shared.Core UserRightType.GroupOfPeopleView_Delete, Translator.Translate("Gruppen löschen") }, { - UserRightType.AdditionalService_View, Translator.Translate("Ergänzende Dienste") + UserRightType.AdditionalService_View, Translator.Translate("Ergänzende Dienste ansehen") }, + { + UserRightType.AdditionalService_Edit, Translator.Translate("Ergänzende Dienste bearbeiten") + }, { UserRightType.OvertimeView, Translator.Translate("Ãœberstundenverwaltung") },