diff --git a/ReportImp/AutismusKoelnBonn/Quittierungsbeleg.Designer.cs b/ReportImp/AutismusKoelnBonn/Quittierungsbeleg.Designer.cs index 847ac15b9..a1cdcb5f8 100644 --- a/ReportImp/AutismusKoelnBonn/Quittierungsbeleg.Designer.cs +++ b/ReportImp/AutismusKoelnBonn/Quittierungsbeleg.Designer.cs @@ -495,7 +495,7 @@ namespace AutismusKoelnBonn this.xrTableCell6.StylePriority.UseBorders = false; this.xrTableCell6.StylePriority.UseFont = false; this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.Text = "Art /\r\nAnzahl\r\nKlient:innen"; + this.xrTableCell6.Text = "Art /\r\nAnzahl\r\nKlient*innen"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell6.Weight = 0.26536329898088346D; // diff --git a/ReportImp/ChristopherusHaus/CHMitarbeiterstundenkontoBerechnung.cs b/ReportImp/ChristopherusHaus/CHMitarbeiterstundenkontoBerechnung.cs index c616a7bfd..9f7997464 100644 --- a/ReportImp/ChristopherusHaus/CHMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/ChristopherusHaus/CHMitarbeiterstundenkontoBerechnung.cs @@ -19,5 +19,15 @@ namespace BeWo.ChristopherusHaus return list; } + public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) + { + var dd = base.CreateDayDetail(date, ed); + + dd.NightStart = 22; + dd.NightEnd = 6; + + return dd; + } + } } diff --git a/ReportImp/ChristopherusHaus/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/ChristopherusHaus/Mitarbeiterarbeitszeitkonto.designer.cs index 44ad4f861..d2f3ce7f3 100644 --- a/ReportImp/ChristopherusHaus/Mitarbeiterarbeitszeitkonto.designer.cs +++ b/ReportImp/ChristopherusHaus/Mitarbeiterarbeitszeitkonto.designer.cs @@ -35,6 +35,7 @@ namespace BeWo.ChristopherusHaus DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); @@ -103,6 +104,11 @@ namespace BeWo.ChristopherusHaus this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = 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(); @@ -508,7 +514,7 @@ namespace BeWo.ChristopherusHaus this.xrTable4, this.xrTable1}); this.GroupFooter2.Font = new System.Drawing.Font("Arial", 10F); - this.GroupFooter2.HeightF = 155.2083F; + this.GroupFooter2.HeightF = 156.6667F; this.GroupFooter2.KeepTogether = true; this.GroupFooter2.Name = "GroupFooter2"; this.GroupFooter2.StylePriority.UseFont = false; @@ -606,8 +612,9 @@ namespace BeWo.ChristopherusHaus this.xrTableRow2, this.xrTableRow5, this.xrTableRow6, - this.xrTableRow3}); - this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 100F); + this.xrTableRow3, + this.xrTableRow7}); + this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 120F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -865,7 +872,7 @@ namespace BeWo.ChristopherusHaus // // xrTableCell11 // - this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell11.Borders = DevExpress.XtraPrinting.BorderSide.Left; this.xrTableCell11.Font = new System.Drawing.Font("Arial", 10F); this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); @@ -879,7 +886,7 @@ namespace BeWo.ChristopherusHaus // // xrTableCell12 // - this.xrTableCell12.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell12.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldSonnUndFeiertage")}); this.xrTableCell12.Font = new System.Drawing.Font("Arial", 10F); @@ -895,7 +902,7 @@ namespace BeWo.ChristopherusHaus // // xrTableCell13 // - this.xrTableCell13.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell13.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); this.xrTableCell13.StylePriority.UseBorders = false; @@ -906,13 +913,73 @@ namespace BeWo.ChristopherusHaus // // xrTableCell14 // - this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell14.Borders = DevExpress.XtraPrinting.BorderSide.Right; this.xrTableCell14.Name = "xrTableCell14"; this.xrTableCell14.StylePriority.UseBorders = false; this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell14.Weight = 0.11143081848591821D; // + // xrTableRow7 + // + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell22, + this.xrTableCell29, + this.xrTableCell30, + this.xrTableCell32}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.Weight = 0.8D; + // + // xrTableCell22 + // + this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell22.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); + this.xrTableCell22.StylePriority.UseBorders = false; + this.xrTableCell22.StylePriority.UseFont = false; + this.xrTableCell22.StylePriority.UsePadding = false; + this.xrTableCell22.StylePriority.UseTextAlignment = false; + this.xrTableCell22.Text = "davon zwischen 22 und 6 Uhr:"; + this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell22.Weight = 0.17987240787980294D; + // + // xrTableCell29 + // + this.xrTableCell29.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldNightHours")}); + this.xrTableCell29.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.StylePriority.UseBorders = false; + this.xrTableCell29.StylePriority.UseFont = false; + this.xrTableCell29.StylePriority.UseTextAlignment = false; + xrSummary6.FormatString = "{0:0.00}"; + xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell29.Summary = xrSummary6; + this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell29.Weight = 0.089936204907626063D; + // + // xrTableCell30 + // + this.xrTableCell30.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); + this.xrTableCell30.StylePriority.UseBorders = false; + this.xrTableCell30.StylePriority.UsePadding = false; + this.xrTableCell30.StylePriority.UseTextAlignment = false; + this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell30.Weight = 0.22133303497678158D; + // + // xrTableCell32 + // + this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.StylePriority.UseBorders = false; + this.xrTableCell32.StylePriority.UseTextAlignment = false; + this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell32.Weight = 0.11143081848591821D; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); @@ -959,7 +1026,7 @@ namespace BeWo.ChristopherusHaus // // topMarginBand1 // - this.topMarginBand1.HeightF = 57.29167F; + this.topMarginBand1.HeightF = 57F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 @@ -1086,7 +1153,7 @@ namespace BeWo.ChristopherusHaus 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, 57, 50); + this.Margins = new System.Drawing.Printing.Margins(75, 46, 57, 50); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; @@ -1196,5 +1263,10 @@ namespace BeWo.ChristopherusHaus private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.CalculatedField fieldNightHours; private DevExpress.XtraReports.UI.CalculatedField fieldSonnUndFeiertage; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; } } diff --git a/Service/Dienstplanung/DienstplanungsManager.cs b/Service/Dienstplanung/DienstplanungsManager.cs index 9085b659c..66377396b 100644 --- a/Service/Dienstplanung/DienstplanungsManager.cs +++ b/Service/Dienstplanung/DienstplanungsManager.cs @@ -796,10 +796,10 @@ namespace BeWo.Service.Dienstplanung public static List BerechneSollSaldoUndIst(DienstplanerRootDC root, DateTime date, List empOids) { - VacationService vs = new VacationService(); + VacationService vs = PluginLoader.FindClass(); var konto = MitarbeiterstundenkontoRO.Create(null, null, date, date.AddMonths(1), empOids); - var berechnung = new MitarbeiterstundenkontoBerechnung(); + var berechnung = PluginLoader.FindClass(); berechnung.CreateReport(konto); List monatsZusammenfassung = new List(); root.StundenBeiAbwesenheit = new Dictionary(); @@ -869,6 +869,9 @@ namespace BeWo.Service.Dienstplanung vorherigeWeeklyDays = vorherigeWeeklyDays == 0 ? weeklyDays : vorherigeWeeklyDays; bool skipAbsenceTime = false; + //if (berechnung.IstAnrechenbareAbsenceTime(DAOFactory.GenericDAO.GetByID(abs.AbsenceTimeOid.Value))) + // skipAbsenceTime = true; + // Falls der Vertrag sich NICHT innerhalb einer Woche ändert if (weeklyDays == vorherigeWeeklyDays) { @@ -958,7 +961,7 @@ namespace BeWo.Service.Dienstplanung List empOids = new List() { empOid }; var konto = MitarbeiterstundenkontoRO.Create(null, null, date, date.AddMonths(1), empOids); - var berechnung = new MitarbeiterstundenkontoBerechnung(); + var berechnung = PluginLoader.FindClass(); berechnung.CreateReport(konto); DienstplanerMonthlySummaryDC dc = new DienstplanerMonthlySummaryDC(); @@ -1479,16 +1482,10 @@ namespace BeWo.Service.Dienstplanung } public static bool SetEnableSorting() { -#if DEBUG - return true; -#endif return true; // Wenn Bug wieder auf false setzen } public static bool SetEnableStatuszeile() { -#if DEBUG - return true; -#endif return true; } diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index f69f76b5c..183ac1e7a 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -105,7 +105,7 @@ namespace BeWo.Service.Plugins //t = "2509786400"; // LH Stade //t = "8677523325"; // BeWo Richartz //t = "1765854593"; // Mein Betreutes Wohnen - //t = "6802909544"; // Lebenshilfe Coburg + t = "6802909544"; // Lebenshilfe Coburg //t = "9417634361"; // Synprax //t = "5761861730"; // Lebenshilfe Warendorf //t = "6712648331"; // BeWo Färber @@ -167,7 +167,7 @@ namespace BeWo.Service.Plugins //t = "3614251071"; // Pusteblume //t = "7755740484"; // Sawo //t = "8275654834"; // Twg Jonathan - t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V. (FFS) + //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. @@ -299,7 +299,7 @@ namespace BeWo.Service.Plugins //t = "8251343124"; // Rat Plus Tat //t = "6819347851"; // Awo Kreisverband Plön //t = "2385915144"; // AKGG GmbHd - t = "8002913382"; // AKGG GmbH (MID) + //t = "8002913382"; // AKGG GmbH (MID) //t = "5155880294"; // BHV Bergische Hauspflege //t = "8366649557"; // Münchner Aids-Hilfe e.V. //t = "2976949196"; // WHB Refrath gGmbH @@ -342,6 +342,7 @@ namespace BeWo.Service.Plugins //t = "4748304562"; // BeWo Darmstadt //t = "5315865694"; // Wismarer Werkstätten GmbH //t = "6971328056"; // SKM Krefeld + t = "4199238586"; // MeZ Menden; return t;