From 82e3327d99a9b0ca814e35d8925ea155e2dd7654 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 20 Jul 2022 14:07:41 +0200 Subject: [PATCH] PerspektivenEV, HshNetzwerk/ServicesOverviewReport und KetteReports --- .../ServicesOverviewReport.Designer.cs | 1 + .../ServiceInvoiceReport.Designer.cs | 71 +++++++++++-------- .../KetteReports/ServiceInvoiceReport.cs | 15 +++- .../KetteReports/ServiceInvoiceReport.resx | 5 +- .../PerspektivenEV/PerspektivenEV.csproj | 1 + .../Validation/DefaultSaveInterceptor.cs | 37 ++++++++++ 6 files changed, 98 insertions(+), 32 deletions(-) create mode 100644 ReportImp/PerspektivenEV/Validation/DefaultSaveInterceptor.cs diff --git a/ReportImp/HshNetzwerk/ServicesOverviewReport.Designer.cs b/ReportImp/HshNetzwerk/ServicesOverviewReport.Designer.cs index 28a96dc38..629ed832b 100644 --- a/ReportImp/HshNetzwerk/ServicesOverviewReport.Designer.cs +++ b/ReportImp/HshNetzwerk/ServicesOverviewReport.Designer.cs @@ -465,6 +465,7 @@ namespace HshNetzwerk this.xrTable2}); this.ReportFooter.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.ReportFooter.HeightF = 140F; + this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBandExceptFirstEntry; this.ReportFooter.StylePriority.UseFont = false; diff --git a/ReportImp/KetteReports/ServiceInvoiceReport.Designer.cs b/ReportImp/KetteReports/ServiceInvoiceReport.Designer.cs index ba863e860..885eee3ac 100644 --- a/ReportImp/KetteReports/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/KetteReports/ServiceInvoiceReport.Designer.cs @@ -39,9 +39,9 @@ namespace KetteReports this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblKundennr = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); + this.lblAbsender = new DevExpress.XtraReports.UI.XRRichText(); this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); @@ -82,12 +82,14 @@ namespace KetteReports this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.lblAbsenderJA = new DevExpress.XtraReports.UI.XRRichText(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.lblAbsender)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.lblAbsenderJA)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -155,9 +157,10 @@ namespace KetteReports // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel7, + this.lblAbsenderJA, + this.lblKundennr, this.xrLabel13, - this.xrRichText2, + this.lblAbsender, this.lblAdresse, this.xrLabel4, this.xrLabel3, @@ -168,20 +171,20 @@ namespace KetteReports this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // - // xrLabel7 + // lblKundennr // - this.xrLabel7.BackColor = System.Drawing.Color.Transparent; - this.xrLabel7.CanShrink = true; - this.xrLabel7.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 301.3541F); - this.xrLabel7.Multiline = true; - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrLabel7.StylePriority.UseBackColor = false; - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "Kundennummer: [DebitorNumber]"; - this.xrLabel7.WordWrap = false; + this.lblKundennr.BackColor = System.Drawing.Color.Transparent; + this.lblKundennr.CanShrink = true; + this.lblKundennr.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.lblKundennr.LocationFloat = new DevExpress.Utils.PointFloat(0F, 301.3541F); + this.lblKundennr.Multiline = true; + this.lblKundennr.Name = "lblKundennr"; + this.lblKundennr.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblKundennr.SizeF = new System.Drawing.SizeF(650F, 20F); + this.lblKundennr.StylePriority.UseBackColor = false; + this.lblKundennr.StylePriority.UseFont = false; + this.lblKundennr.Text = "Kundennummer: [DebitorNumber]"; + this.lblKundennr.WordWrap = false; // // xrLabel13 // @@ -197,14 +200,14 @@ namespace KetteReports this.xrLabel13.Text = "Die Kette e. V. · Paffrather Str. 70 · 51465 Bergisch Gladbach"; this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // - // xrRichText2 + // lblAbsender // - this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F); - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(518.278F, 0F); - this.xrRichText2.Name = "xrRichText2"; - this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); - this.xrRichText2.SizeF = new System.Drawing.SizeF(183.7219F, 190.9722F); - this.xrRichText2.StylePriority.UseFont = false; + this.lblAbsender.Font = new System.Drawing.Font("Arial", 8F); + this.lblAbsender.LocationFloat = new DevExpress.Utils.PointFloat(518.278F, 0F); + this.lblAbsender.Name = "lblAbsender"; + this.lblAbsender.SerializableRtfString = resources.GetString("lblAbsender.SerializableRtfString"); + this.lblAbsender.SizeF = new System.Drawing.SizeF(183.7219F, 190.9722F); + this.lblAbsender.StylePriority.UseFont = false; // // lblAdresse // @@ -710,6 +713,16 @@ namespace KetteReports // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // lblAbsenderJA + // + this.lblAbsenderJA.Font = new System.Drawing.Font("Arial", 8F); + this.lblAbsenderJA.LocationFloat = new DevExpress.Utils.PointFloat(518.278F, 0F); + this.lblAbsenderJA.Name = "lblAbsenderJA"; + this.lblAbsenderJA.SerializableRtfString = resources.GetString("lblAbsenderJA.SerializableRtfString"); + this.lblAbsenderJA.SizeF = new System.Drawing.SizeF(183.7219F, 204.5139F); + this.lblAbsenderJA.StylePriority.UseFont = false; + this.lblAbsenderJA.Visible = false; + // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -730,11 +743,12 @@ namespace KetteReports this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.lblAbsender)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.lblAbsenderJA)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -785,12 +799,13 @@ namespace KetteReports private DevExpress.XtraReports.UI.XRLabel lblAdresse; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel xrLabel1; - private DevExpress.XtraReports.UI.XRRichText xrRichText2; + private DevExpress.XtraReports.UI.XRRichText lblAbsender; private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.XRRichText xrRichText1; private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel lblKundennr; private DevExpress.XtraReports.UI.XRLabel xrLabel8; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; + private DevExpress.XtraReports.UI.XRRichText lblAbsenderJA; } } diff --git a/ReportImp/KetteReports/ServiceInvoiceReport.cs b/ReportImp/KetteReports/ServiceInvoiceReport.cs index 4f1dd5747..8cb87e906 100644 --- a/ReportImp/KetteReports/ServiceInvoiceReport.cs +++ b/ReportImp/KetteReports/ServiceInvoiceReport.cs @@ -32,7 +32,7 @@ namespace KetteReports } //Rechnung an Sozialamt Bergisch Gladbach, Gybowitch und Herrn Schulze. Adresse Abrechnungsbetreuungsleistung für steht kein Name SetzeAdresse(pRO); - + // Die haben verschiedene Bereiche, zwei Anpassungen sind nur für Fachbereich Jugend - Erkennungsmerkmal ist "Jugendamt" if (pRO.RecipientOrganisation.ToLower().Contains("jugendamt") && pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems[0].UnitDescription != null) pRO.CustomerReferenceNumber += " " + pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems[0].UnitDescription; @@ -48,9 +48,18 @@ namespace KetteReports } String notice = String.Format("Bitte überweisen Sie den geforderten Betrag bis zum {0:dd.MM.yyyy} auf die unten aufgeführte Bankverbindung.", pRO.InvoiceDateTime.Value.AddDays(21)); - + + if (pRO.RecipientOrganisation.ToLower().Contains("jugendamt")) + { + lblAbsender.Visible = false; + lblKundennr.Visible = false; + lblAbsenderJA.Visible = true; + notice += + "\nSollten Sie dem Lastschriftverfahren zugestimmt haben, wird der Rechnungsbetrag in den nächsten Tagen von ihrem Konto eingezogen.\nUm Ihre Überweisung besser zuordnen zu können bitten wir Sie um die Angabe der Rechnungsnummer."; + } + else notice += - "\nSollten Sie dem Lastschriftverfahren zugestimmt haben, wird der Rechnungsbetrag in den nächsten Tagen von ihrem Konto eingezogen.\nUm Ihre Überweisung besser zuordnen zu können bitten wir sie um die Angabe des Leistungsmonats, der Kundennummer und der Rechnungsnummer."; + "\nSollten Sie dem Lastschriftverfahren zugestimmt haben, wird der Rechnungsbetrag in den nächsten Tagen von ihrem Konto eingezogen.\nUm Ihre Überweisung besser zuordnen zu können bitten wir Sie um die Angabe des Leistungsmonats, der Kundennummer und der Rechnungsnummer."; if (String.IsNullOrEmpty(pRO.Notice)) { diff --git a/ReportImp/KetteReports/ServiceInvoiceReport.resx b/ReportImp/KetteReports/ServiceInvoiceReport.resx index 910bdea56..df0287ebe 100644 --- a/ReportImp/KetteReports/ServiceInvoiceReport.resx +++ b/ReportImp/KetteReports/ServiceInvoiceReport.resx @@ -1502,7 +1502,10 @@ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXABzADEAXABzAGIAYQBzAGUAZABvAG4AMABcAHMAbgBlAHgAdAAxAFwAcQBsAFwAdABxAGMAXAB0AHgANAA1ADMANgBcAHQAcQByAFwAdAB4ADkAMAA3ADIAXABmADEAXABmAHMAMgA0ACAAZgBvAG8AdABlAHIAOwB9AHsAXAAqAFwAYwBzADIAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAzAFwAcwBiAGEAcwBlAGQAbwBuADIAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADQAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA2AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANQBcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAcQBsAFwAdAB4ADEAOQA4ADUAXAB0AHgANAA5ADYAMgBcAHQAeAA2ADYANgAwAFwAdAB4ADcAOAA4ADEAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAFYAbwByAHMAaQB0AHoAZQBuAGQAZQAgAGQAZQBzAFwAdABhAGIAIABWAG8AcgBzAHQAYQBuAGQAOgAgAFwAdABhAGIAIABVAFMAVAAtAEkARAA6ACAARABFACAAMQA2ADkAOAAxADMANQAxADAAXAB0AGEAYgAgAFwAdABhAGIAIABJAG4AdABlAHIAbgBlAHQAOgAgAHcAdwB3AC4AZABpAGUALQBrAGUAdAB0AGUALgBkAGUAfQBcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXAB0AHgAMQA5ADgANQBcAHQAeAA0ADkANgAyAFwAdAB4ADYANgA2ADAAXAB0AHgANwA4ADgAMQBcAHQAcQByAFwAdAB4ADkAMAA3ADIAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAEEAdQBmAHMAaQBjAGgAdABzAHIAYQB0AGUAcwA6AFwAdABhAGIAIABEAGkAcABsAC4AIABQAHMAeQBjAGgAbwBsAG8AZwBpAG4AIABDAGwAYQB1AGQAaQBhACAAUwBlAHkAZABoAG8AbABkAHQAXAB0AGEAYgAgAEkAQgBBAE4AOgAgAEQARQAzADMAIAAzADcAMAA1ACAAMAAyADkAOQAgADAAMwAzADIAIAAwADAAMAA3ACAANAA5AFwAdABhAGIAIABcAHQAYQBiACAAVABlAGwAZQBmAG8AbgA6ACAAMAAyADIAMAAyACAAMgA1ADYAMQAgAC0AIAAwAH0AXABmADIAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdAB4ADEAOQA4ADUAXAB0AHgAMwAwADYAMABcAHQAeAA0ADkANgAyAFwAdAB4ADcAOAA4ADEAXAB0AHEAcgBcAHQAeAA5ADAANwAyAHsAXABmADIAXABmAHMAMQA2AFwAYwBmADAAIABTAHkAbAB2AGkAYQAgAFcAXAB1ADIANAA2AFwAJwBmADYAYgBlAHIALQBTAGUAcgB2AGEAZQBzAFwAdABhAGIAIABEAGkAcABsAC4AIABLAGEAdQBmAGYAcgBhAHUAIABTAGkAbABrAGUAIABKAHUAbgBnAGIAbAB1AHQAaABcAHQAYQBiACAAUwBXAEkARgBUAC0AQgBJAEMAOgAgAEMATwBLAFMARABFADMAMwBcAHQAYQBiACAAVABlAGwAZQBmAGEAeAA6ACAAMAAyADIAMAAyACAAMgA1ADYAMQAgAC0AIAAyADYAMAB9AFwAZgAyAFwAZgBzADEANgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A - + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgAyADQAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAEcAZQBzAGMAaABcAHUAMgAyADgAXAAnAGUANABmAHQAcwBzAHQAZQBsAGwAZQA6AH0AXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgAyADQAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAFAAYQBmAGYAcgBhAHQAaABlAHIAIABTAHQAcgAuACAANwAwAH0AXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgAyADQAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgADUAMQA0ADYANQAgAEIAZQByAGcAaQBzAGMAaAAgAEcAbABhAGQAYgBhAGMAaAB9AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADYAMgA0AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADYAMgA0AHsAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABWAGUAcgB3AGEAbAB0AHUAbgBnACAALwAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABGAGEAYwBoAGIAZQByAGUAaQBjAGgAIABKAHUAZwB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAZQBuAGQAfQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA2ADIANAB7AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAATgBhAG0AZQA6AFwAdABhAGIAIABbAEMAcgBlAGEAdABvAHIATgBhAG0AZQBdAH0AXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgAyADQAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAFQAZQBsAGUAZgBvAG4AOgBcAHQAYQBiACAAWwBTAGUAbgBkAGUAcgBDAG8AbgB0AGEAYwB0AFAAZQByAHMAbwBuAFAAaABvAG4AZQBdAH0AXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgAyADQAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAFQAZQBsAGUAZgBhAHgAOgBcAHQAYQBiACAAWwBTAGUAbgBkAGUAcgBDAG8AbgB0AGEAYwB0AFAAZQByAHMAbwBuAEYAYQB4AF0AfQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA2ADIANAB7AFwAbABhAG4AZwAxADAANAAwAFwAbABhAG4AZwBmAGUAMQAwADQAMABcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAEUALQBNAGEAaQBsADoAXAB0AGEAYgAgAFsAUwBlAG4AZABlAHIAQwBvAG4AdABhAGMAdABQAGUAcgBzAG8AbgBNAGEAaQBsAF0AfQBcAGwAYQBuAGcAMQAwADQAMABcAGwAYQBuAGcAZgBlADEAMAA0ADAAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgAyADQAewBcAGwAYQBuAGcAMQAwADQAMABcAGwAYQBuAGcAZgBlADEAMAA0ADAAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABJAG4AdABlAHIAbgBlAHQAOgAgAHcAdwB3AC4AZABpAGUALQBrAGUAdAB0AGUALgBkAGUAfQBcAGwAYQBuAGcAMQAwADQAMABcAGwAYQBuAGcAZgBlADEAMAA0ADAAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgAyADQAXABsAGEAbgBnADEAMAA0ADAAXABsAGEAbgBnAGYAZQAxADAANAAwAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADYAMgA0AHsAXABsAGEAbgBnADEAMAA0ADAAXABsAGEAbgBnAGYAZQAxADAANAAwAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAARABhAHQAdQBtADoAIABcAHQAYQBiACAAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAFsASQBuAHYAbwBpAGMAZQBEAGEAdABlAF0AfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA== + + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgAyADQAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAEcAZQBzAGMAaABcAHUAMgAyADgAXAAnAGUANABmAHQAcwBzAHQAZQBsAGwAZQA6AH0AXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgAyADQAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAFAAYQBmAGYAcgBhAHQAaABlAHIAIABTAHQAcgAuACAANwAwAH0AXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgAyADQAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgADUAMQA0ADYANQAgAEIAZQByAGcAaQBzAGMAaAAgAEcAbABhAGQAYgBhAGMAaAB9AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADYAMgA0AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADYAMgA0AHsAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABWAGUAcgB3AGEAbAB0AHUAbgBnACAALwAgAEIAZQB0AHIAZQB1AHQAZQBzACAAVwBvAGgAbgBlAG4AIAB9AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADYAMgA0AHsAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABOAGEAbQBlADoAXAB0AGEAYgAgAFsAQwByAGUAYQB0AG8AcgBOAGEAbQBlAF0AfQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA2ADIANAB7AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAVABlAGwAZQBmAG8AbgA6AFwAdABhAGIAIABbAFMAZQBuAGQAZQByAEMAbwBuAHQAYQBjAHQAUABlAHIAcwBvAG4AUABoAG8AbgBlAF0AfQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA2ADIANAB7AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAVABlAGwAZQBmAGEAeAA6AFwAdABhAGIAIAB9AHsAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABbAFMAZQBuAGQAZQByAEMAbwBuAHQAYQBjAHQAUABlAHIAcwBvAG4ARgBhAHgAXQB9AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADYAMgA0AHsAXABsAGEAbgBnADEAMAA0ADAAXABsAGEAbgBnAGYAZQAxADAANAAwAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAARQAtAE0AYQBpAGwAOgBcAHQAYQBiACAAfQB7AFwAbABhAG4AZwAxADAANAAwAFwAbABhAG4AZwBmAGUAMQAwADQAMABcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAFsAUwBlAG4AZABlAHIAQwBvAG4AdABhAGMAdABQAGUAcgBzAG8AbgBNAGEAaQBsAF0AfQBcAGwAYQBuAGcAMQAwADQAMABcAGwAYQBuAGcAZgBlADEAMAA0ADAAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgAyADQAewBcAGwAYQBuAGcAMQAwADQAMABcAGwAYQBuAGcAZgBlADEAMAA0ADAAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABJAG4AdABlAHIAbgBlAHQAOgAgAHcAdwB3AC4AZABpAGUALQBrAGUAdAB0AGUALgBkAGUAfQBcAGwAYQBuAGcAMQAwADQAMABcAGwAYQBuAGcAZgBlADEAMAA0ADAAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgANgAyADQAXABsAGEAbgBnADEAMAA0ADAAXABsAGEAbgBnAGYAZQAxADAANAAwAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADYAMgA0AHsAXABsAGEAbgBnADEAMAA0ADAAXABsAGEAbgBnAGYAZQAxADAANAAwAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAARABhAHQAdQBtADoAIABcAHQAYQBiACAAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAFsASQBuAHYAbwBpAGMAZQBEAGEAdABlAF0AfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA== diff --git a/ReportImp/PerspektivenEV/PerspektivenEV.csproj b/ReportImp/PerspektivenEV/PerspektivenEV.csproj index 88f853c4b..fce22cfc8 100644 --- a/ReportImp/PerspektivenEV/PerspektivenEV.csproj +++ b/ReportImp/PerspektivenEV/PerspektivenEV.csproj @@ -98,6 +98,7 @@ + diff --git a/ReportImp/PerspektivenEV/Validation/DefaultSaveInterceptor.cs b/ReportImp/PerspektivenEV/Validation/DefaultSaveInterceptor.cs new file mode 100644 index 000000000..128ce6b4e --- /dev/null +++ b/ReportImp/PerspektivenEV/Validation/DefaultSaveInterceptor.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using BeWo.Data.Access; +using BeWo.Service.Plugins; +using BS.Shared; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using BS.Shared.Extensions; +using BS.Shared.Services; + +namespace PerspektivenEV.Validation +{ + + public class DefaultSaveInterceptor : SaveInterceptor + { + public override string AllowSaveCustomer(CustomerDC c) + { + if (c.CustomerOid.HasValue) + { + return null; + } + + if (c.RelatedTeams == null || c.RelatedTeams.Count == 0) + { + return "Bitte ordnen Sie ein Team zu bevor Sie speichern."; + } + + else if (c.RelatedEmployees == null || c.RelatedEmployees.Count == 0) + { + return "Bitte ordnen Sie einen Betreuer/in zu bevor Sie speichern."; + } + return base.AllowSaveCustomer(c); + } + } +} \ No newline at end of file