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

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

Browse Source
This commit is contained in:
Lyndon Jetten
2023-01-19 17:20:51 +01:00
parent d361307cb4 e22d49fb19
commit 3d07aa38a8
2 changed files with 80 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReportImp/BeWoDirekt/BeWoDirektMitarbeiterstundenkontoBerechnung.cs
View File

@@ -37,7 +37,7 @@ namespace BeWo.BeWoDirekt
{
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
{
if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeiterfassung")
if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeiterfassung P")
{
return true;
}
@@ -77,7 +77,7 @@ namespace BeWo.BeWoDirekt
if (item.ServiceDescription != null &&
item.ServiceDescription.ServiceCategory != null)
{
if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeiterfassung")
if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeiterfassung P")
{
arbeitszeit += duration;
}

86
ReportImp/VaroSozialagentur/QuittierungsbelegHannover.Designer.cs generated
View File

@@ -59,6 +59,7 @@ namespace VaroSozialagentur
this.columnWegepauschaleQuali = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
@@ -104,7 +105,11 @@ namespace VaroSozialagentur
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.wennGruppeAnzPersonen = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -522,6 +527,10 @@ namespace VaroSozialagentur
this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell32.Weight = 0.28195599876122152D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -1034,6 +1043,11 @@ namespace VaroSozialagentur
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel11,
this.xrPictureBox3,
this.lblUnterschriftMitarbeiter,
this.xrLabel12,
this.xrPictureBox2,
this.xrLabel9,
this.xrLabel8,
this.xrLabel7,
@@ -1042,7 +1056,7 @@ namespace VaroSozialagentur
this.xrLabel6,
this.xrLabel2,
this.xrLabel1});
this.GroupFooter1.HeightF = 270F;
this.GroupFooter1.HeightF = 171.0417F;
this.GroupFooter1.KeepTogether = true;
this.GroupFooter1.Name = "GroupFooter1";
//
@@ -1052,7 +1066,7 @@ namespace VaroSozialagentur
this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel9.BorderWidth = 1F;
this.xrLabel9.Font = new System.Drawing.Font("Calibri", 11F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(124.2305F, 98.12498F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(124.2305F, 116.875F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(983.7695F, 20.00001F);
@@ -1072,7 +1086,7 @@ namespace VaroSozialagentur
this.xrLabel8.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel8.BorderWidth = 1F;
this.xrLabel8.Font = new System.Drawing.Font("Calibri", 11F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(124.2305F, 78.125F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(124.2305F, 96.875F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(320.4112F, 20F);
@@ -1091,7 +1105,7 @@ namespace VaroSozialagentur
this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel7.BorderWidth = 1F;
this.xrLabel7.Font = new System.Drawing.Font("Calibri", 11F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 78.125F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 96.875F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(124.2305F, 20F);
@@ -1171,7 +1185,7 @@ namespace VaroSozialagentur
this.xrLabel2.BorderWidth = 2F;
this.xrLabel2.CanGrow = false;
this.xrLabel2.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(567.5859F, 19.99999F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(567.5859F, 20.00001F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(122.4781F, 19.99998F);
@@ -1219,9 +1233,60 @@ namespace VaroSozialagentur
this.wennGruppeAnzPersonen.Expression = "Iif([CustomerCount] > 1,[CustomerCount],\'\')";
this.wennGruppeAnzPersonen.Name = "wennGruppeAnzPersonen";
//
// bindingSource1
// xrLabel11
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy,}")});
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 73.87498F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(100F, 23F);
this.xrLabel11.Visible = false;
//
// xrPictureBox3
//
this.xrPictureBox3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Image", null, "CustomerSignature")});
this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(120.6207F, 61.37498F);
this.xrPictureBox3.Name = "xrPictureBox3";
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(136.8472F, 35.50002F);
this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// lblUnterschriftMitarbeiter
//
this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.lblUnterschriftMitarbeiter.Font = new System.Drawing.Font("Arial", 10F);
this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(737.7292F, 96.87494F);
this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter";
this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(336.6944F, 19.99998F);
this.lblUnterschriftMitarbeiter.StylePriority.UseBackColor = false;
this.lblUnterschriftMitarbeiter.StylePriority.UseBorders = false;
this.lblUnterschriftMitarbeiter.StylePriority.UseFont = false;
this.lblUnterschriftMitarbeiter.StylePriority.UsePadding = false;
this.lblUnterschriftMitarbeiter.StylePriority.UseTextAlignment = false;
this.lblUnterschriftMitarbeiter.Text = "Datum, verantwortliche/r Mitarbeiter/in";
this.lblUnterschriftMitarbeiter.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel12
//
this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy,}")});
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(774.5578F, 73.87498F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(100F, 23F);
this.xrLabel12.Visible = false;
//
// xrPictureBox2
//
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")});
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(875.0579F, 61.37498F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// QuittierungsbelegHannover
//
@@ -1330,5 +1395,10 @@ namespace VaroSozialagentur
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
}
}