cb

BeWo/View/HomeView.xaml.cs

@@ -596,7 +596,6 @@ namespace BeWo.View
                 if (BeWoApp.LoggedOnEmployeeOid != null)
                 {
                     s.InsertTestAppointments(BeWoApp.LoggedOnEmployeeOid.Value);
-
                     this.Dispatch(() =>
                     {
                         LoadTasksAndAppointments(false, true);
@@ -1677,7 +1676,14 @@ namespace BeWo.View
 
                         if (pIsShowingTasks)
                         {
-                            listboxTasks.ItemsSource = _AllSchedulerTasks.Where(i => i.IsTask && !i.CompletedDate.HasValue).OrderBy(i => i.DueDate).OrderBy(o => o.StartDate ?? DateTime.MinValue).ToList();
+                            var list = _AllSchedulerTasks.Where(i => i.IsTask && !i.CompletedDate.HasValue).OrderBy(i => i.DueDate).OrderBy(o => o.StartDate ?? DateTime.MinValue).ToList();
+                            listboxTasks.ItemsSource = list;
+                            if (list.Count == 0 && rb_appointments.IsVisible)
+                            {
+                                //Zeige standardmäßig Termine, falls keine Aufgaben vorhanden sind.
+                                rb_appointments.IsChecked = true;
+                            }
+
                         }
                         else
                         {
@@ -1686,6 +1692,8 @@ namespace BeWo.View
                                                                                      i.EndDate.HasValue && i.EndDate.Value.InBetween(_CurrentDate, _CurrentDate.AddDays(14), true) &&
                                                                                      i.Type != (int)AppointmentType.DeletedOccurrence).OrderBy(o => o.StartDate ?? DateTime.MinValue).ToList();
                         }
+
+                        
                     });
                 }, false);
             }

Model/Changes_2021_12_22_DienstInfo.txt

@@ -1,8 +1,2 @@
 ALTER TABLE `dienstinfo` 
 ADD COLUMN `Dauer` DOUBLE NULL DEFAULT NULL AFTER `Wohnheim`;
-
-
-
-123,45 statt 39,12
-
-8ZHMS

ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs

@@ -153,5 +153,10 @@ namespace DiakonieKKKleve.Invoicing
 
 	        return items;
 	    }
+
+        public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount)
+        {
+            return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, true, true);
+        }
     }
 }

ReportImp/DiakonieKKKleve/RechnungSoziotherapie.Designer.cs

@@ -67,6 +67,7 @@ namespace BeWo.DiakonieKKKleve
             this.rtAdresseKleve = new DevExpress.XtraReports.UI.XRRichText();
             this.rtAbsenderKleve = new DevExpress.XtraReports.UI.XRRichText();
             this.rtAbsenderGeldern = new DevExpress.XtraReports.UI.XRRichText();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -139,6 +140,7 @@ namespace BeWo.DiakonieKKKleve
             // Page1
             // 
             this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel3,
             this.xrLabel1,
             this.lblIkNr,
             this.xrLabel5,
@@ -163,7 +165,7 @@ namespace BeWo.DiakonieKKKleve
             // 
             // lblIkNr
             // 
-            this.lblIkNr.LocationFloat = new DevExpress.Utils.PointFloat(495.7102F, 0F);
+            this.lblIkNr.LocationFloat = new DevExpress.Utils.PointFloat(495.7104F, 0F);
             this.lblIkNr.Multiline = true;
             this.lblIkNr.Name = "lblIkNr";
             this.lblIkNr.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -427,6 +429,20 @@ namespace BeWo.DiakonieKKKleve
             this.rtAbsenderGeldern.SerializableRtfString = resources.GetString("rtAbsenderGeldern.SerializableRtfString");
             this.rtAbsenderGeldern.SizeF = new System.Drawing.SizeF(404.0417F, 13.625F);
             // 
+            // xrLabel3
+            // 
+            this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel3.CanShrink = true;
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(494.5406F, 25F);
+            this.xrLabel3.Multiline = true;
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(183.4594F, 23.12505F);
+            this.xrLabel3.StylePriority.UseBackColor = false;
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.Text = "Datum: [InvoiceDate]";
+            this.xrLabel3.WordWrap = false;
+            // 
             // RechnungSoziotherapie
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -499,5 +515,6 @@ namespace BeWo.DiakonieKKKleve
         private DevExpress.XtraReports.UI.XRLabel xrLabel1;
         private DevExpress.XtraReports.UI.XRRichText rtAdresseKleve;
         private DevExpress.XtraReports.UI.XRRichText rtAbsenderKleve;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
     }
 }

