ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
Christian
2025-04-06 11:16:15 +02:00
parent 71a863cc2a 4ee57e4169
commit d2f49822d3
22 changed files with 350 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -2687,7 +2687,6 @@ namespace BeWoPlanerMobil.Controllers
newResult.KannTrotzdemGespeichertWerden = vr.Allow;
break;
case SignatureExists:
case ConfirmationReceiptSignatureExists:
var klient3 = "diesem Hilfeplan";
if(!string.IsNullOrEmpty(vr.CustomerName))
{

7
Data/Access/GenericDAO.cs
View File

@@ -387,9 +387,6 @@ namespace BeWo.Data.Access
private static void LogSignatureDeletion(BeWoEntityBase entity)
{
// ToDo: vorerst ausgesetzt, da versucht wird, ein Null-Objekt in die Datenbank zu schreiben.
return;
var signatureHistoryEntries = new List<SignatureHistory>();
switch(entity)
@@ -410,7 +407,7 @@ namespace BeWo.Data.Access
break;
}
case Bargeldkasse bargeldkasse when bargeldkasse.Bargeldtransaktionen.Any(bargeldtransaktion => bargeldtransaktion.SignatureOid.HasValue):
signatureHistoryEntries.AddRange(DAOFactory.SearchDAO.CreateSignatureHistoryEntryForBargeldkasse(bargeldkasse));
signatureHistoryEntries.AddRangeIfNotNull(DAOFactory.SearchDAO.CreateSignatureHistoryEntryForBargeldkasse(bargeldkasse));
break;
case Bargeldtransaktion bargeldtransaktion when bargeldtransaktion.SignatureOid.HasValue:
signatureHistoryEntries.AddIfNotNull(DAOFactory.SearchDAO.CreateSignatureHistoryForBargeldtransaktion(bargeldtransaktion, SignatureEventType.CascadingDelete));
@@ -419,7 +416,7 @@ namespace BeWo.Data.Access
if(signatureHistoryEntries.Any())
{
DAOFactory.GenericDAO.Insert(signatureHistoryEntries);
DAOFactory.GenericDAO.Insert(signatureHistoryEntries.Where(she => she is object));
}
}

6
Data/Access/Scripts/GetGkvSumByDateRange.sql
View File

@@ -9,4 +9,10 @@ SELECT MIN(Oid)
FROM gkvtransferprotokoll AS t2
WHERE t1.GkvAbrechnungOid = t2.GkvAbrechnungOid
GROUP BY t2.GkvAbrechnungOid
)
AND
(
(a1.Verfahrensstufe = 1 AND t1.EmpfangerBezeichnung NOT LIKE 'knappschaft')
OR
a1.Verfahrensstufe = 2
)

17
Data/Access/Scripts/GetGkvSumByDateRangeDebug.sql Normal file
View File

@@ -0,0 +1,17 @@
SELECT *
FROM gkvtransferprotokoll AS t1
JOIN gkvabrechnung a1
ON a1.Oid = t1.GkvAbrechnungOid
WHERE DATE(t1.ErstelltAm) >= '2025-01-01'
AND DATE(t1.ErstelltAm) <= '2025-02-28'
AND t1.Oid = (
SELECT MIN(Oid)
FROM gkvtransferprotokoll AS t2
WHERE t1.GkvAbrechnungOid = t2.GkvAbrechnungOid
GROUP BY t2.GkvAbrechnungOid)
AND
(
(a1.Verfahrensstufe = 1 AND t1.EmpfangerBezeichnung NOT LIKE 'knappschaft')
OR
a1.Verfahrensstufe = 2
)

2
ReportImp/AsSozialeDienstleistungenEV/LeistungnachweisMonatsbericht.Designer.cs generated
View File

@@ -1225,7 +1225,7 @@ namespace AsSozialeDienstleistungenEV
// xrTableCell31
//
this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CostBearer2SupportConceptList.SupportConcept.Notice")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptCostBearer.Notice")});
this.xrTableCell31.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrTableCell31.Multiline = true;
this.xrTableCell31.Name = "xrTableCell31";

25
ReportImp/AutismusKoelnBonn/Service/CustomVacationService.cs
View File

