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

cb

Browse Source
This commit is contained in:
Christian
2021-12-09 15:51:43 +01:00
parent eeecc08c01
commit 418f40606f
11 changed files with 346 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
BeWo/View/Detail/Report/QueryView.xaml.cs
View File

@@ -503,6 +503,23 @@ namespace BeWo.View.Detail.Report
parameterUIElements.Add(item.Name + "_" + item.ParamType + "_1", customCombo);
break;
case QueryParameterType.Text:
var textEdit = new TextEdit
{
Margin = new Thickness(3),
Background = Brushes.White,
Foreground = Brushes.Black,
BorderThickness = new Thickness(1),
BorderBrush = Application.Current.FindResource("TextBoxBorderBrush") as Brush,
Width = 250
};
//dtp.TodayContent = "Heute";
sp.Children.Add(textEdit);
parameterUIElements.Add(item.Name + "_" + item.ParamType + "_1", textEdit);
break;
}
if (addPanel)
@@ -675,6 +692,13 @@ namespace BeWo.View.Detail.Report
param.Value = customerValue;
}
break;
case QueryParameterType.Text:
if (parameterUIElements.ContainsKey(item.Name + "_" + item.ParamType + "_1"))
{
var tb = parameterUIElements[item.Name + "_" + item.ParamType + "_1"] as TextEdit;
param.Value = tb.Text;
}
break;
}
}

350
ReportImp/BeWoRimbach/ServiceInvoiceReport.Designer.cs generated
View File

