TeamPfeil/QuittierungsbelegQualifikation - zusammenziehen der Bewilligungen

This commit is contained in:
2025-08-28 13:18:44 +02:00
parent e788adec34
commit dab58b6fe6
3 changed files with 48 additions and 27 deletions

View File

@@ -31,6 +31,7 @@ namespace TeamPfeil
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(QuittierungsbelegQuali));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -57,7 +58,6 @@ namespace TeamPfeil
this.xrTableCell_Service = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell_HZEmployee = 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.lblFlsTotal = new DevExpress.XtraReports.UI.XRLabel();
@@ -111,11 +111,12 @@ namespace TeamPfeil
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldMinuten12 = new DevExpress.XtraReports.UI.CalculatedField();
this.TotalFLMBillableAsHours = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -446,10 +447,6 @@ namespace TeamPfeil
this.xrTableCell_HZEmployee.Text = "HZ MA";
this.xrTableCell_HZEmployee.Weight = 0.16134063500392848D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -497,12 +494,13 @@ namespace TeamPfeil
// xrLabel7
//
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(848.767F, 176.7449F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(828.8785F, 176.7417F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(168.111F, 23.04684F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(187.9995F, 23.04684F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Qualifikationsniveau 4:";
this.xrLabel7.Visible = false;
//
// lblWeeklyFLS4
//
@@ -518,16 +516,17 @@ namespace TeamPfeil
this.lblWeeklyFLS4.StylePriority.UseFont = false;
this.lblWeeklyFLS4.StylePriority.UseTextAlignment = false;
this.lblWeeklyFLS4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.lblWeeklyFLS4.Visible = false;
//
// xrLabel5
//
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(848.7675F, 153.698F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(828.879F, 153.6948F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(168.111F, 23.04684F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(188F, 23.04691F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "Qualifikationsniveau 3:";
this.xrLabel5.Text = "Qualifikationsniveau 3 + 4:";
//
// lblWeeklyFLS3
//
@@ -547,19 +546,20 @@ namespace TeamPfeil
// xrLabel3
//
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(580.0175F, 176.7448F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(562.5148F, 177.1065F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(168.111F, 23.04684F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(187.9998F, 23.04684F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Qualifikationsniveau 2:";
this.xrLabel3.Visible = false;
//
// lblWeeklyFLS2
//
this.lblWeeklyFLS2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.lblWeeklyFLS2.BorderWidth = 1F;
this.lblWeeklyFLS2.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.lblWeeklyFLS2.LocationFloat = new DevExpress.Utils.PointFloat(748.1284F, 176.7449F);
this.lblWeeklyFLS2.LocationFloat = new DevExpress.Utils.PointFloat(750.5143F, 177.1065F);
this.lblWeeklyFLS2.Name = "lblWeeklyFLS2";
this.lblWeeklyFLS2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblWeeklyFLS2.SizeF = new System.Drawing.SizeF(71.75049F, 23.0468F);
@@ -568,23 +568,24 @@ namespace TeamPfeil
this.lblWeeklyFLS2.StylePriority.UseFont = false;
this.lblWeeklyFLS2.StylePriority.UseTextAlignment = false;
this.lblWeeklyFLS2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.lblWeeklyFLS2.Visible = false;
//
// xrLabel1
//
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(580.0172F, 153.698F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(562.5145F, 154.0597F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(168.1112F, 23.04684F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(188F, 23.04678F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "Qualifikationsniveau 1:";
this.xrLabel1.Text = "Qualifikationsniveau 1 + 2:";
//
// lblWeeklyFLS1
//
this.lblWeeklyFLS1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.lblWeeklyFLS1.BorderWidth = 1F;
this.lblWeeklyFLS1.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.lblWeeklyFLS1.LocationFloat = new DevExpress.Utils.PointFloat(748.1284F, 153.698F);
this.lblWeeklyFLS1.LocationFloat = new DevExpress.Utils.PointFloat(750.5143F, 154.0597F);
this.lblWeeklyFLS1.Name = "lblWeeklyFLS1";
this.lblWeeklyFLS1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblWeeklyFLS1.SizeF = new System.Drawing.SizeF(71.75055F, 23.04684F);
@@ -625,7 +626,7 @@ namespace TeamPfeil
this.xrLabel_Employee.LocationFloat = new DevExpress.Utils.PointFloat(237.5F, 177.1534F);
this.xrLabel_Employee.Name = "xrLabel_Employee";
this.xrLabel_Employee.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_Employee.SizeF = new System.Drawing.SizeF(325.0149F, 23.36169F);
this.xrLabel_Employee.SizeF = new System.Drawing.SizeF(309.3899F, 23.36169F);
this.xrLabel_Employee.StylePriority.UseBorders = false;
this.xrLabel_Employee.StylePriority.UseBorderWidth = false;
this.xrLabel_Employee.StylePriority.UseFont = false;
@@ -644,7 +645,7 @@ namespace TeamPfeil
// xrLabel21
//
this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Calibri", 12F);
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(580.0175F, 123.0133F);
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(562.5148F, 123.375F);
this.xrLabel21.Name = "xrLabel21";
this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel21.SizeF = new System.Drawing.SizeF(270.4408F, 23.04684F);
@@ -669,7 +670,7 @@ namespace TeamPfeil
this.xrLabel_ClientName.LocationFloat = new DevExpress.Utils.PointFloat(73.98516F, 123.0602F);
this.xrLabel_ClientName.Name = "xrLabel_ClientName";
this.xrLabel_ClientName.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_ClientName.SizeF = new System.Drawing.SizeF(488.5297F, 23.36168F);
this.xrLabel_ClientName.SizeF = new System.Drawing.SizeF(472.9047F, 23.36168F);
this.xrLabel_ClientName.StylePriority.UseBorders = false;
this.xrLabel_ClientName.StylePriority.UseBorderWidth = false;
this.xrLabel_ClientName.StylePriority.UseFont = false;
@@ -1145,6 +1146,10 @@ namespace TeamPfeil
this.TotalFLMBillableAsHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.TotalFLMBillableAsHours.Name = "TotalFLMBillableAsHours";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// QuittierungsbelegQuali
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1171,11 +1176,13 @@ namespace TeamPfeil
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

View File

@@ -136,10 +136,24 @@ namespace TeamPfeil
lblStd4Kat.Text = String.Format("{0:0.00}", qn4MinKat / 60);
lblFlsTotal.Text = string.Format("{0:0.00}", pRO.ApprovedFLSPerWeekTotal);
var std = BerechneBewilligungenProWoche(pRO);
lblWeeklyFLS1.Text = string.Format("{0:0.00}", std.Q1);
lblWeeklyFLS2.Text = string.Format("{0:0.00}", std.Q2);
lblWeeklyFLS3.Text = string.Format("{0:0.00}", std.Q3);
lblWeeklyFLS4.Text = string.Format("{0:0.00}", std.Q4);
if (pRO.StartDate < new DateTime(2025,08,01))
{
lblWeeklyFLS1.Text = string.Format("{0:0.00}", std.Q1);
lblWeeklyFLS2.Text = string.Format("{0:0.00}", std.Q2);
lblWeeklyFLS3.Text = string.Format("{0:0.00}", std.Q3);
lblWeeklyFLS4.Text = string.Format("{0:0.00}", std.Q4);
lblWeeklyFLS2.Visible = true;
lblWeeklyFLS4.Visible = true;
xrLabel3.Visible = true;
xrLabel7.Visible = true;
xrLabel1.Text = xrLabel1.Text.Substring(0, 22) + ":";
xrLabel5.Text = xrLabel5.Text.Substring(0, 22) + ":";
}
else
{
lblWeeklyFLS1.Text = string.Format("{0:0.00}", std.Q1 + std.Q2);
lblWeeklyFLS3.Text = string.Format("{0:0.00}", std.Q3 + std.Q4);
}
pRO.MainAttendant = SetMainAttendantsQuali(pRO.CustomerOid, pRO);

File diff suppressed because one or more lines are too long