ReportImp/LebenshilfeStade/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BeWo.Data.Entities;
+using BeWo.Report.ReportObjects;
+using BeWo.Service.Plugins;
+using BS.Shared.Core;
+using BS.Shared.Extensions;
+
+
+namespace LebenshilfeStade
+{
+	public class CustomMitarbeiterstunde nkontoBerechnungTagesansicht : CustomMitarbeiterstundenkontoBerechnung
+    {
+        
+        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;
+        }
+
+    }
+}

ReportImp/LebenshilfeStade/LebenshilfeStade.csproj

@@ -61,6 +61,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs" />
     <Compile Include="Export\CustomDataExporter.cs" />
     <Compile Include="Export\DatevExporter.cs" />
     <Compile Include="InvoiceCustomerReport.cs">

ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.Designer.cs

@@ -43,6 +43,7 @@ namespace MuenchenerAidsHilfeEV
             this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
             this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.lblEinrichtungsnummer = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
@@ -92,7 +93,9 @@ namespace MuenchenerAidsHilfeEV
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.lblEinrichtungsnummer = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.lblDatum = new DevExpress.XtraReports.UI.XRTableCell();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
@@ -222,16 +225,31 @@ namespace MuenchenerAidsHilfeEV
             this.xrLabel5,
             this.lblAbrechnungszeitraum,
             this.xrTable2});
-            this.Page1.HeightF = 411.5833F;
+            this.Page1.HeightF = 424.9167F;
             this.Page1.Name = "Page1";
             this.Page1.StylePriority.UseFont = false;
             // 
+            // lblEinrichtungsnummer
+            // 
+            this.lblEinrichtungsnummer.BackColor = System.Drawing.Color.Transparent;
+            this.lblEinrichtungsnummer.CanShrink = true;
+            this.lblEinrichtungsnummer.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblEinrichtungsnummer.LocationFloat = new DevExpress.Utils.PointFloat(0F, 325F);
+            this.lblEinrichtungsnummer.Multiline = true;
+            this.lblEinrichtungsnummer.Name = "lblEinrichtungsnummer";
+            this.lblEinrichtungsnummer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblEinrichtungsnummer.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.lblEinrichtungsnummer.StylePriority.UseBackColor = false;
+            this.lblEinrichtungsnummer.StylePriority.UseFont = false;
+            this.lblEinrichtungsnummer.Text = "Einrichtungsnummer";
+            this.lblEinrichtungsnummer.WordWrap = false;
+            // 
             // xrLabel7
             // 
             this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel7.CanShrink = true;
             this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 291.6667F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 305F);
             this.xrLabel7.Multiline = true;
             this.xrLabel7.Name = "xrLabel7";
             this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -246,7 +264,7 @@ namespace MuenchenerAidsHilfeEV
             this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel2.CanShrink = true;
             this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 231.6667F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 245F);
             this.xrLabel2.Multiline = true;
             this.xrLabel2.Name = "xrLabel2";
             this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -263,8 +281,9 @@ namespace MuenchenerAidsHilfeEV
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow2,
             this.xrTableRow6,
+            this.xrTableRow8,
             this.xrTableRow7});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(343.8747F, 60F);
+            this.xrTable1.SizeF = new System.Drawing.SizeF(343.8747F, 80F);
             // 
             // xrTableRow2
             // 
@@ -385,7 +404,7 @@ namespace MuenchenerAidsHilfeEV
             this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel4.CanShrink = true;
             this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 271.6667F);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 285F);
             this.xrLabel4.Multiline = true;
             this.xrLabel4.Name = "xrLabel4";
             this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -401,7 +420,7 @@ namespace MuenchenerAidsHilfeEV
             this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel3.CanShrink = true;
             this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 251.6667F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 265F);
             this.xrLabel3.Name = "xrLabel3";
             this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F);
@@ -413,7 +432,7 @@ namespace MuenchenerAidsHilfeEV
             // 
             // xrLabel5
             // 
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 355F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 368.3333F);
             this.xrLabel5.Name = "xrLabel5";
             this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -422,7 +441,7 @@ namespace MuenchenerAidsHilfeEV
             // 
             // lblAbrechnungszeitraum
             // 
-            this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 380F);
+            this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 393.3333F);
             this.lblAbrechnungszeitraum.Multiline = true;
             this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
             this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -786,20 +805,33 @@ namespace MuenchenerAidsHilfeEV
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
             // 
-            // lblEinrichtungsnummer
+            // xrTableRow8
             // 