@@ -32,10 +32,21 @@ namespace BeWoRimbach
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
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.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
@@ -58,32 +69,21 @@ namespace BeWoRimbach
this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblNotice = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -103,6 +103,27 @@ namespace BeWoRimbach
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(472.1251F, 18.83332F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(204.375F, 117.9584F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel6
//
this.xrLabel6.BackColor = System.Drawing.Color.Gainsboro;
this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(676.5001F, 18.83334F);
this.xrLabel6.StylePriority.UseBackColor = false;
this.xrLabel6.StylePriority.UseBorders = false;
//
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
@@ -122,6 +143,24 @@ namespace BeWoRimbach
this.bottomMarginBand1.HeightF = 153.8334F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Verdana", 9F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 29.16673F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(365.9583F, 114.6667F);
this.xrRichText1.StylePriority.UseFont = false;
//
// xrRichText2
//
this.xrRichText2.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(417.4168F, 29.16673F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(259.5833F, 114.6667F);
this.xrRichText2.StylePriority.UseFont = false;
//
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -140,6 +179,84 @@ namespace BeWoRimbach
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
// RecipientPostCodeAndTown
//
this.RecipientPostCodeAndTown.CanShrink = true;
this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 102.5417F);
this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown";
this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.RecipientPostCodeAndTown.SizeF = new System.Drawing.SizeF(292F, 17F);
this.RecipientPostCodeAndTown.StylePriority.UseFont = false;
this.RecipientPostCodeAndTown.Text = "[RecipientPostCodeAndTown]";
//
// xrLabel_RecipientStreet
//
this.xrLabel_RecipientStreet.CanShrink = true;
this.xrLabel_RecipientStreet.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 85.54166F);
this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet";
this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel_RecipientStreet.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel_RecipientStreet.StylePriority.UseFont = false;
this.xrLabel_RecipientStreet.Text = "[RecipientStreet]";
//
// xrLabel_RecipientDivision
//
this.xrLabel_RecipientDivision.CanShrink = true;
this.xrLabel_RecipientDivision.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.54166F);
this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision";
this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel_RecipientDivision.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel_RecipientDivision.StylePriority.UseFont = false;
this.xrLabel_RecipientDivision.Text = "[RecipientDivision]";
//
// xrLabel_RecipientContactPerson
//
this.xrLabel_RecipientContactPerson.CanShrink = true;
this.xrLabel_RecipientContactPerson.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.54165F);
this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson";
this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel_RecipientContactPerson.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel_RecipientContactPerson.StylePriority.UseFont = false;
this.xrLabel_RecipientContactPerson.Text = "[RecipientContactPerson]";
//
// xrLabel7
//
this.xrLabel7.CanShrink = true;
this.xrLabel7.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.54164F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel7.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "[RecipientOrganisation]";
//
// xrLabel10
//
this.xrLabel10.Font = new System.Drawing.Font("Verdana", 8F, System.Drawing.FontStyle.Bold);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(365.9583F, 23F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "BeWo Rimbach – Postfach 11 06 – 64666 Rimbach ";
//
// xrPictureBox2
//
this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 10.00001F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(226.25F, 135F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel2
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
@@ -386,7 +503,7 @@ namespace BeWoRimbach
this.xrTableCell43.StylePriority.UsePadding = false;
this.xrTableCell43.StylePriority.UseTextAlignment = false;
this.xrTableCell43.Text = "xrTableCell43";
this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell43.Weight = 0.23245943032832414D;
//
// xrTableCell44
@@ -403,7 +520,7 @@ namespace BeWoRimbach
this.xrTableCell44.StylePriority.UsePadding = false;
this.xrTableCell44.StylePriority.UseTextAlignment = false;
this.xrTableCell44.Text = "xrTableCell44";
this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell44.Weight = 0.2893277257020575D;
//
// xrTableCell47
@@ -421,149 +538,17 @@ namespace BeWoRimbach
this.xrTableCell47.StylePriority.UseFont = false;
this.xrTableCell47.StylePriority.UsePadding = false;
this.xrTableCell47.StylePriority.UseTextAlignment = false;
this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell47.Weight = 0.31923915575667006D;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1,
this.xrLabel3});
this.lblNotice});
this.GroupFooter1.HeightF = 157.625F;
this.GroupFooter1.Name = "GroupFooter1";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(472.1251F, 18.83332F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(204.375F, 117.9584F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel6
//
this.xrLabel6.BackColor = System.Drawing.Color.Gainsboro;
this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(676.5001F, 18.83334F);
this.xrLabel6.StylePriority.UseBackColor = false;
this.xrLabel6.StylePriority.UseBorders = false;
//
// xrPictureBox2
//
this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 10.00001F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(226.25F, 135F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel10
//
this.xrLabel10.Font = new System.Drawing.Font("Verdana", 8F, System.Drawing.FontStyle.Bold);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(365.9583F, 23F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "BeWo Rimbach – Postfach 11 06 – 64666 Rimbach ";
//
// RecipientPostCodeAndTown
//
this.RecipientPostCodeAndTown.CanShrink = true;
this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 102.5417F);
this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown";
this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.RecipientPostCodeAndTown.SizeF = new System.Drawing.SizeF(292F, 17F);
this.RecipientPostCodeAndTown.StylePriority.UseFont = false;
this.RecipientPostCodeAndTown.Text = "[RecipientPostCodeAndTown]";
//
// xrLabel_RecipientStreet
//
this.xrLabel_RecipientStreet.CanShrink = true;
this.xrLabel_RecipientStreet.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 85.54166F);
this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet";
this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel_RecipientStreet.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel_RecipientStreet.StylePriority.UseFont = false;
this.xrLabel_RecipientStreet.Text = "[RecipientStreet]";
//
// xrLabel_RecipientDivision
//
this.xrLabel_RecipientDivision.CanShrink = true;
this.xrLabel_RecipientDivision.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.54166F);
this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision";
this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel_RecipientDivision.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel_RecipientDivision.StylePriority.UseFont = false;
this.xrLabel_RecipientDivision.Text = "[RecipientDivision]";
//
// xrLabel_RecipientContactPerson
//
this.xrLabel_RecipientContactPerson.CanShrink = true;
this.xrLabel_RecipientContactPerson.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.54165F);
this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson";
this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel_RecipientContactPerson.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel_RecipientContactPerson.StylePriority.UseFont = false;
this.xrLabel_RecipientContactPerson.Text = "[RecipientContactPerson]";
//
// xrLabel7
//
this.xrLabel7.CanShrink = true;
this.xrLabel7.Font = new System.Drawing.Font("Verdana", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.54164F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel7.SizeF = new System.Drawing.SizeF(292F, 17F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "[RecipientOrganisation]";
//
// xrLabel3
//
this.xrLabel3.Font = new System.Drawing.Font("Verdana", 10F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.4999796F, 68.04161F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(676.5001F, 89.58334F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = resources.GetString("xrLabel3.Text");
//
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Verdana", 9F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 29.16673F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(365.9583F, 114.6667F);
this.xrRichText1.StylePriority.UseFont = false;
//
// xrRichText2
//
this.xrRichText2.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(417.4168F, 29.16673F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(259.5833F, 114.6667F);
this.xrRichText2.StylePriority.UseFont = false;
//
// xrTable1
//
this.xrTable1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -627,23 +612,6 @@ namespace BeWoRimbach
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell3.Weight = 0.23245943032832414D;
//
// xrTableCell5
//
this.xrTableCell5.BorderColor = System.Drawing.Color.DarkGray;
this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold);
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell5.StylePriority.UseBorderColor = false;
this.xrTableCell5.StylePriority.UseBorders = false;
this.xrTableCell5.StylePriority.UseFont = false;
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "[GrossClaim]";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.31923915575667006D;
//
// xrTableCell4
//
this.xrTableCell4.BorderColor = System.Drawing.Color.DarkGray;
@@ -658,9 +626,41 @@ namespace BeWoRimbach
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Summe";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell4.Weight = 0.2893277257020575D;
//
// xrTableCell5
//
this.xrTableCell5.BorderColor = System.Drawing.Color.DarkGray;
this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold);
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell5.StylePriority.UseBorderColor = false;
this.xrTableCell5.StylePriority.UseBorders = false;
this.xrTableCell5.StylePriority.UseFont = false;
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "[GrossClaim]";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell5.Weight = 0.31923915575667006D;
//
// lblNotice
//
this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0.4999796F, 68.04161F);
this.lblNotice.Multiline = true;
this.lblNotice.Name = "lblNotice";
this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblNotice.SizeF = new System.Drawing.SizeF(676.5001F, 89.58334F);
this.lblNotice.StylePriority.UseFont = false;
this.lblNotice.Text = resources.GetString("lblNotice.Text");
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -680,12 +680,12 @@ namespace BeWoRimbach
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -729,7 +729,7 @@ namespace BeWoRimbach
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision;
private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel lblNotice;
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.XRTable xrTable1;

3
ReportImp/BeWoRimbach/ServiceInvoiceReport.cs
View File

@@ -26,6 +26,9 @@ namespace BeWoRimbach
lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
}
DateTime datum = pRO.InvoiceDateTime.Value.AddDays(14);
lblNotice.Text = lblNotice.Text.Replace("[Zahlungsziel]", String.Format("{0:dd.MM.yyyy}", datum));
this.bindingSource1.DataSource = pRO;
}
}

