SHKServiceSBD/SBDCharacteristicsReport angepasst

This commit is contained in:
2024-04-18 13:57:50 +02:00
parent a7d534365c
commit 2534d20507
3 changed files with 68 additions and 138 deletions

View File

@@ -53,7 +53,6 @@ namespace SHKServiceSBD
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.lblKlasse2 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAlter2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.tableBetreuungszeiten = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -63,9 +62,6 @@ namespace SHKServiceSBD
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.tableLetzteVertreter = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.chkUnterricht = new DevExpress.XtraReports.UI.XRCheckBox();
this.chkPause = new DevExpress.XtraReports.UI.XRCheckBox();
@@ -73,9 +69,6 @@ namespace SHKServiceSBD
this.chkBus = new DevExpress.XtraReports.UI.XRCheckBox();
this.chkKlo = new DevExpress.XtraReports.UI.XRCheckBox();
this.chkAggro = new DevExpress.XtraReports.UI.XRCheckBox();
this.GroupHeader4 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel();
this.lblKommentar = new DevExpress.XtraReports.UI.XRLabel();
this.GroupHeader5 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -99,15 +92,16 @@ namespace SHKServiceSBD
this.lblUebernahmeort = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.lblKommentar = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.tableBetreuungszeiten)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tableLetzteVertreter)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
//
this.Detail.Font = new System.Drawing.Font("Arial", 10F);
this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.Detail.HeightF = 0F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -364,18 +358,6 @@ namespace SHKServiceSBD
this.lblAlter2.StylePriority.UseFont = false;
this.lblAlter2.Text = "Alter";
//
// xrLabel11
//
this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(641.9993F, 24F);
this.xrLabel11.StylePriority.UseBorders = false;
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.Text = "Letzten 5 Vertretungen";
//
// xrLabel3
//
this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
@@ -455,46 +437,19 @@ namespace SHKServiceSBD
this.xrLabel3});
this.GroupHeader1.HeightF = 51.99999F;
this.GroupHeader1.KeepTogether = true;
this.GroupHeader1.Level = 8;
this.GroupHeader1.Level = 7;
this.GroupHeader1.Name = "GroupHeader1";
//
// GroupHeader2
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.tableLetzteVertreter,
this.xrLabel11});
this.GroupHeader2.HeightF = 41.99999F;
this.lblKommentar,
this.xrLabel29});
this.GroupHeader2.HeightF = 54.91651F;
this.GroupHeader2.KeepTogether = true;
this.GroupHeader2.Level = 9;
this.GroupHeader2.Level = 8;
this.GroupHeader2.Name = "GroupHeader2";
//
// tableLetzteVertreter
//
this.tableLetzteVertreter.LocationFloat = new DevExpress.Utils.PointFloat(0F, 23.99999F);
this.tableLetzteVertreter.Name = "tableLetzteVertreter";
this.tableLetzteVertreter.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.tableLetzteVertreter.SizeF = new System.Drawing.SizeF(642F, 18F);
this.tableLetzteVertreter.StylePriority.UseFont = false;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell8});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 1.125D;
//
// xrTableCell8
//
this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell8.StylePriority.UseBorders = false;
this.xrTableCell8.StylePriority.UseFont = false;
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.Weight = 0.99999999999999989D;
//
// GroupHeader3
//
this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -505,12 +460,12 @@ namespace SHKServiceSBD
this.chkKlo,
this.chkAggro});
this.GroupHeader3.HeightF = 80F;
this.GroupHeader3.Level = 7;
this.GroupHeader3.Level = 6;
this.GroupHeader3.Name = "GroupHeader3";
//
// chkUnterricht
//
this.chkUnterricht.GlyphAlignment = DevExpress.Utils.HorzAlignment.Far;
this.chkUnterricht.GlyphOptions.Alignment = DevExpress.Utils.HorzAlignment.Far;
this.chkUnterricht.LocationFloat = new DevExpress.Utils.PointFloat(160.71F, 40F);
this.chkUnterricht.Name = "chkUnterricht";
this.chkUnterricht.SizeF = new System.Drawing.SizeF(139.5801F, 21.875F);
@@ -519,7 +474,7 @@ namespace SHKServiceSBD
//
// chkPause
//
this.chkPause.GlyphAlignment = DevExpress.Utils.HorzAlignment.Far;
this.chkPause.GlyphOptions.Alignment = DevExpress.Utils.HorzAlignment.Far;
this.chkPause.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40F);
this.chkPause.Name = "chkPause";
this.chkPause.SizeF = new System.Drawing.SizeF(139.5801F, 21.875F);
@@ -528,7 +483,7 @@ namespace SHKServiceSBD
//
// chkPflege
//
this.chkPflege.GlyphAlignment = DevExpress.Utils.HorzAlignment.Far;
this.chkPflege.GlyphOptions.Alignment = DevExpress.Utils.HorzAlignment.Far;
this.chkPflege.LocationFloat = new DevExpress.Utils.PointFloat(487.42F, 10F);
this.chkPflege.Name = "chkPflege";
this.chkPflege.SizeF = new System.Drawing.SizeF(139.5801F, 23.99999F);
@@ -537,7 +492,7 @@ namespace SHKServiceSBD
//
// chkBus
//
this.chkBus.GlyphAlignment = DevExpress.Utils.HorzAlignment.Far;
this.chkBus.GlyphOptions.Alignment = DevExpress.Utils.HorzAlignment.Far;
this.chkBus.LocationFloat = new DevExpress.Utils.PointFloat(321.0002F, 10F);
this.chkBus.Name = "chkBus";
this.chkBus.SizeF = new System.Drawing.SizeF(139.5801F, 23.99999F);
@@ -546,7 +501,7 @@ namespace SHKServiceSBD
//
// chkKlo
//
this.chkKlo.GlyphAlignment = DevExpress.Utils.HorzAlignment.Far;
this.chkKlo.GlyphOptions.Alignment = DevExpress.Utils.HorzAlignment.Far;
this.chkKlo.LocationFloat = new DevExpress.Utils.PointFloat(160.71F, 10F);
this.chkKlo.Name = "chkKlo";
this.chkKlo.SizeF = new System.Drawing.SizeF(139.5801F, 23.99999F);
@@ -555,43 +510,13 @@ namespace SHKServiceSBD
//
// chkAggro
//
this.chkAggro.GlyphAlignment = DevExpress.Utils.HorzAlignment.Far;
this.chkAggro.GlyphOptions.Alignment = DevExpress.Utils.HorzAlignment.Far;
this.chkAggro.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10F);
this.chkAggro.Name = "chkAggro";
this.chkAggro.SizeF = new System.Drawing.SizeF(139.58F, 24F);
this.chkAggro.StylePriority.UseFont = false;
this.chkAggro.Text = "Aggressivität";
//
// GroupHeader4
//
this.GroupHeader4.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel29,
this.lblKommentar});
this.GroupHeader4.HeightF = 58F;
this.GroupHeader4.Name = "GroupHeader4";
//
// xrLabel29
//
this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10F);
this.xrLabel29.Name = "xrLabel29";
this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel29.SizeF = new System.Drawing.SizeF(227.0801F, 24F);
this.xrLabel29.StylePriority.UseFont = false;
this.xrLabel29.Text = "Kommentarfeld Kind";
//
// lblKommentar
//
this.lblKommentar.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblKommentar.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34F);
this.lblKommentar.Multiline = true;
this.lblKommentar.Name = "lblKommentar";
this.lblKommentar.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblKommentar.SizeF = new System.Drawing.SizeF(642.0001F, 24F);
this.lblKommentar.StylePriority.UseBorders = false;
this.lblKommentar.StylePriority.UseFont = false;
//
// GroupHeader5
//
this.GroupHeader5.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -599,7 +524,6 @@ namespace SHKServiceSBD
this.xrLabel28,
this.xrLabel25});
this.GroupHeader5.HeightF = 52F;
this.GroupHeader5.Level = 1;
this.GroupHeader5.Name = "GroupHeader5";
//
// xrTable1
@@ -669,7 +593,7 @@ namespace SHKServiceSBD
this.xrLabel23,
this.lblDiagnosen});
this.GroupHeader6.HeightF = 57.99999F;
this.GroupHeader6.Level = 2;
this.GroupHeader6.Level = 1;
this.GroupHeader6.Name = "GroupHeader6";
//
// xrLabel23
@@ -700,7 +624,7 @@ namespace SHKServiceSBD
this.xrLabel21,
this.lblAllgBemerkungen});
this.GroupHeader7.HeightF = 62.00003F;
this.GroupHeader7.Level = 3;
this.GroupHeader7.Level = 2;
this.GroupHeader7.Name = "GroupHeader7";
//
// xrLabel21
@@ -731,7 +655,7 @@ namespace SHKServiceSBD
this.xrLabel19,
this.lblBetreuungsbedarf});
this.GroupHeader8.HeightF = 58.00004F;
this.GroupHeader8.Level = 4;
this.GroupHeader8.Level = 3;
this.GroupHeader8.Name = "GroupHeader8";
//
// xrLabel19
@@ -762,7 +686,7 @@ namespace SHKServiceSBD
this.lblVerhalten,
this.xrLabel13});
this.GroupHeader9.HeightF = 57.99998F;
this.GroupHeader9.Level = 5;
this.GroupHeader9.Level = 4;
this.GroupHeader9.Name = "GroupHeader9";
//
// lblVerhalten
@@ -793,7 +717,7 @@ namespace SHKServiceSBD
this.lblUebernahmeort,
this.xrLabel2});
this.GroupHeader10.HeightF = 57.99998F;
this.GroupHeader10.Level = 6;
this.GroupHeader10.Level = 5;
this.GroupHeader10.Name = "GroupHeader10";
//
// lblUebernahmeort
@@ -822,6 +746,28 @@ namespace SHKServiceSBD
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.CustomerDataRO);
//
// lblKommentar
//
this.lblKommentar.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblKommentar.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30.9165F);
this.lblKommentar.Multiline = true;
this.lblKommentar.Name = "lblKommentar";
this.lblKommentar.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblKommentar.SizeF = new System.Drawing.SizeF(642.0001F, 24F);
this.lblKommentar.StylePriority.UseBorders = false;
this.lblKommentar.StylePriority.UseFont = false;
//
// xrLabel29
//
this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(0F, 6.916491F);
this.xrLabel29.Name = "xrLabel29";
this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel29.SizeF = new System.Drawing.SizeF(227.0801F, 24F);
this.xrLabel29.StylePriority.UseFont = false;
this.xrLabel29.Text = "Kommentarfeld Kind";
//
// SBDCharacteristicsReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -833,7 +779,6 @@ namespace SHKServiceSBD
this.GroupHeader1,
this.GroupHeader2,
this.GroupHeader3,
this.GroupHeader4,
this.GroupHeader5,
this.GroupHeader6,
this.GroupHeader7,
@@ -841,14 +786,14 @@ namespace SHKServiceSBD
this.GroupHeader9,
this.GroupHeader10});
this.DataSource = this.bindingSource1;
this.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Margins = new System.Drawing.Printing.Margins(76, 75, 75, 75);
this.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Margins = new DevExpress.Drawing.DXMargins(76F, 75F, 75F, 75F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.tableBetreuungszeiten)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tableLetzteVertreter)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -873,7 +818,6 @@ namespace SHKServiceSBD
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel lblKlasse2;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRTable tableBetreuungszeiten;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
@@ -883,9 +827,6 @@ namespace SHKServiceSBD
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
private DevExpress.XtraReports.UI.XRTable tableLetzteVertreter;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader3;
private DevExpress.XtraReports.UI.XRCheckBox chkUnterricht;
private DevExpress.XtraReports.UI.XRCheckBox chkPause;
@@ -893,7 +834,6 @@ namespace SHKServiceSBD
private DevExpress.XtraReports.UI.XRCheckBox chkBus;
private DevExpress.XtraReports.UI.XRCheckBox chkKlo;
private DevExpress.XtraReports.UI.XRCheckBox chkAggro;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader4;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader5;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader6;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader7;
@@ -908,8 +848,6 @@ namespace SHKServiceSBD
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel lblUebernahmeort;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel29;
private DevExpress.XtraReports.UI.XRLabel lblKommentar;
private DevExpress.XtraReports.UI.XRLabel xrLabel28;
private DevExpress.XtraReports.UI.XRLabel xrLabel25;
private DevExpress.XtraReports.UI.XRLabel xrLabel23;
@@ -926,5 +864,7 @@ namespace SHKServiceSBD
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell cellWunschKrits;
private DevExpress.XtraReports.UI.XRTableCell cellAusschlussKrits;
private DevExpress.XtraReports.UI.XRLabel lblKommentar;
private DevExpress.XtraReports.UI.XRLabel xrLabel29;
}
}