@@ -20,6 +20,31 @@ namespace KundeXyz.Service
return list;
}
public override decimal CalcCorrectNumberOfLeaveDaysForSpecialContractSituation(DateTime entryDate, DateTime? endDate, int anzahlArbeitstage, int restlicheTageImJahr, decimal? urlaubstageProJahr)
{
decimal urlaubstage = 0;
if (urlaubstageProJahr == null)
urlaubstageProJahr = 0m;
if (entryDate.Day == 1 && entryDate.Month == 1 || entryDate.Day == 2 && entryDate.Month == 1) //Erster Tag im Jahr
{
//Prüfen, ob Enddatum Ende des Jahres oder früher ist
if (endDate == null || (endDate.HasValue && endDate.Value.Day == 31 && endDate.Value.Month == 12))
urlaubstage = (decimal)urlaubstageProJahr;
else
urlaubstage = (decimal)urlaubstageProJahr / 365m * restlicheTageImJahr;
}
else
{
urlaubstage = (decimal)urlaubstageProJahr / 365m * restlicheTageImJahr;
}
// Runden
urlaubstage = UrlaubstageRunden(urlaubstage);
return urlaubstage;
}
public override decimal UrlaubstageRunden(decimal urlaubstage)
{
if (urlaubstage - (int)urlaubstage <= 0.5m)

47
ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.Designer.cs generated
View File

@@ -59,9 +59,9 @@ namespace DiakonischesWerkDinslakenJuDi
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -104,11 +104,12 @@ namespace DiakonischesWerkDinslakenJuDi
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -476,10 +477,6 @@ namespace DiakonischesWerkDinslakenJuDi
this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell49.Weight = 0.39524168989241909D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -490,6 +487,7 @@ namespace DiakonischesWerkDinslakenJuDi
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox3,
this.xrPictureBox2,
this.xrTable1,
this.lblAnschrift,
@@ -499,6 +497,15 @@ namespace DiakonischesWerkDinslakenJuDi
this.ReportHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 2, 0, 100F);
this.ReportHeader.StylePriority.UsePadding = false;
//
// xrPictureBox2
//
this.xrPictureBox2.ImageAlignment = DevExpress.XtraPrinting.ImageAlignment.MiddleCenter;
this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(572.3333F, 0F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(166.6667F, 112.5833F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrTable1
//
this.xrTable1.KeepTogether = true;
@@ -798,7 +805,7 @@ namespace DiakonischesWerkDinslakenJuDi
this.lblAnschrift.Multiline = true;
this.lblAnschrift.Name = "lblAnschrift";
this.lblAnschrift.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAnschrift.SizeF = new System.Drawing.SizeF(494.3794F, 97.91666F);
this.lblAnschrift.SizeF = new System.Drawing.SizeF(415.2128F, 97.91666F);
this.lblAnschrift.StylePriority.UseFont = false;
this.lblAnschrift.StylePriority.UseForeColor = false;
this.lblAnschrift.StylePriority.UseTextAlignment = false;
@@ -845,7 +852,7 @@ namespace DiakonischesWerkDinslakenJuDi
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 54.16667F;
this.topMarginBand1.HeightF = 68.46753F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -1004,14 +1011,17 @@ namespace DiakonischesWerkDinslakenJuDi
this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldKontaktArt.Name = "fieldKontaktArt";
//
// xrPictureBox2
// xrPictureBox3
//
this.xrPictureBox2.ImageAlignment = DevExpress.XtraPrinting.ImageAlignment.MiddleCenter;
this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(572.3333F, 0F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(166.6667F, 112.5833F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(441.5276F, 47.34931F);
this.xrPictureBox3.Name = "xrPictureBox3";
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(130.8058F, 55.56736F);
this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// Leistungsnachweis
//
@@ -1031,7 +1041,7 @@ namespace DiakonischesWerkDinslakenJuDi
this.formattingRuleServiceDesc,
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName});
this.Margins = new DevExpress.Drawing.DXMargins(50F, 30F, 54.16667F, 30F);
this.Margins = new DevExpress.Drawing.DXMargins(50F, 30F, 68.46753F, 30F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -1040,8 +1050,8 @@ namespace DiakonischesWerkDinslakenJuDi
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1121,5 +1131,6 @@ namespace DiakonischesWerkDinslakenJuDi
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
}
}

3
ReportImp/DiakonischesWerkDinslakenJuDi/Leistungsnachweis.resx
View File

File diff suppressed because one or more lines are too long

2
ReportImp/FlexibleJugendarbeitFrankfurtEV/FlexibleJugendarbeitFrankfurtEV.csproj
View File

@@ -58,8 +58,6 @@
<Compile Include="CustomMitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="CustomVacationService.cs" />
<Compile Include="CustomReportCreator.cs" />
<Compile Include="Invoicing\CustomInvoiceCreation.cs" />
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="LeistungsnachweisHFP.cs">
<SubType>Component</SubType>
</Compile>

31
ReportImp/FlexibleJugendarbeitFrankfurtEV/Invoicing/CustomInvoiceCreation.cs
View File

@@ -1,31 +0,0 @@
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Invoicing;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Services;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FlexibleJugendarbeitFrankfurtEV.Invoicing
{
public class CustomInvoiceCreation : InvoiceCreation
{
public override string GetSummaryItemKey(SupportConceptApprovalPeriod scap, InvoiceItem iitem, bool summaryPerMonth)
{
String key = String.Format("{0:0.0000}_{1}_{2}", iitem.AmountPerUnit, iitem.RateFactor, iitem.ItemDescription);
if (summaryPerMonth)
{
key = String.Format("{0:0.0000}_{1}_{2}_{3:yyyyMM}", iitem.AmountPerUnit, iitem.RateFactor, iitem.ItemDescription, iitem.ItemPeriodStart);
}
return key;
}
}
}

48
ReportImp/FlexibleJugendarbeitFrankfurtEV/Invoicing/CustomInvoiceFactory.cs
View File

@@ -1,48 +0,0 @@
using BeWo.Service.Invoicing;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FlexibleJugendarbeitFrankfurtEV.Invoicing
{
public class CustomInvoiceFactory : InvoiceFactory
{
public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
foreach (var list in supportConcepts2ServiceRecords.Values)
{
if (list != null && list.Count > 0)
{
foreach (var sr in list)
{
if (sr.CostBearer != null)
{
if (sr.CostBearer.Name.Contains("Amt für Jugend und Soziales Frankfurt (Oder)"))
{
return new CustomInvoiceCreation();
}
}
}
}
else
{
foreach (var item in supportConcepts2ServiceRecords.Keys)
{
if (item != null && item.CostBearerList != null && item.CostBearerList.Count > 0)
{
if (item.CostBearerList[0].OrganisationName.Contains("Amt für Jugend und Soziales Frankfurt(Oder)"))
{
return new CustomInvoiceCreation();
}
}
}
}
}
return new InvoiceCreation();
}
}
}