4
ReportImp/BeWoRimbach/ServiceInvoiceReport.resx
View File

@@ -1784,9 +1784,9 @@
v2dMWC50RsnGF0wpoyhTOBNp4pd72LaQyBeAiwnDxYThYkKxrv8D8l1ABgCIhA0AAAAASUVORK5CYII=
</value>
</data>
<data name="xrLabel3.Text" xml:space="preserve">
<data name="lblNotice.Text" xml:space="preserve">
<value>Bitte überweisen Sie den Betrag in Höhe von [GrossClaim] unter Angabe der Rechnungsnummer
bis zum 14.08.2021 auf das unten angeführte Konto.
bis zum [Zahlungsziel] auf das unten angeführte Konto.
Die abgerechneten Leistungen sind gemäß § 4, Nr. 16 h UStG umsatzsteuerbefreit.</value>
</data>

79
ReportImp/CarlSonnenscheinHaus/Calculations/CustomGroupDurationCalculator.cs
View File

@@ -7,8 +7,8 @@ using BS.Shared.DataContracts;
namespace CarlSonnenscheinHaus.Calculations
{
public class CustomGroupDurationCalculator : GroupDurationCalculator
{
public class CustomGroupDurationCalculator : GroupDurationCalculator
{
//public override GroupDurationDC CalculateGroupDuration(int personCount, int employeeCount, decimal totalDuration)
//{
// return new GroupDurationDC()
@@ -20,77 +20,16 @@ namespace CarlSonnenscheinHaus.Calculations
public override void CalculateGroupDuration(ServiceRecordGroup group)
{
if (group.ServiceRecordList.Count > 0)
base.CalculateGroupDuration(group);
foreach (var sr in group.ServiceRecordList)
{
var dcalc = PluginLoader.FindClass<ServiceRecordDurationCalculator>();
decimal maxRoundedDuration = 0;
long[] costBearer2SupportConceptArray = new long[group.ServiceRecordList.Count];
int idx = 0;
foreach (var sr in group.ServiceRecordList)
if (sr.ServiceDescription.ServiceCategory.Name.ToLower().Contains("teamangebot"))
{
if (dcalc != null)
{
dcalc.CalculateRoundedDuration(sr);
}
if (sr.RoundedDuration > maxRoundedDuration)
{
maxRoundedDuration = sr.RoundedDuration;
}
costBearer2SupportConceptArray[idx++] = sr.CostBearer2SupportConcept.Oid.Value;
sr.RoundedDuration = ((sr.GroupRoundedDuration.Value * group.EmployeeCount) / group.CustomerCount);
}
var dc = CalculateGroupDuration(group.CustomerCount, group.EmployeeCount, maxRoundedDuration,
costBearer2SupportConceptArray);
decimal durationForSingleRecord = 0;
decimal durationForGroup = maxRoundedDuration;
if (dc != null)
{
durationForSingleRecord = dc.SingleDuration;
durationForGroup = dc.TotalDuration;
}
else
{
DateTime dt = DateTime.Now;
foreach (var sr in group.ServiceRecordList)
{
dt = sr.Start.Value;
}
if (dt < new DateTime(2018, 9, 1))
{
durationForSingleRecord = Math.Round(durationForGroup / group.CustomerCount, 2,
MidpointRounding.AwayFromZero);
}
else
{
durationForSingleRecord = Math.Ceiling(durationForGroup / group.CustomerCount);
}
}
foreach (var sr in group.ServiceRecordList)
{
if (sr.ServiceDescription.ServiceCategory.Name.ToLower().Contains("teamangebot"))
{
sr.RoundedDuration = ((durationForGroup * group.EmployeeCount) / group.CustomerCount);
sr.GroupRoundedDuration = durationForGroup;
}
else
{
sr.RoundedDuration = durationForSingleRecord;
sr.GroupRoundedDuration = durationForGroup;
}
}
group.RoundedDuration = durationForGroup;
}
}
}
}
}

