diff --git a/ReportImp/TeamPfeil/QuittierungsbelegNeuesModell.Designer.cs b/ReportImp/TeamPfeil/QuittierungsbelegNeuesModell.Designer.cs index 8a8f602a6..69f3b83f2 100644 --- a/ReportImp/TeamPfeil/QuittierungsbelegNeuesModell.Designer.cs +++ b/ReportImp/TeamPfeil/QuittierungsbelegNeuesModell.Designer.cs @@ -401,7 +401,7 @@ namespace TeamPfeil this.xrTableCell7.StylePriority.UseBorders = false; this.xrTableCell7.StylePriority.UseFont = false; this.xrTableCell7.StylePriority.UsePadding = false; - this.xrTableCell7.Text = "QU/UA"; + this.xrTableCell7.Text = "QA/UA"; this.xrTableCell7.Weight = 0.1078224665239213D; // // xrTableCell_Service @@ -723,6 +723,7 @@ namespace TeamPfeil this.xrTableCell11.StylePriority.UsePadding = false; this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell11.TextFormatString = "{0:0.00}"; this.xrTableCell11.Weight = 0.0493769270812963D; // // xrLabel4 @@ -1030,6 +1031,7 @@ namespace TeamPfeil this.xrTableCell5.StylePriority.UsePadding = false; this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell5.TextFormatString = "{0:0.00}"; this.xrTableCell5.Weight = 0.049376877514299457D; // // lblUnterschriftKlient diff --git a/ReportImp/TeamPfeil/QuittierungsbelegNeuesModell.cs b/ReportImp/TeamPfeil/QuittierungsbelegNeuesModell.cs index 1aa8de869..24a0fd9b4 100644 --- a/ReportImp/TeamPfeil/QuittierungsbelegNeuesModell.cs +++ b/ReportImp/TeamPfeil/QuittierungsbelegNeuesModell.cs @@ -89,18 +89,22 @@ namespace TeamPfeil if (quali == "1") { + sd.ServiceCategoryAbbr = "QA"; qa1Min += sd.Minutes; } if (quali == "2") { + sd.ServiceCategoryAbbr = "QA"; qa2Min += sd.Minutes; } if (quali == "3") { + sd.ServiceCategoryAbbr = "UA"; ua3Min += sd.Minutes; } if (quali == "4") { + sd.ServiceCategoryAbbr = "UA"; ua4Min += sd.Minutes; } } diff --git a/ReportImp/TeamPfeil/QuittierungsbelegQualifikation.cs b/ReportImp/TeamPfeil/QuittierungsbelegQualifikation.cs index 0cc187483..8e52fc31e 100644 --- a/ReportImp/TeamPfeil/QuittierungsbelegQualifikation.cs +++ b/ReportImp/TeamPfeil/QuittierungsbelegQualifikation.cs @@ -60,19 +60,19 @@ namespace TeamPfeil { if (valueEntry.Entry.Type == ValueListEntryType.StaffQualificationsType) { - if (valueEntry.Entry.Value.StartsWith("Q 1")) + if (valueEntry.Entry.Value.StartsWith("Q 1") || valueEntry.Entry.Value.StartsWith("QA 1")) { empQuali[sd.EmployeeOid] = "1"; } - else if (valueEntry.Entry.Value.StartsWith("Q 2")) + else if (valueEntry.Entry.Value.StartsWith("Q 2") || valueEntry.Entry.Value.StartsWith("QA 2")) { empQuali[sd.EmployeeOid] = "2"; } - else if (valueEntry.Entry.Value.StartsWith("Q 3")) + else if (valueEntry.Entry.Value.StartsWith("Q 3") || valueEntry.Entry.Value.StartsWith("UA 3")) { empQuali[sd.EmployeeOid] = "3"; } - else if (valueEntry.Entry.Value.StartsWith("Q 4")) + else if (valueEntry.Entry.Value.StartsWith("Q 4") || valueEntry.Entry.Value.StartsWith("UA 4")) { empQuali[sd.EmployeeOid] = "4"; } @@ -102,7 +102,7 @@ namespace TeamPfeil } //Qualifikationsunterscheidung nach Leistungskategorie - sd.FLSUnqualifiedString = sd.ServiceCategoryAbbr.Substring(1, 1); + sd.FLSUnqualifiedString = sd.ServiceCategoryAbbr.Substring(3, 1); if (sd.FLSUnqualifiedString == "1") { qn1MinKat += sd.Minutes; @@ -185,19 +185,19 @@ namespace TeamPfeil { if (ve.Entry.Type == ValueListEntryType.StaffQualificationsType) { - if (ve.Entry.Value.StartsWith("Q 1")) + if (ve.Entry.Value.StartsWith("Q 1") || ve.Entry.Value.StartsWith("QA 1")) { MainAttendant += " (QN 1)"; } - else if (ve.Entry.Value.StartsWith("Q 2")) + else if (ve.Entry.Value.StartsWith("Q 2") || ve.Entry.Value.StartsWith("QA 2")) { MainAttendant += " (QN 2)"; } - else if (ve.Entry.Value.StartsWith("Q 3")) + else if (ve.Entry.Value.StartsWith("Q 3") || ve.Entry.Value.StartsWith("UA 3")) { MainAttendant += " (QN 3)"; } - else if (ve.Entry.Value.StartsWith("Q 4")) + else if (ve.Entry.Value.StartsWith("Q 4") || ve.Entry.Value.StartsWith("UA 4")) { MainAttendant += " (QN 4)"; }