ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GrundsteinEV: Spalten vergrößert auf QB, leere FK-Summe auf Leer-Reports

Browse Source
This commit is contained in:
Kojo
2023-05-31 15:49:10 +02:00
parent 01a92448b0
commit ed69988a46
4 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ReportImp/GrundsteinEV/Quittierungsbeleg.Designer.cs generated
View File

@@ -79,8 +79,8 @@ namespace GrundsteinEV
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.totalFLMFKString = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -156,7 +156,7 @@ namespace GrundsteinEV
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.Text = "xrTableCell13";
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell13.Weight = 0.057510067695487624D;
this.xrTableCell13.Weight = 0.075565867933025208D;
//
// xrTableCell14
//
@@ -170,7 +170,7 @@ namespace GrundsteinEV
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "xrTableCell14";
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell14.Weight = 0.075158467785317679D;
this.xrTableCell14.Weight = 0.12724251671347014D;
//
// xrTableCell10
//
@@ -184,7 +184,7 @@ namespace GrundsteinEV
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "xrTableCell10";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell10.Weight = 0.053246959651236006D;
this.xrTableCell10.Weight = 0.036354057878009091D;
//
// xrTableCell2
//
@@ -196,7 +196,7 @@ namespace GrundsteinEV
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell2.Weight = 0.061597183401748037D;
this.xrTableCell2.Weight = 0.061597178315415127D;
//
// xrTableCell5
//
@@ -208,7 +208,7 @@ namespace GrundsteinEV
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "xrTableCell5";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell5.Weight = 0.061597183401748037D;
this.xrTableCell5.Weight = 0.06159718340174803D;
//
// xrTableCell12
//
@@ -221,7 +221,7 @@ namespace GrundsteinEV
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell12.Weight = 0.41690011288376561D;
this.xrTableCell12.Weight = 0.36365317057763535D;
//
// GroupHeader1
//
@@ -275,7 +275,7 @@ namespace GrundsteinEV
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "Datum";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell3.Weight = 0.16263184109199072D;
this.xrTableCell3.Weight = 0.21369159836338555D;
//
// xrTableCell4
//
@@ -292,7 +292,7 @@ namespace GrundsteinEV
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Uhrzeit";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell4.Weight = 0.21253946942858062D;
this.xrTableCell4.Weight = 0.35982714669983923D;
//
// xrTableCell11
//
@@ -308,7 +308,7 @@ namespace GrundsteinEV
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "Art";
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell11.Weight = 0.15057626816867969D;
this.xrTableCell11.Weight = 0.10280508290728305D;
//
// xrTableCell9
//
@@ -355,7 +355,7 @@ namespace GrundsteinEV
this.xrTableCell28.StylePriority.UseTextAlignment = false;
this.xrTableCell28.Text = "Inhalt der Betreuung (Stichworte)";
this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell28.Weight = 1.1789457176312843D;
this.xrTableCell28.Weight = 1.0283694683500275D;
//
// formattingRuleStartDate
//
@@ -669,7 +669,7 @@ namespace GrundsteinEV
this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMUnqualifiedString")});
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(371.2639F, 0F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(451.1332F, 0F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(92.3945F, 42.79F);
@@ -686,7 +686,7 @@ namespace GrundsteinEV
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(199F, 0.003496806F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(278.8694F, 0F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(79.86934F, 42.78648F);
@@ -749,7 +749,7 @@ namespace GrundsteinEV
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMQualifiedString")});
this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(278.8694F, 0F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(358.7387F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(92.3945F, 42.79F);
@@ -789,15 +789,15 @@ namespace GrundsteinEV
this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldKontaktArt.Name = "fieldKontaktArt";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// totalFLMFKString
//
this.totalFLMFKString.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.totalFLMFKString.Name = "totalFLMFKString";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// Quittierungsbeleg
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

13
ReportImp/GrundsteinEV/Quittierungsbeleg.cs
View File

@@ -21,12 +21,14 @@ namespace GrundsteinEV
{
pRO.TotalFLMQualifiedString = "";
pRO.TotalFLMQualified = 0;
pRO.TotalFLMUnqualifiedString = "";
pRO.TotalFLMUnqualified = 0;
bool hatGruppen = false;
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
foreach (var sd in pRO.Services)
{
if (sd.IsBillable || (sd.ServiceDescription != null && sd.ServiceDescription.ToLower().Contains("fehlkontakt")))
@@ -43,6 +45,7 @@ namespace GrundsteinEV
else if (sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
{
sd.FLSUnqualifiedString = String.Format("{0:0.##}", sd.Minutes); ;
pRO.TotalFLMUnqualified += sd.Minutes;
sd.FLSQualifiedString = "0";
sd.ServiceCategoryAbbr = "FK";
}
@@ -67,12 +70,12 @@ namespace GrundsteinEV
else
pRO.TotalFLMQualifiedString = "";
if (pRO.TotalFLMFehlkontakte != 0)
pRO.TotalFLMUnqualifiedString = String.Format("{0:0.##}", pRO.TotalFLMFehlkontakte);
if (pRO.TotalFLMUnqualified != 0)
pRO.TotalFLMUnqualifiedString = String.Format("{0:0.##}", pRO.TotalFLMUnqualified);
else
pRO.TotalFLMUnqualifiedString = "0";
if (pRO.TotalFLMFehlkontakte == 0 && pRO.TotalFLMQualified == 0)
if (pRO.TotalFLMUnqualified == 0 && pRO.TotalFLMQualified == 0)
pRO.TotalFLMUnqualifiedString = "";
pRO.Services = servicesBillable;

32
ReportImp/GrundsteinEV/QuittierungsbelegMitHandzeichen.Designer.cs generated
View File

@@ -157,7 +157,7 @@ namespace GrundsteinEV
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.Text = "xrTableCell13";
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell13.Weight = 0.057510067226537738D;
this.xrTableCell13.Weight = 0.083899328944585988D;
//
// xrTableCell14
//
@@ -171,7 +171,7 @@ namespace GrundsteinEV
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "xrTableCell14";
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell14.Weight = 0.07307510522674214D;
this.xrTableCell14.Weight = 0.12168687368121559D;
//
// xrTableCell10
//
@@ -185,7 +185,7 @@ namespace GrundsteinEV
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "xrTableCell10";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell10.Weight = 0.051858044762827162D;
this.xrTableCell10.Weight = 0.02871507441222633D;
//
// xrTableCell2
//
@@ -197,7 +197,7 @@ namespace GrundsteinEV
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell2.Weight = 0.058124926955163227D;
this.xrTableCell2.Weight = 0.058124906609828934D;
//
// xrTableCell7
//
@@ -209,7 +209,7 @@ namespace GrundsteinEV
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "xrTableCell7";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell7.Weight = 0.058000805156962841D;
this.xrTableCell7.Weight = 0.058226821475646305D;
//
// xrTableCell12
//
@@ -222,7 +222,7 @@ namespace GrundsteinEV
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell12.Weight = 0.31272430668379075D;
this.xrTableCell12.Weight = 0.26064025088852072D;
//
// xrTableCell5
//
@@ -299,7 +299,7 @@ namespace GrundsteinEV
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "Datum";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell3.Weight = 0.16263185398445015D;
this.xrTableCell3.Weight = 0.23725762959562632D;
//
// xrTableCell4
//
@@ -316,7 +316,7 @@ namespace GrundsteinEV
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Uhrzeit";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell4.Weight = 0.2066479744096181D;
this.xrTableCell4.Weight = 0.34411646603654056D;
//
// xrTableCell11
//
@@ -332,7 +332,7 @@ namespace GrundsteinEV
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "Art";
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell11.Weight = 0.14664859128414623D;
this.xrTableCell11.Weight = 0.081202939045331213D;
//
// xrTableCell9
//
@@ -349,7 +349,7 @@ namespace GrundsteinEV
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "Anzahl Minuten direkter Kontakt";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell9.Weight = 0.16437060674143267D;
this.xrTableCell9.Weight = 0.16437054920717273D;
//
// xrTableCell6
//
@@ -365,7 +365,7 @@ namespace GrundsteinEV
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.Text = "Anzahl Minuten Fehlkontakt";
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell6.Weight = 0.16401959022126994D;
this.xrTableCell6.Weight = 0.16465850817839292D;
//
// xrTableCell28
//
@@ -379,7 +379,7 @@ namespace GrundsteinEV
this.xrTableCell28.StylePriority.UseTextAlignment = false;
this.xrTableCell28.Text = "Inhalt der Betreuung (Stichworte)";
this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell28.Weight = 0.88434840942871029D;
this.xrTableCell28.Weight = 0.7370609340065637D;
//
// xrTableCell1
//
@@ -704,10 +704,10 @@ namespace GrundsteinEV
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMUnqualifiedString")});
this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(360.8472F, 0F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(438.6332F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(87F, 42.79F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(87.33902F, 42.79F);
this.xrLabel1.StylePriority.UseBackColor = false;
this.xrLabel1.StylePriority.UseBorders = false;
this.xrLabel1.StylePriority.UseBorderWidth = false;
@@ -721,7 +721,7 @@ namespace GrundsteinEV
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(195.875F, 0F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(273.661F, 0F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(77.786F, 42.78648F);
@@ -774,7 +774,7 @@ namespace GrundsteinEV
this.lblSumme.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMQualifiedString")});
this.lblSumme.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.lblSumme.LocationFloat = new DevExpress.Utils.PointFloat(273.661F, 0F);
this.lblSumme.LocationFloat = new DevExpress.Utils.PointFloat(351.4471F, 0F);
this.lblSumme.Name = "lblSumme";
this.lblSumme.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.lblSumme.SizeF = new System.Drawing.SizeF(87.18619F, 42.79F);

10
ReportImp/GrundsteinEV/QuittierungsbelegMitHandzeichen.cs
View File

@@ -21,7 +21,10 @@ namespace GrundsteinEV
{
pRO.TotalFLMQualifiedString = "";
pRO.TotalFLMQualified = 0;
pRO.TotalFLMUnqualifiedString = "";
pRO.TotalFLMUnqualified = 0;
bool hatGruppen = false;
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
@@ -43,6 +46,7 @@ namespace GrundsteinEV
else if (sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
{
sd.FLSUnqualifiedString = String.Format("{0:0.##}", sd.Minutes); ;
pRO.TotalFLMUnqualified += sd.Minutes;
sd.FLSQualifiedString = "0";
sd.ServiceCategoryAbbr = "FK";
}
@@ -67,12 +71,12 @@ namespace GrundsteinEV
else
pRO.TotalFLMQualifiedString = "";
if (pRO.TotalFLMFehlkontakte != 0)
pRO.TotalFLMUnqualifiedString = String.Format("{0:0.##}", pRO.TotalFLMFehlkontakte);
if (pRO.TotalFLMUnqualified != 0)
pRO.TotalFLMUnqualifiedString = String.Format("{0:0.##}", pRO.TotalFLMUnqualified);
else
pRO.TotalFLMUnqualifiedString = "0";
if (pRO.TotalFLMFehlkontakte == 0 && pRO.TotalFLMQualified == 0)
if (pRO.TotalFLMUnqualified == 0 && pRO.TotalFLMQualified == 0)
pRO.TotalFLMUnqualifiedString = "";
pRO.Services = servicesBillable;