WegweiserBetreuungsdienst: Compilefehler behoben, etwas Platz über den Bemerkungen eingebaut

This commit is contained in:
2023-03-24 13:04:13 +01:00
parent 34d88064ae
commit ceea333621
5 changed files with 2247 additions and 2255 deletions

View File

@@ -89,17 +89,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt
this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -115,11 +104,22 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -792,107 +792,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// xrLabel14
//
this.xrLabel14.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 169.8333F);
this.xrLabel14.Multiline = true;
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(357.2917F, 46.04167F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.Text = "Soziotherapeut (Mitglied im Berufsverband der Soziotherapeuten e.V.)\r\nDipl. Sozia" +
"larbeiter (FH)\r\nGesundheitswissenschaftler (Uni)";
//
// xrLabel7
//
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 152.8333F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(225F, 17F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "D. Schürmann; MPH";
//
// xrLabel10
//
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.25001F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Mit freundlichen Grüßen";
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 30F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichText1,
this.xrRichText2,
this.xrPictureBox3,
this.xrLine2});
this.bottomMarginBand1.Font = new System.Drawing.Font("Arial", 8F);
this.bottomMarginBand1.HeightF = 182F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
this.bottomMarginBand1.StylePriority.UseFont = false;
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Verdana", 10F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(270.8334F, 116.375F);
//
// xrRichText2
//
this.xrRichText2.Font = new System.Drawing.Font("Verdana", 10F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(425.9997F, 9.999974F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(270.8333F, 165.75F);
//
// xrPictureBox3
//
this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image")));
this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(10.00001F, 126.375F);
this.xrPictureBox3.Name = "xrPictureBox3";
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(93.75F, 55.62495F);
this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
//
// xrLine2
//
this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLine2.Name = "xrLine2";
this.xrLine2.SizeF = new System.Drawing.SizeF(696.9998F, 7.208333F);
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1,
this.xrLabel_RecipientContactPerson,
this.xrLabel_RecipientDivision,
this.xrLabel_RecipientStreet,
this.RecipientPostCodeAndTown,
this.xrLabel2,
this.xrLabel3,
this.xrLabel4,
this.xrLabel5,
this.xrLabel6,
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F);
this.GroupHeader1.HeightF = 532.9999F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// xrTable3
//
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
@@ -1013,6 +912,107 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt
this.xrTableCell31.Text = "xrTableCell8";
this.xrTableCell31.Weight = 3D;
//
// xrLabel14
//
this.xrLabel14.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 169.8333F);
this.xrLabel14.Multiline = true;
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(357.2917F, 46.04167F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.Text = "Soziotherapeut (Mitglied im Berufsverband der Soziotherapeuten e.V.)\r\nDipl. Sozia" +
"larbeiter (FH)\r\nGesundheitswissenschaftler (Uni)";
//
// xrLabel7
//
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 152.8333F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(225F, 17F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "D. Schürmann; MPH";
//
// xrLabel10
//
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.25001F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Mit freundlichen Grüßen";
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 30F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichText1,
this.xrRichText2,
this.xrPictureBox3,
this.xrLine2});
this.bottomMarginBand1.Font = new System.Drawing.Font("Arial", 8F);
this.bottomMarginBand1.HeightF = 182F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
this.bottomMarginBand1.StylePriority.UseFont = false;
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Verdana", 10F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(270.8334F, 116.375F);
//
// xrRichText2
//
this.xrRichText2.Font = new System.Drawing.Font("Verdana", 10F);
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(425.9997F, 9.999974F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(270.8333F, 165.75F);
//
// xrPictureBox3
//
this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image")));
this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(10.00001F, 126.375F);
this.xrPictureBox3.Name = "xrPictureBox3";
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(93.75F, 55.62495F);
this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
//
// xrLine2
//
this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLine2.Name = "xrLine2";
this.xrLine2.SizeF = new System.Drawing.SizeF(696.9998F, 7.208333F);
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1,
this.xrLabel_RecipientContactPerson,
this.xrLabel_RecipientDivision,
this.xrLabel_RecipientStreet,
this.RecipientPostCodeAndTown,
this.xrLabel2,
this.xrLabel3,
this.xrLabel4,
this.xrLabel5,
this.xrLabel6,
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F);
this.GroupHeader1.HeightF = 545F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1032,10 +1032,10 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

View File

@@ -18,10 +18,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt
{
pRO.RecipientPostCodeAndTown = pRO.RecipientPostCodeAndTown.Replace(" ", " ");
}
if (String.IsNullOrEmpty(pRO.Notice))
{
lblNotice.Visible = false;
}
//xrLabel3.Text = "Abrechnung Betreuungsleistungen / Bewilligungsbescheid vom [ApprovalNoticeDateString]";

File diff suppressed because it is too large Load Diff

View File

@@ -20,10 +20,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports
{
pRO.RecipientPostCodeAndTown = pRO.RecipientPostCodeAndTown.Replace(" ", " ");
}
if (String.IsNullOrEmpty(pRO.Notice))
{
lblNotice.Visible = false;
}
decimal rateFactor = 1;
foreach (var ii in pRO.InvoiceItems)

File diff suppressed because one or more lines are too long