-            this.lblEinrichtungsnummer.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.lblEinrichtungsnummer.CanShrink = true;
+            this.xrTableCell3,
-            this.lblEinrichtungsnummer.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblDatum});
-            this.lblEinrichtungsnummer.LocationFloat = new DevExpress.Utils.PointFloat(0F, 311.6667F);
+            this.xrTableRow8.Name = "xrTableRow8";
-            this.lblEinrichtungsnummer.Multiline = true;
+            this.xrTableRow8.Weight = 0.13245033112582783D;
-            this.lblEinrichtungsnummer.Name = "lblEinrichtungsnummer";
+            // 
-            this.lblEinrichtungsnummer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            // xrTableCell3
-            this.lblEinrichtungsnummer.SizeF = new System.Drawing.SizeF(650F, 20F);
+            // 
-            this.lblEinrichtungsnummer.StylePriority.UseBackColor = false;
+            this.xrTableCell3.Name = "xrTableCell3";
-            this.lblEinrichtungsnummer.StylePriority.UseFont = false;
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblEinrichtungsnummer.Text = "Einrichtungsnummer";
+            this.xrTableCell3.StylePriority.UsePadding = false;
-            this.lblEinrichtungsnummer.WordWrap = false;
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.Text = "Erstellungsdatum:";
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell3.Weight = 0.43933283562699876D;
+            // 
+            // lblDatum
+            // 
+            this.lblDatum.Name = "lblDatum";
+            this.lblDatum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblDatum.StylePriority.UsePadding = false;
+            this.lblDatum.StylePriority.UseTextAlignment = false;
+            this.lblDatum.Text = "lblDatum";
+            this.lblDatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.lblDatum.Weight = 0.56066716437300124D;
             // 
             // ServiceInvoiceReport
             // 
@@ -897,5 +929,8 @@ namespace MuenchenerAidsHilfeEV
         private DevExpress.XtraReports.UI.XRRichText xrRichText2;
         private DevExpress.XtraReports.UI.XRRichText xrRichText1;
         private DevExpress.XtraReports.UI.XRLabel lblEinrichtungsnummer;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableCell lblDatum;
     }
 }

ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.cs

@@ -52,7 +52,26 @@ namespace MuenchenerAidsHilfeEV
 			{
 				lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Leistungen:", start, end);
 			}
+            String einrichtungsnummer = "102106";
 
+            foreach (var sip in pRO.ServiceInvoicePeriods)
+            {
+                foreach (var item in sip.ServiceInvoiceItems)
+                {
+                    if (item.ServiceDescription == "1:6" || item.ServiceDescription == "1:8" || item.ServiceDescription == "1:10")
+                    {
+                        einrichtungsnummer = "102021";
+                    }
+                }
+            }
+            lblEinrichtungsnummer.Text = "Einrichtungsnummer " + einrichtungsnummer;
+
+            lblDatum.Text = pRO.InvoiceDate;
+
+            pRO.InvoiceDateTime = pRO.AccountingPeriodEnd;
+            pRO.InvoiceDate = String.Format("{0:dd.MM.yyyy}", pRO.InvoiceDateTime);
+            pRO.AccountingPeriodStart = pRO.InvoiceBase.SupportConceptCostBearerRelDc.StartDate.Value;
+            pRO.AccountingPeriodEnd = pRO.InvoiceBase.SupportConceptCostBearerRelDc.EndDate.Value;
             this.bindingSource1.DataSource = pRO;
         }
     }

Service/Plugins/PluginLoader.cs

@@ -48,7 +48,7 @@ namespace BeWo.Service.Plugins
                 //t = "2499262621"; // HPH Bersenbrück
                 //t = "4950382346"; // Holsinger
                 //t = "5973016645"; // Verein Lebensgestaltung Hanau
-                //t = "7375324044"; // Diakonie KK Kleve
+                t = "7375324044"; // Diakonie KK Kleve
                 //t = "1441747891"; // BeWo Mobil Köln
                 //t = "5120047701"; // Trialog
                 //t = "3629696651"; // Soziale Dienste Niederrhein
@@ -304,7 +304,7 @@ namespace BeWo.Service.Plugins
                 //t = "2385915144"; // AKGG GmbHd
                 //t = "8002913382"; // AKGG GmbH (MID)
                 //t = "5155880294"; // BHV Bergische Hauspflege
-                t = "8366649557"; // Münchner Aids-Hilfe e.V.
+                //t = "8366649557"; // Münchner Aids-Hilfe e.V.
                 //t = "2976949196"; // WHB Refrath gGmbH
                 //t = "3563903598"; // ABW Münster
                 //t = "1344064965"; // ABW Klaßen