2
ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisOderSpree.Designer.cs generated
View File

@@ -616,7 +616,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
this.xrLabel27.StylePriority.UseFont = false;
this.xrLabel27.StylePriority.UsePadding = false;
this.xrLabel27.StylePriority.UseTextAlignment = false;
this.xrLabel27.Text = "[CostBearer2SupportConceptList.CostBearerContactPerson.LastName]";
this.xrLabel27.Text = "[MainAttendantCommaSeperated]";
this.xrLabel27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel14

27
ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisOderSpree.cs
View File

@@ -40,6 +40,7 @@ namespace FlexibleJugendarbeitFrankfurtEV
pRO.Services = servicesBillable;
}
SetzeBewilligung(pRO);
SetzeMainAttendants(pRO);
bindingSource1.DataSource = pRO;
}
@@ -70,6 +71,32 @@ namespace FlexibleJugendarbeitFrankfurtEV
}
}
private void SetzeMainAttendants(ServicesOverviewRO pRo)
{
if (pRo.CostBearer2SupportConceptList != null && pRo.CostBearer2SupportConceptList.Count > 0)
{
pRo.MainAttendantCommaSeperated = "";
var c2s = pRo.CostBearer2SupportConceptList[0];
foreach (var scap in c2s.ApprovalPeriodList)
{
if (scap.StartDate <= pRo.EndDate && scap.EndDate >= pRo.StartDate)
{
if (scap.SupportConceptApprovalPeriod2Employee != null && scap.SupportConceptApprovalPeriod2Employee.Count > 0)
{
foreach (var e in scap.SupportConceptApprovalPeriod2Employee)
{
if (pRo.MainAttendantCommaSeperated.Length > 0)
{
pRo.MainAttendantCommaSeperated += ", ";
}
pRo.MainAttendantCommaSeperated += e.Employee.Person.LastName;
}
}
}
}
}
}
private void picSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
{
XRPictureBox xrBox = sender as XRPictureBox;

62
ReportImp/MuenchenerAidsHilfeEV/Service/CustomCustomerService.cs
View File

@@ -1,4 +1,8 @@
using BeWo.Service.Plugins;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using System;
using System.Collections.Generic;
@@ -10,7 +14,61 @@ namespace KundeXyz.Service
{
public class CustomCustomerService : CustomerService
{
public override List<CompactSupportConceptDC> GetAllSupportConceptsCompact(long currentEmployeeOid)
public override long InsertNewCustomer(CustomerDC pCustomerDc)
{
var cOid = base.InsertNewCustomer(pCustomerDc);
ErstelleOrdnerStruktur(cOid);
return cOid;
}
public override CustomerDC LoadCustomer(long pCustomerOid)
{
var dc = base.LoadCustomer(pCustomerOid);
var folder = DAOFactory.SearchDAO.FindBeWoFolders(TableID.Customer, pCustomerOid);
if (folder.Count == 0)
{
ErstelleOrdnerStruktur(pCustomerOid);
}
return dc;
}
private void ErstelleOrdnerStruktur(long cOid)
{
var aktuellesJahr = DateTime.Now.Year.ToString();
// Ordner 1
var folder_01 = CreateBeWoFolder(aktuellesJahr, cOid, null);
var folder_02 = CreateBeWoFolder("Archiv", cOid, null);
var folder_03 = CreateBeWoFolder("wichtige Unterlagen u. Dokumente", cOid, null);
//Ordner 2
var folder_01_01 = CreateBeWoFolder("01_Betreuungskosten", cOid, folder_01.Oid);
var folder_01_02 = CreateBeWoFolder("02_Einkommen", cOid, folder_01.Oid);
var folder_01_03 = CreateBeWoFolder("03_Gesundheit + Krankenkasse", cOid, folder_01.Oid);
var folder_01_04 = CreateBeWoFolder("04_Wohnung", cOid, folder_01.Oid);
var folder_01_05 = CreateBeWoFolder("05_ Arbeit_Ausbildung", cOid, folder_01.Oid);
var folder_01_06 = CreateBeWoFolder("06_Individuell", cOid, folder_01.Oid);
}
private BeWoFolder CreateBeWoFolder(string name, long? cOid, long? parentOid)
{
BeWoFolder f = new BeWoFolder();
f.Name = name;
f.ObjectOid = cOid;
f.ObjectTid = TableID.Customer;
f.ParentBeWoFolderOid = parentOid;
DAOFactory.GenericDAO.Insert(f);
return f;
}
public override List<CompactSupportConceptDC> GetAllSupportConceptsCompact(long currentEmployeeOid)
{
var result = base.GetAllSupportConceptsCompact(currentEmployeeOid);

15
ReportImp/MuenchenerAidsHilfeEV/ServiceRecordListReport.cs
View File

@@ -50,10 +50,14 @@ namespace MuenchenerAidsHilfeEV
// ServiceRecords mit mehr als einem Ziel müssen dupliziert werden, da in jedem Tabelleneintrag nur EIN Ziel mit allen dokumentierten Maßnahmen stehen soll
// Es müssen also die x bearbeiteten Ziele in einem Termin auf x einzelene ServiceRecords aufgeteilt werden
List<ServiceRecordListRO.ServiceRecordDetail> duplicatesToAdd = new List<ServiceRecordListRO.ServiceRecordDetail>();
List<ServiceRecordListRO.ServiceRecordDetail> allDuplicatesToAdd = new List<ServiceRecordListRO.ServiceRecordDetail>();
foreach (var sr in pRO.ServiceRecordDetailList)
{
List<ServiceRecordListRO.ServiceRecordDetail> duplicatesToAdd = new List<ServiceRecordListRO.ServiceRecordDetail>();
// Notice4 setzen (Betreuer) (Doch nicht gewünscht)
//sr.ServiceRecord.Notice4 = sr.EmployeeFirstName.Substring(0, 1) + sr.EmployeeLastName.Substring(0, 1);
@@ -72,6 +76,11 @@ namespace MuenchenerAidsHilfeEV
// Für richtige Tabellendarstellung muss am Ende ein ServiceRecordDetail pro GoalPath hinzugefügt werden
if (sr.GoalPaths.Count > 0)
{
if (sr.Start.Value.Day == 19)
{
}
sr.ServiceCategory = "";
sr.Notice = "";
@@ -115,9 +124,11 @@ namespace MuenchenerAidsHilfeEV
}
}
}
allDuplicatesToAdd.AddRange(duplicatesToAdd);
}
pRO.ServiceRecordDetailList.AddRange(duplicatesToAdd);
pRO.ServiceRecordDetailList.AddRange(allDuplicatesToAdd);
pRO.ServiceRecordDetailList.OrderBy(sr => sr.Start);
// Wenn mehr als 30 Tage am Stück abwesend, dann darstellen

283
ReportImp/PerspektivenEV/LwvAbgerechneteFls.Designer.cs generated
View File

@@ -32,7 +32,7 @@ namespace PerspektivenEV
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();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LwvAbgerechneteFls));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -40,9 +40,14 @@ namespace PerspektivenEV
this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell75 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell81 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell85 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
@@ -50,7 +55,7 @@ namespace PerspektivenEV
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -59,18 +64,11 @@ namespace PerspektivenEV
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.fieldDifferenz = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
@@ -100,7 +98,7 @@ namespace PerspektivenEV
this.xrTableDetail.ProcessHiddenCellMode = DevExpress.XtraReports.UI.ProcessHiddenCellMode.DecreaseTableWidth;
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
this.xrTableDetail.SizeF = new System.Drawing.SizeF(693.125F, 20F);
this.xrTableDetail.SizeF = new System.Drawing.SizeF(543.9548F, 20F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UsePadding = false;
this.xrTableDetail.StylePriority.UseTextAlignment = false;
@@ -111,7 +109,6 @@ namespace PerspektivenEV
this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell75,
this.xrTableCell81,
this.xrTableCell85,
this.xrTableCell5});
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 1D;
@@ -147,21 +144,22 @@ namespace PerspektivenEV
this.xrTableCell81.TextFormatString = "{0:c2}";
this.xrTableCell81.Weight = 0.11446579494337722D;
//
// xrTableCell85
// xrTableCell5
//
this.xrTableCell85.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell85.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field3")});
this.xrTableCell85.Name = "xrTableCell85";
this.xrTableCell85.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTableCell85.StylePriority.UseBackColor = false;
this.xrTableCell85.StylePriority.UseBorders = false;
this.xrTableCell85.StylePriority.UsePadding = false;
this.xrTableCell85.StylePriority.UseTextAlignment = false;
this.xrTableCell85.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell85.TextFormatString = "{0:n0}";
this.xrTableCell85.Weight = 0.11446537085035261D;
this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field4")});
this.xrTableCell5.Multiline = true;
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTableCell5.StylePriority.UseBackColor = false;
this.xrTableCell5.StylePriority.UseBorders = false;
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell5.TextFormatString = "{0:n2}";
this.xrTableCell5.Weight = 0.11756314967213143D;
//
// DetailReport
//
@@ -185,17 +183,85 @@ namespace PerspektivenEV
this.GroupHeader1.RepeatEveryPage = true;
this.GroupHeader1.StylePriority.UseFont = false;
//
// xrTable3
//
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.ProcessHiddenCellMode = DevExpress.XtraReports.UI.ProcessHiddenCellMode.DecreaseTableWidth;
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow3});
this.xrTable3.SizeF = new System.Drawing.SizeF(543.9544F, 25F);
this.xrTable3.StylePriority.UseFont = false;
//
// xrTableRow3
//
this.xrTableRow3.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)));
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell4,
this.xrTableCell2});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.StylePriority.UseBorders = false;
this.xrTableRow3.Weight = 0.59999992675782143D;
//
// xrTableCell3
//
this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseBorders = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "Bereich";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.79467311201670188D;
//
// xrTableCell4
//
this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell4.Multiline = true;
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTableCell4.StylePriority.UseBorders = false;
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Betrag";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell4.Weight = 0.39445964802698474D;
//
// xrTableCell2
//
this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell2.Multiline = true;
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTableCell2.StylePriority.UseBorders = false;
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "FLS";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell2.Weight = 0.40513402264467241D;
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPictureBox1,
this.xrLabel3});
this.ReportHeader.HeightF = 37.5F;
this.ReportHeader.HeightF = 57.22917F;
this.ReportHeader.Name = "ReportHeader";
//
// xrLabel3
//
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(170F, 0F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -221,7 +287,7 @@ namespace PerspektivenEV
this.xrTable1.ProcessHiddenCellMode = DevExpress.XtraReports.UI.ProcessHiddenCellMode.DecreaseTableWidth;
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(693.125F, 20F);
this.xrTable1.SizeF = new System.Drawing.SizeF(543.9543F, 20F);
this.xrTable1.StylePriority.UseFont = false;
//
// xrTableRow1
@@ -230,7 +296,6 @@ namespace PerspektivenEV
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell8,
this.xrTableCell11,
this.xrTableCell36,
this.xrTableCell6});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.StylePriority.UseBorders = false;
@@ -266,23 +331,23 @@ namespace PerspektivenEV
this.xrTableCell11.TextFormatString = "{0:c2}";
this.xrTableCell11.Weight = 0.39445952579557619D;
//
// xrTableCell36
// xrTableCell6
//
this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field3")});
this.xrTableCell36.Multiline = true;
this.xrTableCell36.Name = "xrTableCell36";
this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTableCell36.StylePriority.UseBorders = false;
this.xrTableCell36.StylePriority.UsePadding = false;
this.xrTableCell36.StylePriority.UseTextAlignment = false;
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field4")});
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTableCell6.StylePriority.UseBorders = false;
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
xrSummary2.FormatString = "{0:n2}";
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell36.Summary = xrSummary2;
this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell36.TextFormatString = "{0:n0}";
this.xrTableCell36.Weight = 0.39445987437278462D;
this.xrTableCell6.Summary = xrSummary2;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell6.Weight = 0.4051338462325263D;
//
// Title
//
@@ -348,123 +413,13 @@ namespace PerspektivenEV
this.fieldDifferenz.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldDifferenz.Name = "fieldDifferenz";
//
// xrTableCell4
// xrPictureBox1
//
this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell4.Multiline = true;
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTableCell4.StylePriority.UseBorders = false;
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Betrag";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell4.Weight = 0.39445964802698474D;
//
// xrTableCell3
//
this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseBorders = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "Bereich";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.79467311201670188D;
//
// xrTableRow3
//
this.xrTableRow3.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)));
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell4,
this.xrTableCell1,
this.xrTableCell2});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.StylePriority.UseBorders = false;
this.xrTableRow3.Weight = 0.59999992675782143D;
//
// xrTable3
//
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.ProcessHiddenCellMode = DevExpress.XtraReports.UI.ProcessHiddenCellMode.DecreaseTableWidth;
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow3});
this.xrTable3.SizeF = new System.Drawing.SizeF(693.125F, 25F);
this.xrTable3.StylePriority.UseFont = false;
//
// xrTableCell1
//
this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell1.Multiline = true;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTableCell1.StylePriority.UseBorders = false;
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Notice";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell1.Weight = 0.39445964802698474D;
//
// xrTableCell2
//
this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell2.Multiline = true;
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTableCell2.StylePriority.UseBorders = false;
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "Min pro Monat";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell2.Weight = 0.44787600967706D;
//
// xrTableCell5
//
this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field4")});
this.xrTableCell5.Multiline = true;
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTableCell5.StylePriority.UseBackColor = false;
this.xrTableCell5.StylePriority.UseBorders = false;
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell5.TextFormatString = "{0:n2}";
this.xrTableCell5.Weight = 0.12996608683184463D;
//
// xrTableCell6
//
this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field4")});
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTableCell6.StylePriority.UseBorders = false;
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
xrSummary3.FormatString = "{0:n2}";
xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell6.Summary = xrSummary3;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell6.Weight = 0.44787558772886848D;
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(847.5418F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(231.4583F, 57.22917F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// bindingSource1
//
@@ -495,8 +450,8 @@ namespace PerspektivenEV
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -524,19 +479,17 @@ namespace PerspektivenEV
private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell75;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell81;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell85;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
}
}

