MH: VivatgGMBH bzw Talis FK Änderung

This commit is contained in:
2024-03-13 11:13:52 +01:00
parent 1d6a64163d
commit edb75ba7b1
5 changed files with 47 additions and 302 deletions

View File

@@ -75,9 +75,9 @@ namespace VivatgGmbHReports
private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid)
{
IBeWoReport<ServicesOverviewRO> report = null;
if (ro.StartDate < new DateTime(2023, 9, 1))
if (ro.StartDate < new DateTime(2023, 08, 16))
{
report = new Stundenzettel(); // gültig bis 31.08.2023
report = new Stundenzettel(); // gültig bis 15.08.2023
}
else
{

View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@@ -30,6 +30,7 @@ namespace VivatgGmbHReports
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Stundenzettel));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -49,7 +50,6 @@ namespace VivatgGmbHReports
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = 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.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
@@ -77,9 +77,6 @@ namespace VivatgGmbHReports
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
@@ -92,6 +89,7 @@ namespace VivatgGmbHReports
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldFreeFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -101,7 +99,7 @@ namespace VivatgGmbHReports
//
this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableServiceRecords1});
this.Detail.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.Detail.HeightF = 18.00003F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -212,7 +210,8 @@ namespace VivatgGmbHReports
this.xrTable3.BorderColor = System.Drawing.Color.Black;
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable3.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, 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.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -306,10 +305,6 @@ namespace VivatgGmbHReports
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell2.Weight = 0.19570700586119885D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -336,14 +331,14 @@ namespace VivatgGmbHReports
this.xrLabel22,
this.xrLabel23,
this.xrLabel11});
this.ReportHeader.Font = new System.Drawing.Font("Arial", 10F);
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.ReportHeader.HeightF = 296.6667F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 116.6667F);
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -358,7 +353,7 @@ namespace VivatgGmbHReports
this.xrLabel28.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerLastName")});
this.xrLabel28.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(296.9999F, 151.9167F);
this.xrLabel28.Name = "xrLabel28";
this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -371,7 +366,7 @@ namespace VivatgGmbHReports
this.xrLabel29.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerFirstName")});
this.xrLabel29.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel29.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(296.9999F, 169.9167F);
this.xrLabel29.Name = "xrLabel29";
this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -384,7 +379,7 @@ namespace VivatgGmbHReports
this.xrLabel25.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Month")});
this.xrLabel25.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(71.99987F, 262.5833F);
this.xrLabel25.Name = "xrLabel25";
this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -397,7 +392,7 @@ namespace VivatgGmbHReports
this.xrLabel26.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Year")});
this.xrLabel26.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(296.9999F, 262.5833F);
this.xrLabel26.Name = "xrLabel26";
this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -410,7 +405,7 @@ namespace VivatgGmbHReports
this.xrLabel34.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")});
this.xrLabel34.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel34.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(296.9999F, 223.9167F);
this.xrLabel34.Name = "xrLabel34";
this.xrLabel34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -423,7 +418,7 @@ namespace VivatgGmbHReports
this.xrLabel30.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReferenceNumber")});
this.xrLabel30.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel30.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(296.9999F, 187.9167F);
this.xrLabel30.Name = "xrLabel30";
this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -436,7 +431,7 @@ namespace VivatgGmbHReports
this.xrLabel31.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.##}")});
this.xrLabel31.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel31.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(296.9999F, 205.9167F);
this.xrLabel31.Name = "xrLabel31";
this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -447,7 +442,7 @@ namespace VivatgGmbHReports
//
// xrLabel24
//
this.xrLabel24.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(207F, 262.5833F);
this.xrLabel24.Name = "xrLabel24";
this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -457,7 +452,7 @@ namespace VivatgGmbHReports
//
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 169.9167F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -467,7 +462,7 @@ namespace VivatgGmbHReports
//
// xrLabel10
//
this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 187.9167F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -477,7 +472,7 @@ namespace VivatgGmbHReports
//
// xrLabel12
//
this.xrLabel12.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 151.9167F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -487,7 +482,7 @@ namespace VivatgGmbHReports
//
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 91.66666F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
@@ -500,7 +495,7 @@ namespace VivatgGmbHReports
//
// xrLabel22
//
this.xrLabel22.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0F, 223.9167F);
this.xrLabel22.Name = "xrLabel22";
this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -510,7 +505,7 @@ namespace VivatgGmbHReports
//
// xrLabel23
//
this.xrLabel23.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 262.5833F);
this.xrLabel23.Name = "xrLabel23";
this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -520,7 +515,7 @@ namespace VivatgGmbHReports
//
// xrLabel11
//
this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 205.9167F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -553,14 +548,14 @@ namespace VivatgGmbHReports
//
this.pbLogoTalis.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.pbLogoVivat});
this.pbLogoTalis.Font = new System.Drawing.Font("Times New Roman", 9.75F);
this.pbLogoTalis.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
this.pbLogoTalis.HeightF = 187.5417F;
this.pbLogoTalis.Name = "pbLogoTalis";
this.pbLogoTalis.StylePriority.UseFont = false;
//
// pbLogoVivat
//
this.pbLogoVivat.Image = ((System.Drawing.Image)(resources.GetObject("pbLogoVivat.Image")));
this.pbLogoVivat.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("pbLogoVivat.ImageSource"));
this.pbLogoVivat.LocationFloat = new DevExpress.Utils.PointFloat(452.0833F, 0F);
this.pbLogoVivat.Name = "pbLogoVivat";
this.pbLogoVivat.SizeF = new System.Drawing.SizeF(224.9165F, 187.5417F);
@@ -576,22 +571,19 @@ namespace VivatgGmbHReports
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel14,
this.xrLabel15,
this.lblFehlkontakt,
this.xrLabel8,
this.xrLabel2,
this.xrLabel7,
this.xrLabel6,
this.xrLabel3,
this.xrLabel4,
this.xrLabel5});
this.ReportFooter.Font = new System.Drawing.Font("Arial", 8F);
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.ReportFooter.HeightF = 166.899F;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// xrLabel14
//
this.xrLabel14.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(498.065F, 20.00008F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -606,7 +598,7 @@ namespace VivatgGmbHReports
//
// xrLabel15
//
this.xrLabel15.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(498.065F, 0F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -619,52 +611,6 @@ namespace VivatgGmbHReports
this.xrLabel15.Text = "E = ear to ear, face to face";
this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// lblFehlkontakt
//
this.lblFehlkontakt.Font = new System.Drawing.Font("Arial", 10F);
this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(498.065F, 40.00008F);
this.lblFehlkontakt.Name = "lblFehlkontakt";
this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.lblFehlkontakt.SizeF = new System.Drawing.SizeF(176.935F, 20F);
this.lblFehlkontakt.StylePriority.UseBackColor = false;
this.lblFehlkontakt.StylePriority.UseBorders = false;
this.lblFehlkontakt.StylePriority.UseFont = false;
this.lblFehlkontakt.StylePriority.UsePadding = false;
this.lblFehlkontakt.StylePriority.UseTextAlignment = false;
this.lblFehlkontakt.Text = "F = Fehlkontakt";
this.lblFehlkontakt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel8
//
this.xrLabel8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte")});
this.xrLabel8.Font = new System.Drawing.Font("Arial", 9F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(264F, 40.00008F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(136.0001F, 20F);
this.xrLabel8.StylePriority.UseBorders = false;
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "Summe Fehlkontakte:";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel2
//
this.xrLabel2.Font = new System.Drawing.Font("Arial", 9F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(100.0001F, 40.00008F);
this.xrLabel2.Multiline = true;
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(163.9998F, 20F);
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "Summe Fehlkontakte:";
this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// xrLabel7
//
this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top;
@@ -689,7 +635,7 @@ namespace VivatgGmbHReports
//
// xrLabel3
//
this.xrLabel3.Font = new System.Drawing.Font("Arial", 9F);
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(100F, 0F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
@@ -706,7 +652,7 @@ namespace VivatgGmbHReports
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel4.BorderWidth = 2F;
this.xrLabel4.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(264F, 0F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
@@ -716,7 +662,7 @@ namespace VivatgGmbHReports
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UsePadding = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
this.xrLabel4.Text = "[TotalFLMoFehlkontakte] = [TotalFLSoFehlkontakte!0.00] Std.";
this.xrLabel4.Text = "[TotalFLM] = [TotalFLS!0.00] Std.";
this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel5
@@ -774,6 +720,10 @@ namespace VivatgGmbHReports
this.fieldFreeFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldFreeFLS.Name = "fieldFreeFLS";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -797,12 +747,14 @@ namespace VivatgGmbHReports
this.formattingRuleServiceDesc,
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName});
this.Margins = new System.Drawing.Printing.Margins(75, 75, 188, 36);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 187.5417F, 36.41669F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.SnapGridSize = 9F;
this.Version = "17.1";
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -869,10 +821,7 @@ namespace VivatgGmbHReports
private DevExpress.XtraReports.UI.XRPictureBox pbLogoVivat;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRLabel lblFehlkontakt;
}
}

View File

@@ -43,10 +43,10 @@ namespace VivatgGmbHReports
{
s.Notice5 = "G";
}
if (s.ServiceDescription.ToLower().Contains("fehlkontakt") || s.ServiceCategory.ToLower().Contains("fehlkontakt"))
{
s.Notice5 = "F";
}
//if (s.ServiceDescription.ToLower().Contains("fehlkontakt") || s.ServiceCategory.ToLower().Contains("fehlkontakt"))
//{
// s.Notice5 = "F";
//}
servicesBillable.Add(s);
}
}

File diff suppressed because one or more lines are too long