1
ReportImp/Club74DB2/Club74MitarbeiterstundenkontoBerechnung.cs
View File

@@ -16,7 +16,6 @@ namespace BeWo.Club74
{
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
{
if (item.ServiceDescription.ServiceCategory.Name.ToLower() == "arbeitszeit")
{
return true;

114
ReportImp/LebenshilfeDorsten/Budgetnachweis.cs
View File

@@ -6,6 +6,7 @@ using BeWo.Report;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using DevExpress.XtraReports.UI;
using System.Collections.Generic;
namespace LebenshilfeDorsten
{
@@ -49,8 +50,15 @@ namespace LebenshilfeDorsten
xrCheckBox1.Checked = true;
}
}
if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count == 1)
{
var ii = pRO.InvoiceItems[0];
if ((ii.ItemDescription == "Spitzabrechung" || ii.ItemDescription == "Spitzabrechnung") && ii.GrossAmountTotal == null && ii.RateFactor == null)
{
pRO.InvoiceItems = CreateDefaultSpitzabrechnungInvoiceItems(pRO);
}
}
ErstelleRechnungspositionen(pRO, terminationDate);
@@ -61,6 +69,108 @@ namespace LebenshilfeDorsten
bindingSource1.DataSource = pRO;
}
private IList<InvoiceItemDC> CreateDefaultSpitzabrechnungInvoiceItems(SettlementRO pRO)
{
IList<InvoiceItemDC> itemList = new List<InvoiceItemDC>();
if (pRO.DifferentHourlyRateCount == 3)
{
itemList.Add(new InvoiceItemDC
{
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.AccountingStartDateString, pRO.HourlyRate3EndDateString,
pRO.GeleisteteFLSMitStundensatz3, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRate3),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatz3 * pRO.RateFactor * pRO.HourlyRate3,
ItemPeriodStart = pRO.AccountingStartDate,
ItemPeriodEnd = pRO.HourlyRateEndDate3,
AmountPerUnit = pRO.HourlyRate3,
RateFactor = pRO.RateFactor,
UnitCount = pRO.GeleisteteFLSMitStundensatz3
});
itemList.Add(new InvoiceItemDC
{
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.HourlyRateOldStartDateString, pRO.HourlyRateOldEndDateString,
pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * pRO.RateFactor * pRO.HourlyRateOld,
ItemPeriodStart = pRO.HourlyRateOldStartDate,
ItemPeriodEnd = pRO.HourlyRateOldEndDate,
AmountPerUnit = pRO.HourlyRateOld,
RateFactor = pRO.RateFactor,
UnitCount = pRO.GeleisteteFLSMitStundensatzAlt
});
itemList.Add(new InvoiceItemDC
{
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString,
pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew,
ItemPeriodStart = pRO.HourlyRateNewStartDate,
ItemPeriodEnd = pRO.AccountingEndDate,
AmountPerUnit = pRO.HourlyRateNew,
RateFactor = pRO.RateFactor,
UnitCount = pRO.GeleisteteFLSMitStundensatzAktuell
});
}
else if (pRO.DifferentHourlyRateCount == 2)
{
itemList.Add(new InvoiceItemDC
{
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.AccountingStartDateString, pRO.HourlyRateOldEndDateString,
pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld,
ItemPeriodStart = pRO.AccountingStartDate,
ItemPeriodEnd = pRO.HourlyRateOldEndDate,
AmountPerUnit = pRO.HourlyRateOld,
RateFactor = pRO.RateFactor,
UnitCount = pRO.GeleisteteFLSMitStundensatzAlt
});
itemList.Add(new InvoiceItemDC
{
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString,
pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew,
ItemPeriodStart = pRO.HourlyRateNewStartDate,
ItemPeriodEnd = pRO.AccountingEndDate,
AmountPerUnit = pRO.HourlyRateNew,
RateFactor = pRO.RateFactor,
UnitCount = pRO.GeleisteteFLSMitStundensatzAktuell
});
}
else
{
itemList.Add(new InvoiceItemDC
{
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.AccountingStartDateString, pRO.AccountingEndDateString,
pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew,
ItemPeriodStart = pRO.AccountingStartDate,
ItemPeriodEnd = pRO.AccountingEndDate,
AmountPerUnit = pRO.HourlyRateNew,
RateFactor = pRO.RateFactor,
UnitCount = pRO.GeleisteteFLSMitStundensatzAktuell
});
}
return itemList;
}
private void ErstelleRechnungspositionen(SettlementRO pRO, DateTime? terminationDate)
{
if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count > 0)

