NotizenRO um Klient ergänzt und LHBadKreuznach Anpassung Druck

This commit is contained in:
2024-02-02 10:59:30 +01:00
parent 85019353f1
commit 30dc8e7785
3 changed files with 90 additions and 81 deletions

View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
@@ -14,6 +14,9 @@ namespace BeWo.Report.ReportObjects
public List<NotizenEintragDC> Eintraege { get; set; }
public DateTime Start { get; set; }
public DateTime End { get; set; }
public String FirstName { get; set; }
public String LastName { get; set; }
public static NotizenRO Create(DateTime start, DateTime end, NotizenKategorieDC notizenKategorie)
{
@@ -21,15 +24,25 @@ namespace BeWo.Report.ReportObjects
ro.Start = start;
ro.End = end;
Person p = null;
if (notizenKategorie.ObjectTid == TableID.Customer)
{
p = DAOFactory.GenericDAO.LoadByID<Customer>(notizenKategorie.ObjectOid.Value).Person;
}
else if (notizenKategorie.ObjectTid == TableID.Employee)
{
p = DAOFactory.GenericDAO.LoadByID<Employee>(notizenKategorie.ObjectOid.Value).Person;
}
if (p != null)
{
ro.FirstName = p.FirstName;
ro.LastName = p.LastName;
}
ro.Eintraege = notizenKategorie.NotizenEintraege
.Where(w => w.Datum != null && w.Datum.Value >= start && w.Datum.Value <= end)
.OrderBy(o => o.Datum).ToList();
return ro;
}
}
}
}

View File

