Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo into master

This commit is contained in:
2023-01-27 10:31:51 +01:00
4 changed files with 200 additions and 84 deletions

View File

@@ -56,10 +56,6 @@ namespace BeWo.DiakonieKKKleve
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.lblGesamtBetrag = new DevExpress.XtraReports.UI.XRLabel();
this.lblRechnungsbetragText = new DevExpress.XtraReports.UI.XRLabel();
this.lblGesamtUndFaktorStunden = new DevExpress.XtraReports.UI.XRLabel();
this.lblXMinutenEntsprechen = new DevExpress.XtraReports.UI.XRLabel();
this.fieldMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.rtAdresseGeldern = new DevExpress.XtraReports.UI.XRRichText();
@@ -67,6 +63,17 @@ namespace BeWo.DiakonieKKKleve
this.rtAdresseKleve = new DevExpress.XtraReports.UI.XRRichText();
this.rtAbsenderKleve = new DevExpress.XtraReports.UI.XRRichText();
this.rtAbsenderGeldern = new DevExpress.XtraReports.UI.XRRichText();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
this.lblLeerzeile = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow38 = new DevExpress.XtraReports.UI.XRTableRow();
this.lblEigenanteil = new DevExpress.XtraReports.UI.XRTableCell();
this.lblEigenanteilBetrag = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow39 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell66 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow40 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell67 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGesamtOhneEt = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -75,6 +82,7 @@ namespace BeWo.DiakonieKKKleve
((System.ComponentModel.ISupportInitialize)(this.rtAdresseKleve)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rtAbsenderKleve)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rtAbsenderGeldern)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
@@ -220,7 +228,7 @@ namespace BeWo.DiakonieKKKleve
//
// lblKonto
//
this.lblKonto.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.02081F);
this.lblKonto.LocationFloat = new DevExpress.Utils.PointFloat(0F, 104.2708F);
this.lblKonto.Multiline = true;
this.lblKonto.Name = "lblKonto";
this.lblKonto.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -234,7 +242,7 @@ namespace BeWo.DiakonieKKKleve
//
this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 254.4097F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 260.6597F);
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F);
@@ -278,11 +286,11 @@ namespace BeWo.DiakonieKKKleve
//
// xrTable1
//
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(195.8756F, 0F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(480.9571F, 20F);
this.xrTable1.SizeF = new System.Drawing.SizeF(582.1667F, 20F);
this.xrTable1.StylePriority.UseTextAlignment = false;
this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
@@ -296,87 +304,41 @@ namespace BeWo.DiakonieKKKleve
//
// xrTableCell2
//
this.xrTableCell2.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)));
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.StylePriority.UseBorderColor = false;
this.xrTableCell2.StylePriority.UseBorders = false;
this.xrTableCell2.Text = "[UnitCount!0.0] x [UnitDescription] a [HourlyRate!0.00] €";
this.xrTableCell2.Weight = 1.4250314870441041D;
this.xrTableCell2.Weight = 2.0203190454777773D;
//
// xrTableCell3
//
this.xrTableCell3.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseBorderColor = false;
this.xrTableCell3.StylePriority.UseBorders = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell3.Weight = 0.70624088638438542D;
this.xrTableCell3.Weight = 0.55944492237079468D;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblGesamtBetrag,
this.lblRechnungsbetragText,
this.lblGesamtUndFaktorStunden,
this.lblXMinutenEntsprechen,
this.xrTable4,
this.xrLabel14,
this.lblKonto});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 11F);
this.GroupFooter1.HeightF = 271.4097F;
this.GroupFooter1.HeightF = 291.2014F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// lblGesamtBetrag
//
this.lblGesamtBetrag.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "NetClaim")});
this.lblGesamtBetrag.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.lblGesamtBetrag.LocationFloat = new DevExpress.Utils.PointFloat(517.4576F, 45.00001F);
this.lblGesamtBetrag.Multiline = true;
this.lblGesamtBetrag.Name = "lblGesamtBetrag";
this.lblGesamtBetrag.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblGesamtBetrag.SizeF = new System.Drawing.SizeF(159.3751F, 25F);
this.lblGesamtBetrag.StylePriority.UseFont = false;
this.lblGesamtBetrag.StylePriority.UseTextAlignment = false;
this.lblGesamtBetrag.Text = "xxx Minuten";
this.lblGesamtBetrag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// lblRechnungsbetragText
//
this.lblRechnungsbetragText.LocationFloat = new DevExpress.Utils.PointFloat(195.8756F, 45.00001F);
this.lblRechnungsbetragText.Multiline = true;
this.lblRechnungsbetragText.Name = "lblRechnungsbetragText";
this.lblRechnungsbetragText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblRechnungsbetragText.SizeF = new System.Drawing.SizeF(255.4575F, 25F);
this.lblRechnungsbetragText.StylePriority.UseFont = false;
this.lblRechnungsbetragText.StylePriority.UseTextAlignment = false;
this.lblRechnungsbetragText.Text = "Rechnungsbetrag";
this.lblRechnungsbetragText.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// lblGesamtUndFaktorStunden
//
this.lblGesamtUndFaktorStunden.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountEquityContribution", "- {0}")});
this.lblGesamtUndFaktorStunden.LocationFloat = new DevExpress.Utils.PointFloat(517.4576F, 9.999974F);
this.lblGesamtUndFaktorStunden.Multiline = true;
this.lblGesamtUndFaktorStunden.Name = "lblGesamtUndFaktorStunden";
this.lblGesamtUndFaktorStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblGesamtUndFaktorStunden.SizeF = new System.Drawing.SizeF(159.3755F, 25F);
this.lblGesamtUndFaktorStunden.StylePriority.UseFont = false;
this.lblGesamtUndFaktorStunden.StylePriority.UseTextAlignment = false;
this.lblGesamtUndFaktorStunden.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
// lblXMinutenEntsprechen
//
this.lblXMinutenEntsprechen.LocationFloat = new DevExpress.Utils.PointFloat(195.8756F, 9.999974F);
this.lblXMinutenEntsprechen.Multiline = true;
this.lblXMinutenEntsprechen.Name = "lblXMinutenEntsprechen";
this.lblXMinutenEntsprechen.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblXMinutenEntsprechen.SizeF = new System.Drawing.SizeF(255.4575F, 25F);
this.lblXMinutenEntsprechen.StylePriority.UseFont = false;
this.lblXMinutenEntsprechen.StylePriority.UseTextAlignment = false;
this.lblXMinutenEntsprechen.Text = "Abzüglich Eigenanteil Patient";
this.lblXMinutenEntsprechen.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// fieldMinuten
//
this.fieldMinuten.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems";
@@ -439,6 +401,126 @@ namespace BeWo.DiakonieKKKleve
this.rtAbsenderGeldern.SerializableRtfString = resources.GetString("rtAbsenderGeldern.SerializableRtfString");
this.rtAbsenderGeldern.SizeF = new System.Drawing.SizeF(404.0417F, 13.625F);
//
// xrTable4
//
this.xrTable4.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable4.Font = new System.Drawing.Font("Arial", 11F);
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable4.Name = "xrTable4";
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow37,
this.xrTableRow38,
this.xrTableRow39,
this.xrTableRow40});
this.xrTable4.SizeF = new System.Drawing.SizeF(582.1667F, 81F);
this.xrTable4.StylePriority.UseBorderColor = false;
this.xrTable4.StylePriority.UseFont = false;
//
// xrTableRow37
//
this.xrTableRow37.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.lblLeerzeile});
this.xrTableRow37.Name = "xrTableRow37";
this.xrTableRow37.Weight = 0.085D;
//
// lblLeerzeile
//
this.lblLeerzeile.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.lblLeerzeile.Name = "lblLeerzeile";
this.lblLeerzeile.StylePriority.UseBorders = false;
this.lblLeerzeile.Weight = 1D;
//
// xrTableRow38
//
this.xrTableRow38.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.lblEigenanteil,
this.lblEigenanteilBetrag});
this.xrTableRow38.Name = "xrTableRow38";
this.xrTableRow38.Weight = 0.085D;
//
// lblEigenanteil
//
this.lblEigenanteil.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblEigenanteil.Name = "lblEigenanteil";
this.lblEigenanteil.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblEigenanteil.StylePriority.UseBorders = false;
this.lblEigenanteil.StylePriority.UsePadding = false;
this.lblEigenanteil.Text = "abzüglich Eigenanteil Patient:";
this.lblEigenanteil.Weight = 0.78314100999098568D;
//
// lblEigenanteilBetrag
//
this.lblEigenanteilBetrag.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblEigenanteilBetrag.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountEquityContribution", "- {0}")});
this.lblEigenanteilBetrag.Name = "lblEigenanteilBetrag";
this.lblEigenanteilBetrag.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblEigenanteilBetrag.StylePriority.UseBorders = false;
this.lblEigenanteilBetrag.StylePriority.UsePadding = false;
this.lblEigenanteilBetrag.StylePriority.UseTextAlignment = false;
this.lblEigenanteilBetrag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.lblEigenanteilBetrag.Weight = 0.21685899000901443D;
//
// xrTableRow39
//
this.xrTableRow39.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell66});
this.xrTableRow39.Name = "xrTableRow39";
this.xrTableRow39.Weight = 0.085D;
//
// xrTableCell66
//
this.xrTableCell66.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell66.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell66.Name = "xrTableCell66";
this.xrTableCell66.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell66.StylePriority.UseBorderColor = false;
this.xrTableCell66.StylePriority.UseBorders = false;
this.xrTableCell66.Weight = 1D;
//
// xrTableRow40
//
this.xrTableRow40.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell67,
this.cellGesamtOhneEt});
this.xrTableRow40.Name = "xrTableRow40";
this.xrTableRow40.Weight = 0.15D;
//
// xrTableCell67
//
this.xrTableCell67.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell67.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell67.Name = "xrTableCell67";
this.xrTableCell67.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell67.StylePriority.UseBorderColor = false;
this.xrTableCell67.StylePriority.UseBorders = false;
this.xrTableCell67.StylePriority.UseFont = false;
this.xrTableCell67.Text = "Rechnungsbetrag:";
this.xrTableCell67.Weight = 0.78314100999098568D;
//
// cellGesamtOhneEt
//
this.cellGesamtOhneEt.BorderColor = System.Drawing.SystemColors.ControlLight;
this.cellGesamtOhneEt.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.cellGesamtOhneEt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "NetClaim")});
this.cellGesamtOhneEt.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.cellGesamtOhneEt.Name = "cellGesamtOhneEt";
this.cellGesamtOhneEt.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.cellGesamtOhneEt.StylePriority.UseBorderColor = false;
this.cellGesamtOhneEt.StylePriority.UseBorders = false;
this.cellGesamtOhneEt.StylePriority.UseFont = false;
this.cellGesamtOhneEt.StylePriority.UseTextAlignment = false;
this.cellGesamtOhneEt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.cellGesamtOhneEt.Weight = 0.21685899000901443D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
@@ -472,6 +554,7 @@ namespace BeWo.DiakonieKKKleve
((System.ComponentModel.ISupportInitialize)(this.rtAdresseKleve)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rtAbsenderKleve)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rtAbsenderGeldern)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -500,8 +583,6 @@ namespace BeWo.DiakonieKKKleve
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.CalculatedField fieldMinuten;
private DevExpress.XtraReports.UI.XRLabel lblGesamtBetrag;
private DevExpress.XtraReports.UI.XRLabel lblRechnungsbetragText;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.XRRichText rtAdresseGeldern;
@@ -510,11 +591,20 @@ namespace BeWo.DiakonieKKKleve
private DevExpress.XtraReports.UI.XRRichText xrRichText4;
private DevExpress.XtraReports.UI.XRLine xrLine1;
private DevExpress.XtraReports.UI.XRLabel lblIkNr;
private DevExpress.XtraReports.UI.XRLabel lblGesamtUndFaktorStunden;
private DevExpress.XtraReports.UI.XRLabel lblXMinutenEntsprechen;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRRichText rtAdresseKleve;
private DevExpress.XtraReports.UI.XRRichText rtAbsenderKleve;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRTable xrTable4;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow37;
private DevExpress.XtraReports.UI.XRTableCell lblLeerzeile;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow38;
private DevExpress.XtraReports.UI.XRTableCell lblEigenanteil;
private DevExpress.XtraReports.UI.XRTableCell lblEigenanteilBetrag;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow39;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell66;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow40;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell67;
private DevExpress.XtraReports.UI.XRTableCell cellGesamtOhneEt;
}
}