32
ReportImp/PZDDuesseldorf/Invoicing/AssistenzInvoiceCreation.cs
View File

@@ -38,23 +38,23 @@ namespace PZDDuesseldorf.Invoicing
if (!iServiceRecord.ServiceDescription.CategoryName.Contains("Assistenz"))
return null;
var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);
DateTime start = ii.ItemPeriodStart.Value;
decimal preisAssistenz = 0;
return base.CreateInvoiceItem(iServiceRecord, scap, calc);
//DateTime start = ii.ItemPeriodStart.Value;
//decimal preisAssistenz = 0;
var cat = DAOFactory.SearchDAO.FindServiceCategoryByName("Assistenzleistungen");
if (cat != null)
{
var crps = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(cat.CostRatePeriods);
var cp = crps.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, start);
if (cp != null && cp.CostRateValue.HasValue)
preisAssistenz = (decimal)cp.CostRateValue;
ii.AmountPerUnit = preisAssistenz;
ii.RateFactor = null;
ii.AmountTotal = preisAssistenz * ii.UnitCount;
ii.GrossAmountTotal = preisAssistenz * ii.UnitCount;
}
return ii;
//var cat = DAOFactory.SearchDAO.FindServiceCategoryByName("Assistenzleistungen");
//if (cat != null)
//{
// var crps = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(cat.CostRatePeriods);
// var cp = crps.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, start);
// if (cp != null && cp.CostRateValue.HasValue)
// preisAssistenz = (decimal)cp.CostRateValue;
// ii.AmountPerUnit = preisAssistenz;
// ii.RateFactor = null;
// ii.AmountTotal = preisAssistenz * ii.UnitCount;
// ii.GrossAmountTotal = preisAssistenz * ii.UnitCount;
//}
//return ii;
}
public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,

2
ReportImp/PZDDuesseldorf/app.config
View File

@@ -12,4 +12,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
</configuration>demo

4
Service/Core/Utils.cs
View File

@@ -118,8 +118,8 @@ namespace BeWo.Service.Core
//if (to.Equals())
return SendMail(senderEMail, senderName, to, subject, body, server, user, pass, sendAsync);
return SendMail(senderEMail.Trim(), senderName, to, subject, body, server, user, pass, sendAsync);
}

4
Service/Plugins/PluginLoader.cs
View File

@@ -108,7 +108,7 @@ namespace BeWo.Service.Plugins
//t = "8677523325"; // BeWo Richartz
//t = "1765854593"; // Mein Betreutes Wohnen
//t = "6802909544"; // Lebenshilfe Coburg
//t = "9417634361"; // Synprax
t = "9417634361"; // Synprax
//t = "5761861730"; // Lebenshilfe Warendorf
//t = "6712648331"; // BeWo Färber
//t = "4982295287"; // ASB Hamm
@@ -235,7 +235,7 @@ namespace BeWo.Service.Plugins
//t = "4423043131"; // Die Perspektive e.V.
//t = "5263375280"; // LH Wolfsburg
//t = "4900722829"; // Evangelische Kirchengemeinde Bottrop
t = "9853685258"; // Input
//t = "9853685258"; // Input
//t = "7622428090"; // Freie gemeinnützige Beratungsstelle für Psychotherapie e.V. (BfpDus) (Panama)
//t = "0206140343"; // Lebenswelt Gabriel
//t = "6916712798"; // LH Rodenkirchen Bewo