32
ReportImp/PerspektivenEV/LwvAbgerechneteFls.cs
View File

@@ -47,14 +47,14 @@ namespace PerspektivenEV
DateTime.TryParse(queryRo.Rows[0].Field1.ToString(), out datum);
}
}
DateTime start = new DateTime(datum.Year, 3, 1);
DateTime start = new DateTime(datum.Year, 1, 1);
datum = datum.AddMonths(1);
DateTime end = datum;
int month = end.Month - start.Month + 1;
var allInvoices = DAOFactory.GenericDAO.GetAllActive<ServiceInvoice>();
var oidList = new List<long>() { 198, 199, 202, 203 }; // nur für LWV, Oberbayern, Landesamt Saarland, Breisgau
var invoices = allInvoices.Where(i => i.InvoiceBase.IsActive == ActivationTypeId.Active && i.InvoiceBase.AccountingPeriodStart >= start && i.InvoiceBase.AccountingPeriodStart < end && oidList.Contains(i.InvoiceBase.RecipientOrganisationOid.Value)).ToList();
var invoices = allInvoices.Where(i => i.InvoiceBase.IsActive == ActivationTypeId.Active && i.InvoiceBase.AccountingPeriodStart >= start && i.InvoiceBase.AccountingPeriodEnd < end && oidList.Contains(i.InvoiceBase.RecipientOrganisationOid.Value)).ToList();
invoices = (List<ServiceInvoice>)invoices.OrderByDescending(i => i.InvoiceBase.Oid).ToList();
var costcenterDict = new Dictionary<string, List<InvoiceItem>>(); // Sortieren nach Leistungsart
@@ -71,32 +71,36 @@ namespace PerspektivenEV
{
var ii = sip.InvoiceItemList[0];
var iiNew = i.ServiceInvoicePeriodList[m + 1].InvoiceItemList[0];
decimal minQa = 0; // nochmal checken
iiNew.Notice = ii.Notice;
iiNew.AmountPerUnit += ii.AmountPerUnit;
iiNew.AmountTotal += ii.AmountTotal;
iiNew.GrossAmountTotal += iiNew.GrossAmountTotal;
iiNew.ItemDescription = "Assistenz Kombi";
}
i.ServiceInvoicePeriodList.Remove(sip);
}
}
}
foreach (var sip in i.ServiceInvoicePeriodList)
{
foreach (var ii in sip.InvoiceItemList)
if (sip.InvoiceItemList != null && sip.InvoiceItemList.Count > 0)
{
if (!ii.ItemDescription.IsNullOrEmpty())
foreach (var ii in sip.InvoiceItemList)
{
//ii.Notice = i.InvoiceBase.InvoiceNumber;
if (costcenterDict.ContainsKey(ii.ItemDescription))
if (!ii.ItemDescription.IsNullOrEmpty() &&
(ii.ItemDescription.Contains("Assistenz Kombi") || ii.ItemDescription.Contains("Assistenz ieH") || ii.ItemDescription.Contains("Assistenz TS")))
{
costcenterDict[ii.ItemDescription].Add(ii);
}
else
{
costcenterDict.Add(ii.ItemDescription, new List<InvoiceItem>());
costcenterDict[ii.ItemDescription].Add(ii);
//ii.Notice = i.InvoiceBase.InvoiceNumber;
if (costcenterDict.ContainsKey(ii.ItemDescription))
{
costcenterDict[ii.ItemDescription].Add(ii);
}
else
{
costcenterDict.Add(ii.ItemDescription, new List<InvoiceItem>());
costcenterDict[ii.ItemDescription].Add(ii);
}
}
}
}

3
ReportImp/PerspektivenEV/LwvAbgerechneteFls.resx
View File

File diff suppressed because one or more lines are too long

4
Service/Plugins/PluginLoader.cs
View File

@@ -50,7 +50,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 (SDN)
@@ -65,7 +65,7 @@ namespace BeWo.Service.Plugins
//t = "2542550178"; // LWVEingliederungshilfe
//t = "3963982016"; // Convoi
//t = "1600408120"; // BeWo Amrath
//t = "3886054624"; // Brücke ABW
t = "3886054624"; // Brücke ABW
//t = "2028095630"; // Integra Heinsberg
//t = "5351926758"; // Viva a Vida
//t = "2215396183"; // Diakonie Remscheid Lennep

13
Service/Plugins/ServiceRecordValidator.cs
View File

@@ -36,6 +36,7 @@ namespace BeWo.Service.Plugins
DateTime start = groupRecord.Start.Value;
bool noTime = start.Hour == 0 && start.Minute == 0 && start.Second == 1; //Keine Zeit angegeben
// 0. Monatsunterschrift ist vorhanden und die Leistungskategorie ist abrechenbar
if(groupRecord.ServiceDescription.Category.IsBillable)
{
var startDate = groupRecord.Start.Value;
@@ -50,7 +51,7 @@ namespace BeWo.Service.Plugins
if(hasMonatsunterschrift)
{
result.AddOrUpdateValueInDictionary(groupRecord, ServiceRecordValidationResult.ConfirmationReceiptSignatureExists);
result.AddOrUpdateValueInDictionary(groupRecord, ServiceRecordValidationResult.SignatureExists);
}
}
}
@@ -259,13 +260,17 @@ namespace BeWo.Service.Plugins
if(hasMonatsunterschrift)
{
var customerName = newServiceRecord.SupportConcept.CustomerName;
var customerText = customerName is object ? $"Klient {customerName}" : "diesem Hilfeplan";
result.Add(new ServiceRecordValidationResultDC
{
ResultType = ServiceRecordValidationResult.ConfirmationReceiptSignatureExists,
ResultType = ServiceRecordValidationResult.SignatureExists,
Allow = true,
CustomerName = newServiceRecord.SupportConcept.CustomerName,
EmployeeName = newServiceRecord.Employee.ToString(),
Message = "Für den ausgewählten Zeitraum existiert bereits eine Monatsunterschrift, die mit dem Anlegen dieses Eintrags verfällt und neu geleistet werden muss."
Message = $"Für den ausgewählten Zeitraum existiert bereits eine Monatsunterschrift bei {customerText}, die mit dem Anlegen dieses Eintrags verfällt und neu geleistet werden muss."
});
}
}
@@ -288,7 +293,7 @@ namespace BeWo.Service.Plugins
result.Add(new ServiceRecordValidationResultDC
{
ResultType = ServiceRecordValidationResult.ConfirmationReceiptSignatureExists,
ResultType = ServiceRecordValidationResult.SignatureExists,
Message = message,
Allow = true,
CustomerName = newServiceRecord.SupportConcept?.CustomerName,

3
Shared/BeWoEntityEnums.cs
View File

@@ -909,8 +909,7 @@ namespace BS.Shared
SettlementInvoiceAlreadyExisting = 6,
FristAbgelaufen = 7,
Custom = 8,
SignatureExists = 9,
ConfirmationReceiptSignatureExists = 10
SignatureExists = 9
}
public enum ViewDestination

17
Shared/Extensions/IListTExtensions.cs
View File

@@ -134,7 +134,7 @@ namespace BS.Shared.Extensions
public static void AddIfNotNull<T>(this IList<T> list, T item)
{
if (item != null)
if(item != null)
{
list.Add(item);
}
@@ -142,10 +142,23 @@ namespace BS.Shared.Extensions
public static void AddIfNotNullAndNotIn<T>(this IList<T> list, T item)
{
if (item != null)
if(item != null)
{
list.AddIfNotIn(item);
}
}
public static void AddRangeIfNotNull<T>(this IList<T> list, IList<T> items)
{
if(items == null)
{
return;
}
foreach(var item in items)
{
list.AddIfNotNull(item);
}
}
}
}