View File

@@ -67,11 +67,12 @@ namespace BeWo.DiakonieKKKleve
lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
}
if (String.IsNullOrEmpty(pRO.AmountEquityContribution) || pRO.AmountEquityContribution == "0,00 €" || pRO.AmountEquityContribution == "-")
{
lblXMinutenEntsprechen.Visible = false;
lblGesamtUndFaktorStunden.Visible = false;
}
// if (String.IsNullOrEmpty(pRO.AmountEquityContribution) || pRO.AmountEquityContribution == "0,00 €" || pRO.AmountEquityContribution == "-")
// {
// lblEigenanteil.Visible = false;
// lblEigenanteilBetrag.Visible = false;
//lblLeerzeile.Visible = false;
// }
SetzeAdresseUndIk(pRO);
//decimal rateFactor = 1;

View File

@@ -115,6 +115,7 @@ namespace DiakonieMuelheim
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -228,7 +229,7 @@ namespace DiakonieMuelheim
// xrTableCell2
//
this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldKontaktArt")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
this.xrTableCell2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.StylePriority.UseFont = false;
@@ -741,6 +742,7 @@ namespace DiakonieMuelheim
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel10,
this.lblUnterschriftKlient,
this.lblUnterschriftMitarbeiter,
this.xrTableAbwesenheiten,
@@ -798,7 +800,7 @@ namespace DiakonieMuelheim
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 79.99997F);
this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 99.79166F);
this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten";
this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableAbwesenheiten.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -1009,7 +1011,7 @@ namespace DiakonieMuelheim
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblHatAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F);
this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 130F);
this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 149.7917F);
this.lblHatAbwesenheiten.Name = "lblHatAbwesenheiten";
this.lblHatAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.lblHatAbwesenheiten.SizeF = new System.Drawing.SizeF(30F, 30F);
@@ -1026,7 +1028,7 @@ namespace DiakonieMuelheim
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblHatGruppen.Font = new System.Drawing.Font("Arial", 10F);
this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 79.99997F);
this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 99.79166F);
this.lblHatGruppen.Name = "lblHatGruppen";
this.lblHatGruppen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.lblHatGruppen.SizeF = new System.Drawing.SizeF(30F, 30F);
@@ -1040,7 +1042,7 @@ namespace DiakonieMuelheim
// xrRichText2
//
this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 130F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 149.7917F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 68.05556F);
@@ -1049,7 +1051,7 @@ namespace DiakonieMuelheim
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 79.99997F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 99.79166F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F);
@@ -1058,7 +1060,7 @@ namespace DiakonieMuelheim
// xrLabel15
//
this.xrLabel15.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.99997F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 99.79166F);
this.xrLabel15.Multiline = true;
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -1074,7 +1076,7 @@ namespace DiakonieMuelheim
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99998F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60.00001F);
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(320F, 20F);
@@ -1172,6 +1174,21 @@ namespace DiakonieMuelheim
this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldKontaktArt.Name = "fieldKontaktArt";
//
// xrLabel10
//
this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99999F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(320F, 20F);
this.xrLabel10.StylePriority.UseBackColor = false;
this.xrLabel10.StylePriority.UseBorders = false;
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.StylePriority.UsePadding = false;
this.xrLabel10.StylePriority.UseTextAlignment = false;
this.xrLabel10.Text = "FK = Fehlkontakt";
this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// Quittierungsbeleg
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1291,5 +1308,6 @@ namespace DiakonieMuelheim
private DevExpress.XtraReports.UI.XRLabel lblBewilligteFLSWoche;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
}
}

View File

@@ -24,9 +24,16 @@ namespace DiakonieMuelheim
{
if (sd.IsBillable)
{
sd.Notice5 = "E";
if (sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
{
sd.Notice5 = "FK";
//sd.Minutes = sd.Minutes * 80 / 100;
}
if (sd.IsGroup)
{
//sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
sd.Notice5 = "GR";
hatGruppen = true;
}
servicesBillable.Add(sd);