View File

@@ -188,7 +188,7 @@ namespace SHKServiceSBD
CreateArbeitszeitenTable(pRO.Customer.Arbeitszeiten);
CreateLetzteVertreterTable(pRO.Customer);
//CreateLetzteVertreterTable(pRO.Customer);
SetzeToken(pRO.Customer);
@@ -251,33 +251,26 @@ namespace SHKServiceSBD
cellAusschlussKrits.Text = ausschluss;
}
private void CreateLetzteVertreterTable(CustomerDC customer)
{
XRTableRow newRow = null;
//private void CreateLetzteVertreterTable(CustomerDC customer)
//{
// XRTableRow newRow = null;
// var os = new OperationsServiceImp();
// var last = os.GetLastVertreter(customer.CustomerOid);
// int index = 0;
var os = new OperationsServiceImp();
var last = os.GetLastVertreter(customer.CustomerOid);
int index = 0;
foreach (var item in last)
{
if (index == 0)
{
newRow = tableLetzteVertreter.Rows[0];
}
else
{
newRow = tableLetzteVertreter.InsertRowBelow(tableLetzteVertreter.Rows[tableLetzteVertreter.Rows.Count - 1]);
}
newRow.Cells[0].Text = String.Format("{0}", String.Format("{0}, {1}", item.LastName, item.FirstName));
}
}
// foreach (var item in last)
// {
// if (index == 0)
// {
// newRow = tableLetzteVertreter.Rows[0];
// }
// else
// {
// newRow = tableLetzteVertreter.InsertRowBelow(tableLetzteVertreter.Rows[tableLetzteVertreter.Rows.Count - 1]);
// }
// newRow.Cells[0].Text = String.Format("{0}", String.Format("{0}, {1}", item.LastName, item.FirstName));
// }
//}
private void CreateArbeitszeitenTable(List<ArbeitszeitDC> zeiten)
{

View File

@@ -117,7 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>