@@ -31,22 +31,22 @@
this.components = new System.ComponentModel.Container();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.TopMargin = new DevExpress.XtraReports.UI.TopMarginBand();
this.lblName = new DevExpress.XtraReports.UI.XRLabel();
this.lblHeader = new DevExpress.XtraReports.UI.XRLabel();
this.BottomMargin = new DevExpress.XtraReports.UI.BottomMarginBand();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.Einzahlungstextsichtbarkeitsformatierungsregel = new DevExpress.XtraReports.UI.FormattingRule();
this.Auszahlungstextsichtbarkeitsformatierungsregel = new DevExpress.XtraReports.UI.FormattingRule();
this.lblName = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.Einzahlungstextsichtbarkeitsformatierungsregel = new DevExpress.XtraReports.UI.FormattingRule();
this.Auszahlungstextsichtbarkeitsformatierungsregel = new DevExpress.XtraReports.UI.FormattingRule();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -68,6 +68,16 @@
this.TopMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.TopMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// lblName
//
this.lblName.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblName.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33.37501F);
this.lblName.Name = "lblName";
this.lblName.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblName.SizeF = new System.Drawing.SizeF(617.0001F, 23.375F);
this.lblName.StylePriority.UseFont = false;
this.lblName.Text = "[FirstName] [LastName]";
//
// lblHeader
//
this.lblHeader.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -105,19 +115,17 @@
this.Detail1.HeightF = 22.29163F;
this.Detail1.Name = "Detail1";
//
// xrLabel7
// xrLabel6
//
this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Eintraege.EintragKategorieDC.DisplayName")});
this.xrLabel7.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(378.375F, 33.74996F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.StylePriority.UseTextAlignment = false;
this.xrLabel7.Text = "Kategorie:";
this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Eintraege.InsTs", "{0:HH:mm}")});
this.xrLabel6.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(85.93763F, 0F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(85.93763F, 22.29163F);
this.xrLabel6.StylePriority.UseFont = false;
//
// xrLabel1
//
@@ -144,30 +152,6 @@
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Notizen";
//
// Einzahlungstextsichtbarkeitsformatierungsregel
//
this.Einzahlungstextsichtbarkeitsformatierungsregel.Condition = "[Einzahlung] == 0";
this.Einzahlungstextsichtbarkeitsformatierungsregel.DataMember = "Transaktionen";
this.Einzahlungstextsichtbarkeitsformatierungsregel.Formatting.ForeColor = System.Drawing.Color.Transparent;
this.Einzahlungstextsichtbarkeitsformatierungsregel.Name = "Einzahlungstextsichtbarkeitsformatierungsregel";
//
// Auszahlungstextsichtbarkeitsformatierungsregel
//
this.Auszahlungstextsichtbarkeitsformatierungsregel.Condition = "[Auszahlung] == 0";
this.Auszahlungstextsichtbarkeitsformatierungsregel.DataMember = "Transaktionen";
this.Auszahlungstextsichtbarkeitsformatierungsregel.Formatting.ForeColor = System.Drawing.Color.Transparent;
this.Auszahlungstextsichtbarkeitsformatierungsregel.Name = "Auszahlungstextsichtbarkeitsformatierungsregel";
//
// lblName
//
this.lblName.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblName.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33.37501F);
this.lblName.Name = "lblName";
this.lblName.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblName.SizeF = new System.Drawing.SizeF(617.0001F, 23.375F);
this.lblName.StylePriority.UseFont = false;
this.lblName.Text = "[CustomerName]";
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -177,15 +161,15 @@
this.GroupHeader1.HeightF = 21.24996F;
this.GroupHeader1.Name = "GroupHeader1";
//
// GroupHeader2
// xrLabel10
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel7});
this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
new DevExpress.XtraReports.UI.GroupField("EintragKategorieDC.DisplayName", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
this.GroupHeader2.HeightF = 37.91663F;
this.GroupHeader2.Level = 1;
this.GroupHeader2.Name = "GroupHeader2";
this.xrLabel10.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(171.8752F, 0F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(455.1248F, 21.24996F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Wert";
//
// xrLabel2
//
@@ -207,27 +191,43 @@
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "Uhrzeit";
//
// xrLabel6
// GroupHeader2
//
this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Eintraege.InsTs", "{0:HH:mm}")});
this.xrLabel6.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(85.93763F, 0F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(85.93763F, 22.29163F);
this.xrLabel6.StylePriority.UseFont = false;
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel7});
this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
new DevExpress.XtraReports.UI.GroupField("EintragKategorieDC.DisplayName", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
this.GroupHeader2.HeightF = 37.91663F;
this.GroupHeader2.Level = 1;
this.GroupHeader2.Name = "GroupHeader2";
//
// xrLabel10
// xrLabel7
//
this.xrLabel10.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(171.8752F, 0F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(455.1248F, 21.24996F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Wert";
this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Eintraege.EintragKategorieDC.DisplayName")});
this.xrLabel7.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(378.375F, 33.74996F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.StylePriority.UseTextAlignment = false;
this.xrLabel7.Text = "Kategorie:";
this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// Einzahlungstextsichtbarkeitsformatierungsregel
//
this.Einzahlungstextsichtbarkeitsformatierungsregel.Condition = "[Einzahlung] == 0";
this.Einzahlungstextsichtbarkeitsformatierungsregel.DataMember = "Transaktionen";
this.Einzahlungstextsichtbarkeitsformatierungsregel.Formatting.ForeColor = System.Drawing.Color.Transparent;
this.Einzahlungstextsichtbarkeitsformatierungsregel.Name = "Einzahlungstextsichtbarkeitsformatierungsregel";
//
// Auszahlungstextsichtbarkeitsformatierungsregel
//
this.Auszahlungstextsichtbarkeitsformatierungsregel.Condition = "[Auszahlung] == 0";
this.Auszahlungstextsichtbarkeitsformatierungsregel.DataMember = "Transaktionen";
this.Auszahlungstextsichtbarkeitsformatierungsregel.Formatting.ForeColor = System.Drawing.Color.Transparent;
this.Auszahlungstextsichtbarkeitsformatierungsregel.Name = "Auszahlungstextsichtbarkeitsformatierungsregel";
//
// bindingSource1
//

View File

@@ -1,4 +1,5 @@
using System.Linq;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
@@ -13,12 +14,7 @@ namespace LebenshilfeBadKreuznachWohnstaette
public void SetReportDataSource(NotizenRO pRO)
{
//if (pRO.Eintraege.Count > 0)
// {
// pRO.Eintraege[0].NotizenEintragOid;
// }
bindingSource1.DataSource = pRO;
bindingSource1.DataSource = pRO;
}
}
}