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:
Alexandra
2024-05-16 13:31:16 +02:00
parent 12b006df6d 2437e88cbe
commit bd5722d6df
12 changed files with 1386 additions and 1467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BeWo/BeWo.csproj
View File

@@ -3115,6 +3115,12 @@
<ItemGroup>
<Resource Include="Ressources\Icons\Copy24.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Ressources\Icons\AB.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Ressources\Icons\BoyAndGirl.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>

14
BeWo/View/Controls/GkvAbrechnungDetailControl.xaml
View File

@@ -46,7 +46,7 @@
<TextBox Grid.Row="0" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding GkvAbrechnungOid}"/>
<Label Grid.Row="1" Grid.Column="0" Margin="3" Content="IK Leistungserbringer:"/>
<TextBox Grid.Row="1" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding IKLeistungserbringer}"/>
<Label Grid.Row="2" Grid.Column="0" Margin="3" Content="IK Versichertenkarte:"/>
<Label Grid.Row="2" Grid.Column="0" Margin="3" Content="IK Krankenkasse:"/>
<TextBox Grid.Row="2" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding IKVersichertenKarte}"/>
<Label Grid.Row="3" Grid.Column="0" Margin="3" Content="IK Kostenträger:"/>
<TextBox Grid.Row="3" Grid.Column="2" Margin="3" IsReadOnly="True" Text="{Binding IKKostenträger}"/>
@@ -77,26 +77,26 @@
<dxg:GridControl Margin="3" x:Name="datagrid_transfer" DataSource="{Binding TransferProtokolle}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
<dxg:GridControl.Columns>
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Dateiname" Header="Dateiname"></dxg:GridColumn>
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="PruftDatum" Header="Prüft am">
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="PruftDatum" Header="Geprüft am">
<dxg:GridColumn.EditSettings>
<dxe:TextEditSettings DisplayFormat="g" Mask="c" MaskType="DateTime"></dxe:TextEditSettings>
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="PruftFehler" Header="Prüf Fehler"></dxg:GridColumn>
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="PruftFehler" Header="Prüffehler"></dxg:GridColumn>
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="VerschlusseltDatum" Header="Verschlüsselt am">
<dxg:GridColumn.EditSettings>
<dxe:TextEditSettings DisplayFormat="g" Mask="c" MaskType="DateTime"></dxe:TextEditSettings>
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="VerschlusseltFehler" Header="Verschlüsselt Fehler"></dxg:GridColumn>
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="UbertragDatum" Header="Übertrag am">
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="VerschlusseltFehler" Header="Verschlüsselungsfehler"></dxg:GridColumn>
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="UbertragDatum" Header="Übertragen am">
<dxg:GridColumn.EditSettings>
<dxe:TextEditSettings DisplayFormat="g" Mask="c" MaskType="DateTime"></dxe:TextEditSettings>
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="UbertragFehler" Header="Übertrag Fehler"></dxg:GridColumn>
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="UbertragFehler" Header="Übertragungsfehler"></dxg:GridColumn>
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AbsenderBezeichnung" Header="Absender Bezeichnung"></dxg:GridColumn>
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="EmpfangerBezeichnung" Header="Empfanger Bezeichnung"></dxg:GridColumn>
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="EmpfangerBezeichnung" Header="Empfänger Bezeichnung"></dxg:GridColumn>
<dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Dateityp" Header="Dateityp"></dxg:GridColumn>
</dxg:GridControl.Columns>
<dxg:GridControl.View>

4
BeWo/View/Detail/OrganisationView.xaml
View File

@@ -223,7 +223,7 @@
Text="{Binding Path=ContactPerson, UpdateSourceTrigger=PropertyChanged}" />
</Grid>
</GroupBox>
<GroupBox Grid.Column="3" Grid.Row="1" Header="Dakota"
<GroupBox Grid.Column="3" Grid.Row="1" Header="GKV-Abrechnung"
Style="{StaticResource ObjectEditGroupBox}" Margin="8,8,0,0"
>
<Grid HorizontalAlignment="Stretch">
@@ -237,7 +237,7 @@
<ColumnDefinition Width="*" MaxWidth="200" />
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center">IK Krankenkasse</Label>
<Label Grid.Column="0" Grid.Row="1" Margin="3" VerticalAlignment="Center">IK Kostentrager</Label>
<Label Grid.Column="0" Grid.Row="1" Margin="3" VerticalAlignment="Center">IK Kostenträger</Label>
<Label Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Center">IK Datenannahmestelle</Label>
<TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23"
Text="{Binding Path=IKKrankenkasse, UpdateSourceTrigger=PropertyChanged}" />

2
Data/Data.csproj
View File

@@ -76,12 +76,14 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Mvvm.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="DevExpress.Xpo.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraScheduler.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v23.2.Core.Desktop, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

3
Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
View File

@@ -2209,6 +2209,7 @@ namespace BeWo.Report.ReportObjects
ueberstunden += ah;
}
ed.StundenSollOhneUrlaubKrankheit = sollMitarbeiter;
ed.FlsIst = flsIst / 60;
ed.MittelbarIst = mittelbarIst / 60;
@@ -2619,7 +2620,7 @@ namespace BeWo.Report.ReportObjects
return addHours;
}
private decimal BerechneGesetzlichePauseInMinuten(MitarbeiterstundenkontoRO.DayDetail dayDetail, DateTime startDateTime, DateTime endDateTime)
public virtual decimal BerechneGesetzlichePauseInMinuten(MitarbeiterstundenkontoRO.DayDetail dayDetail, DateTime startDateTime, DateTime endDateTime)
{
decimal arbeitsstunden = (decimal)endDateTime.Subtract(startDateTime).TotalHours;
decimal gesetzlichePauseMinuten = 0;

108
ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.Designer.cs generated
View File

@@ -43,7 +43,6 @@ namespace AutismusKoelnBonn
this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblText = new DevExpress.XtraReports.UI.XRLabel();
this.lbl2 = new DevExpress.XtraReports.UI.XRLabel();
this.lblBewilligungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
@@ -62,6 +61,8 @@ namespace AutismusKoelnBonn
this.lblAddress = new DevExpress.XtraReports.UI.XRLabel();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.lblNotice = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -87,9 +88,8 @@ namespace AutismusKoelnBonn
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblBewilligungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.lblNotice = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lblHeaderKoeln)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lblTeamKoeln)).BeginInit();
@@ -118,10 +118,10 @@ namespace AutismusKoelnBonn
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblBewilligungszeitraum,
this.xrTable5,
this.lblText,
this.lbl2,
this.lblBewilligungszeitraum,
this.lblAnrede,
this.xrLabel7,
this.xrLabel9,
@@ -139,13 +139,13 @@ namespace AutismusKoelnBonn
this.xrPictureBox1,
this.lblAddress});
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 662.9581F;
this.ReportHeader.HeightF = 637.9581F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrTable5
//
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(31.90305F, 637.9581F);
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(31.90305F, 612.9581F);
this.xrTable5.Name = "xrTable5";
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow23});
@@ -266,7 +266,7 @@ namespace AutismusKoelnBonn
//
this.lblText.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lblText.LocationFloat = new DevExpress.Utils.PointFloat(31.8476F, 581.9998F);
this.lblText.LocationFloat = new DevExpress.Utils.PointFloat(31.8476F, 558.9998F);
this.lblText.Multiline = true;
this.lblText.Name = "lblText";
this.lblText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -282,7 +282,7 @@ namespace AutismusKoelnBonn
this.lbl2.CanShrink = true;
this.lbl2.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lbl2.LocationFloat = new DevExpress.Utils.PointFloat(32.94468F, 475.5415F);
this.lbl2.LocationFloat = new DevExpress.Utils.PointFloat(32.94468F, 463.5415F);
this.lbl2.Multiline = true;
this.lbl2.Name = "lbl2";
this.lbl2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -294,25 +294,11 @@ namespace AutismusKoelnBonn
this.lbl2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.lbl2.WordWrap = false;
//
// lblBewilligungszeitraum
//
this.lblBewilligungszeitraum.BackColor = System.Drawing.Color.Transparent;
this.lblBewilligungszeitraum.CanShrink = true;
this.lblBewilligungszeitraum.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblBewilligungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(32.94463F, 495.5414F);
this.lblBewilligungszeitraum.Name = "lblBewilligungszeitraum";
this.lblBewilligungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblBewilligungszeitraum.SizeF = new System.Drawing.SizeF(648.9584F, 20F);
this.lblBewilligungszeitraum.StylePriority.UseBackColor = false;
this.lblBewilligungszeitraum.StylePriority.UseFont = false;
this.lblBewilligungszeitraum.Text = "Bewilligungszeitraum: ";
this.lblBewilligungszeitraum.WordWrap = false;
//
// lblAnrede
//
this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(32.94468F, 548.4581F);
this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(32.94468F, 527.4581F);
this.lblAnrede.Multiline = true;
this.lblAnrede.Name = "lblAnrede";
this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -516,11 +502,34 @@ namespace AutismusKoelnBonn
this.lblMfg,
this.lblVerwaltung});
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportFooter.HeightF = 283.1411F;
this.ReportFooter.HeightF = 285.183F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// lblNotice
//
this.lblNotice.CanShrink = true;
this.lblNotice.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Italic);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(31.84764F, 37F);
this.lblNotice.Name = "lblNotice";
this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 22F);
this.lblNotice.StylePriority.UseFont = false;
this.lblNotice.Text = "Abschließende Bemerkungen:";
//
// xrLabel8
//
this.xrLabel8.CanShrink = true;
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(31.84764F, 59.45835F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(653.1939F, 18.04168F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "[Notice]";
//
// xrTable2
//
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(31.90301F, 0F);
@@ -637,11 +646,11 @@ namespace AutismusKoelnBonn
//
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(31.90301F, 84.88008F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(31.90308F, 92.88007F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(671.097F, 75.75009F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(653.1386F, 75.75009F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "Bitte überweisen Sie den Rechnungsbetrag innerhalb von 14 Tagen unter Angabe der " +
"Rechnungsnummer.\r\n\r\nWir weisen darauf hin, dass wir gemäß § 4 Nr. 18 UStG von de" +
@@ -651,18 +660,18 @@ namespace AutismusKoelnBonn
//
this.lblMfg.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lblMfg.LocationFloat = new DevExpress.Utils.PointFloat(31.90301F, 184.7238F);
this.lblMfg.LocationFloat = new DevExpress.Utils.PointFloat(31.90308F, 190.7238F);
this.lblMfg.Multiline = true;
this.lblMfg.Name = "lblMfg";
this.lblMfg.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblMfg.SizeF = new System.Drawing.SizeF(671.097F, 72.00012F);
this.lblMfg.SizeF = new System.Drawing.SizeF(653.1387F, 72.00015F);
this.lblMfg.StylePriority.UseFont = false;
this.lblMfg.Text = "Mit freundlichen Grüßen\r\n\r\n\r\nWalter Krebs";
//
// lblVerwaltung
//
this.lblVerwaltung.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
this.lblVerwaltung.LocationFloat = new DevExpress.Utils.PointFloat(31.90301F, 256.7239F);
this.lblVerwaltung.LocationFloat = new DevExpress.Utils.PointFloat(31.90301F, 262.7239F);
this.lblVerwaltung.Multiline = true;
this.lblVerwaltung.Name = "lblVerwaltung";
this.lblVerwaltung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -874,32 +883,27 @@ namespace AutismusKoelnBonn
this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell47.Weight = 0.39389530172875176D;
//
// lblBewilligungszeitraum
//
this.lblBewilligungszeitraum.BackColor = System.Drawing.Color.Transparent;
this.lblBewilligungszeitraum.CanShrink = true;
this.lblBewilligungszeitraum.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.lblBewilligungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(32.94474F, 483.5415F);
this.lblBewilligungszeitraum.Multiline = true;
this.lblBewilligungszeitraum.Name = "lblBewilligungszeitraum";
this.lblBewilligungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblBewilligungszeitraum.SizeF = new System.Drawing.SizeF(648.9583F, 20F);
this.lblBewilligungszeitraum.StylePriority.UseBackColor = false;
this.lblBewilligungszeitraum.StylePriority.UseFont = false;
this.lblBewilligungszeitraum.StylePriority.UseTextAlignment = false;
this.lblBewilligungszeitraum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.lblBewilligungszeitraum.WordWrap = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
//
// lblNotice
//
this.lblNotice.CanShrink = true;
this.lblNotice.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(31.84764F, 34F);
this.lblNotice.Name = "lblNotice";
this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 22F);
this.lblNotice.StylePriority.UseFont = false;
this.lblNotice.Text = "Abschließende Bemerkungen:";
//
// xrLabel8
//
this.xrLabel8.CanShrink = true;
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(31.84764F, 56.45835F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(653.1939F, 18.04168F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "[Notice]";
//
// InvoiceCustomerReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -968,7 +972,6 @@ namespace AutismusKoelnBonn
private DevExpress.XtraReports.UI.XRRichText lblBonnHZE;
private DevExpress.XtraReports.UI.XRLabel lblText;
private DevExpress.XtraReports.UI.XRLabel lbl2;
private DevExpress.XtraReports.UI.XRLabel lblBewilligungszeitraum;
private DevExpress.XtraReports.UI.XRLabel lblAnrede;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
@@ -1000,5 +1003,6 @@ namespace AutismusKoelnBonn
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
private DevExpress.XtraReports.UI.XRLabel lblNotice;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel lblBewilligungszeitraum;
}
}

9
ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.cs
View File

@@ -59,7 +59,7 @@ namespace AutismusKoelnBonn
team = sc.Customer.Team2CustomerList[0].Team.Name;
lvrBescheid = String.Format("gemäß Bescheid des LVR vom {0:dd.MM.yyyy}, ", sc.ApprovalDate);
lblBewilligungszeitraum.Text += String.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy}", sc.StartDate, sc.EndDate);
lblBewilligungszeitraum.Text += String.Format("Bewillingszeitraum: {0:dd.MM.yyyy} - {1:dd.MM.yyyy}", sc.StartDate, sc.EndDate);
pRO.CreatorFirstName = sc.Customer.DebitorNumber;
}
@@ -106,7 +106,12 @@ namespace AutismusKoelnBonn
lblHeaderKoelnHZE.Visible = true;
lblHeaderKoeln.Visible = false;
lblTeamKoeln.Visible = false;
}
}
if (String.IsNullOrEmpty(pRO.Notice))
{
lblNotice.Visible = false;
}
this.bindingSource1.DataSource = pRO;
}

1741
ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

425
ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.resx
View File

File diff suppressed because one or more lines are too long

334
ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs
View File

@@ -14,25 +14,25 @@ namespace VkmHamm
return true;
}
public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed)
public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed)
{
var dd = base.CreateDayDetail(date, ed);
if (date.Year >= 2023)
{
dd.MaxHoursUntilBreak = 6;
dd.MaxHoursUntilBreak2 = 9;
dd.BreakMinutes = 30;
dd.BreakMinutes2 = 15;
}
else
{
dd.MaxHoursUntilBreak = 0;
dd.MaxHoursUntilBreak2 = 0;
dd.BreakMinutes = 0;
dd.BreakMinutes2 = 0;
}
return dd;
}
var dd = base.CreateDayDetail(date, ed);
if (date.Year >= 2023)
{
dd.MaxHoursUntilBreak = 6;
dd.MaxHoursUntilBreak2 = 9;
dd.BreakMinutes = 30;
dd.BreakMinutes2 = 15;
}
else
{
dd.MaxHoursUntilBreak = 0;
dd.MaxHoursUntilBreak2 = 0;
dd.BreakMinutes = 0;
dd.BreakMinutes2 = 0;
}
return dd;
}
public override IList<MitarbeiterstundenkontoRO.DayDetail> CreateDayDetails(DateTime berichtStart, DateTime berichtEnde, MitarbeiterstundenkontoRO.EmployeeDetail ed, IList<ServiceRecord> recordsAll)
{
@@ -52,38 +52,38 @@ namespace VkmHamm
if (!IsServiceRecordFehlzeit(sr) && AddServiceRecordToDuration(sr))
{
decimal duration = GetDuration(sr, ed);
if (IsUrlaubAbsenceServiceRecord(sr))
{
if (sr.RoundedDuration > 0)
{
dd.HoursInVacation += Math.Round(sr.RoundedDuration / 60, 2, MidpointRounding.AwayFromZero);
}
else
{
dd.HoursInVacation += 1;
}
}
else if (IsKrankAbsenceServiceRecord(sr))
{
if (sr.RoundedDuration > 0)
{
dd.HoursSick += Math.Round(sr.RoundedDuration / 60, 2, MidpointRounding.AwayFromZero);
}
else
{
dd.HoursSick += 1;
}
}
else
{
dd.MinutesTotal += duration;
}
if (dd.ServiceRecords == null)
dd.ServiceRecords = new List<ServiceRecord>();
dd.ServiceRecords.Add(sr);
decimal duration = GetDuration(sr, ed);
if (IsUrlaubAbsenceServiceRecord(sr))
{
if (sr.RoundedDuration > 0)
{
dd.HoursInVacation += Math.Round(sr.RoundedDuration / 60, 2, MidpointRounding.AwayFromZero);
}
else
{
dd.HoursInVacation += 1;
}
}
else if (IsKrankAbsenceServiceRecord(sr))
{
if (sr.RoundedDuration > 0)
{
dd.HoursSick += Math.Round(sr.RoundedDuration / 60, 2, MidpointRounding.AwayFromZero);
}
else
{
dd.HoursSick += 1;
}
}
else
{
dd.MinutesTotal += duration;
}
if (dd.ServiceRecords == null)
dd.ServiceRecords = new List<ServiceRecord>();
dd.ServiceRecords.Add(sr);
CalculateSpecialHours(dd, sr, duration);
CalculateSpecialHours(dd, sr, duration);
}
}
}
@@ -196,7 +196,7 @@ namespace VkmHamm
return dayToDetail.Values.OrderBy(dd => dd.Date).ToList();
}
public override bool AddServiceRecordToDuration(ServiceRecord item)
public override bool AddServiceRecordToDuration(ServiceRecord item)
{
if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
{
@@ -208,57 +208,57 @@ namespace VkmHamm
return false;
}
protected override ServiceRecordSummary BerechneStunden(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, IList<ServiceRecord> groupFilteredRecords, DateTime berichtsAnfang,
DateTime berichtsEnde)
{
decimal flsGesamt = 0;
decimal arbeitszeit = 0;
protected override ServiceRecordSummary BerechneStunden(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, IList<ServiceRecord> groupFilteredRecords, DateTime berichtsAnfang,
DateTime berichtsEnde)
{
decimal flsGesamt = 0;
decimal arbeitszeit = 0;
var sum = new ServiceRecordSummary();
sum.RecordsImBerichtszeitraum = new List<ServiceRecord>();
//base.CorrectOverlappingTimes(groupFilteredRecords);
var sum = new ServiceRecordSummary();
sum.RecordsImBerichtszeitraum = new List<ServiceRecord>();
//base.CorrectOverlappingTimes(groupFilteredRecords);
foreach (var item in groupFilteredRecords)
{
if (item.Start.Value >= berichtsAnfang && item.Start.Value < berichtsEnde)
{
//if (AddServiceRecordToDuration(item))
//{
decimal duration = 0;
foreach (var item in groupFilteredRecords)
{
if (item.Start.Value >= berichtsAnfang && item.Start.Value < berichtsEnde)
{
//if (AddServiceRecordToDuration(item))
//{
decimal duration = 0;
if (item.GroupRoundedDuration.HasValue)
{
duration = item.GroupRoundedDuration.Value;
}
else
{
duration = item.RoundedDuration;
}
if (item.GroupRoundedDuration.HasValue)
{
duration = item.GroupRoundedDuration.Value;
}
else
{
duration = item.RoundedDuration;
}
if (item.ServiceDescription != null &&
item.ServiceDescription.ServiceCategory != null)
{
if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit")
{
arbeitszeit += duration;
}
else if (item.ServiceDescription.ServiceCategory.IsBillable)
{
flsGesamt += duration;
}
if (item.ServiceDescription != null &&
item.ServiceDescription.ServiceCategory != null)
{
if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit")
{
arbeitszeit += duration;
}
else if (item.ServiceDescription.ServiceCategory.IsBillable)
{
flsGesamt += duration;
}
}
sum.RecordsImBerichtszeitraum.Add(item);
}
}
}
sum.RecordsImBerichtszeitraum.Add(item);
}
}
sum.IstAbrechenbar = flsGesamt;
sum.IstNichtAbrechenbar = arbeitszeit - flsGesamt;
sum.IstAbrechenbar = flsGesamt;
sum.IstNichtAbrechenbar = arbeitszeit - flsGesamt;
return sum;
}
return sum;
}
public override List<DateTime> GetFeiertage(int year)
public override List<DateTime> GetFeiertage(int year)
{
var list = base.GetFeiertage(year);
@@ -267,51 +267,72 @@ namespace VkmHamm
return list;
}
/* In Feld "Stundensatz" (bei denen Korridorstunden) im Vertrag steht ein Wert (zB 5,00 bei 40 Stundenwochen ).
/* In Feld "Probezeit (Monate)" (bei denen "Korridorstunden") im Vertrag steht ein Wert (zB 5,00 bei 40 Stundenwochen ).
Wenn dieser Wert an ÜBERSTUNDEN überschritten wurde,
"X" / "Wochenstunden laut Vertrag" auf alle Stunden ÜBER Wochenstunden laut Vertrag + X.
Also bei 46 Überstunden: 46 Überstunden - (40 Wochenstunden laut Vertrag + 5 Korridorstunden) = 1
= 1 * (1 + 5/40)
*/
public override void CreateEmployeeDetails(MitarbeiterstundenkontoRO ro)
{
base.CreateEmployeeDetails(ro);
public override void CreateEmployeeDetails(MitarbeiterstundenkontoRO ro)
{
base.CreateEmployeeDetails(ro);
if (ro.EmployeeDetailList.Count > 0)
{
foreach (var ed in ro.EmployeeDetailList)
{
if (ed.HourlyRate.HasValue)
if (ro.EmployeeDetailList.Count > 0)
{
foreach (var ed in ro.EmployeeDetailList)
{
// Da deren Abwesenheiten ServiceRecords (Arbeitszeit) sind und die trotzdem vom Soll abgezogen werden, hat man die Stunden von der Abwesenheit doppelt.
// Daher muss nochmal die Anzahl Stunden von Abweseneheiten von den Überstunden abgezogen werden..
if (ed.TageKrankheit.HasValue)
{
var toleranzstundenVorFaktor = ed.HourlyRate.Value;
if (ed.Ueberstunden > toleranzstundenVorFaktor)
{
var ueberstundenFuerFaktor = ed.Ueberstunden.Value - toleranzstundenVorFaktor;
ed.Custom15 = ueberstundenFuerFaktor * (1 + toleranzstundenVorFaktor / ed.SollProWoche);
ed.Ueberstunden = toleranzstundenVorFaktor;
ed.UeberstundenGesamt += (ed.Ueberstunden + ed.Custom15) - (ed.Ueberstunden + ueberstundenFuerFaktor);
}
ed.Ueberstunden -= ed.TageKrankheit.Value * ed.SollProTag;
ed.UeberstundenGesamt -= ed.TageKrankheit.Value * ed.SollProTag;
}
if (ed.TageUrlaub.HasValue)
{
ed.Ueberstunden -= ed.TageUrlaub.Value * ed.SollProTag;
ed.UeberstundenGesamt -= ed.TageUrlaub.Value * ed.SollProTag;
}
var contract = GetContractForDate(ed.Employee, ro.ReportStartDate, ro.ReportEndDate);
if (contract != null)
{
var toleranzstundenVorFaktor = contract.ProbationPeriod2;
}
}
}
protected override decimal? BerechneUeberstunden(MitarbeiterstundenkontoRO.EmployeeDetail ed, decimal? ueberstundenStd, Contract contract, DateTime start, DateTime ende)
if (toleranzstundenVorFaktor.HasValue && toleranzstundenVorFaktor > 0)
{
if (ed.Ueberstunden > toleranzstundenVorFaktor.Value)
{
var ueberstundenFuerFaktor = ed.Ueberstunden.Value - toleranzstundenVorFaktor.Value;
ed.Custom15 = ueberstundenFuerFaktor * (1 + toleranzstundenVorFaktor.Value / ed.SollProWoche);
ed.Ueberstunden = toleranzstundenVorFaktor;
ed.UeberstundenGesamt += (ed.Ueberstunden + ed.Custom15) - (ed.Ueberstunden + ueberstundenFuerFaktor);
}
}
}
}
}
}
protected override decimal? BerechneUeberstunden(MitarbeiterstundenkontoRO.EmployeeDetail ed, decimal? ueberstundenStd, Contract contract, DateTime start, DateTime ende)
{
if (ed.UeberstundenVormonat == null)
ed.UeberstundenVormonat = 0;
if (ed.UeberstundenGesamt == null)
ed.UeberstundenGesamt = 0;
var ueberstunden = ed.Ueberstunden - ed.UeberstundenVormonat;
var ueberstunden = ueberstundenStd - ed.UeberstundenVormonat - (ed.StundenSollMax - ed.StundenSollOhneUrlaubKrankheit);
if (contract.HourlyRate.HasValue && ueberstunden > contract.HourlyRate.Value)
if (contract.ProbationPeriod2.HasValue && contract.ProbationPeriod2.Value > 0 && ueberstunden > contract.ProbationPeriod2.Value)
{
var toleranzstundenVorFaktor = contract.HourlyRate.Value;
var toleranzstundenVorFaktor = contract.ProbationPeriod2.Value;
var ueberstundenFuerFaktor = ueberstunden - toleranzstundenVorFaktor;
var bonusDurchKorridorStunden = ueberstundenFuerFaktor * (1 + toleranzstundenVorFaktor / ed.SollProWoche) - ueberstundenFuerFaktor;
var bonusDurchKorridorStunden = ueberstundenFuerFaktor * (1 + toleranzstundenVorFaktor / ed.SollProWoche) - ueberstundenFuerFaktor;
return ueberstundenStd + bonusDurchKorridorStunden;
ed.UeberstundenGesamt += ueberstunden + bonusDurchKorridorStunden + ed.UeberstundenVormonat;
return ueberstunden + bonusDurchKorridorStunden + ed.UeberstundenVormonat;
}
return ueberstundenStd;
@@ -377,21 +398,68 @@ namespace VkmHamm
// }
private bool IsUrlaubAbsenceServiceRecord(ServiceRecord item)
{
if (item.Notice != null && item.Notice.Length > 0 && item.Notice.ToLower().Contains("urlaub"))
{
return true;
}
return false;
}
{
if (item.Notice != null && item.Notice.Length > 0 && item.Notice.Trim().ToLower() == "urlaub")
return true;
private bool IsKrankAbsenceServiceRecord(ServiceRecord item)
return false;
}
private bool IsKrankAbsenceServiceRecord(ServiceRecord item)
{
if (item.Notice != null && item.Notice.Length > 0 && item.Notice.Trim().ToLower() == "krank")
return true;
return false;
}
public virtual bool IsServiceRecordFehlzeit(ServiceRecord sr)
{
if (item.Notice != null && item.Notice.Length > 0 && item.Notice.ToLower().Contains("krank"))
if (sr.Notice != null && sr.Notice.Length > 0 && (sr.Notice.Trim().ToLower() == "krank" || sr.Notice.Trim().ToLower() == "urlaub"))
return true;
return false;
}
protected override AbsenceTimeHours GetAbwesenheitenDurchServiceRecords(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, Contract c, IList<ServiceRecord> groupFilteredRecords, DateTime berichtsAnfang, DateTime berichtsEnde)
{
var abwesenheitenImZeitraum = groupFilteredRecords.Where(sr => sr.Start >= berichtsAnfang && sr.End <= berichtsEnde && (IsKrankAbsenceServiceRecord(sr) || IsUrlaubAbsenceServiceRecord(sr))).ToList();
if (abwesenheitenImZeitraum.Count > 0)
{
return true;
var ath = new AbsenceTimeHours()
{
StundenKrankheit = Convert.ToDecimal(abwesenheitenImZeitraum.Where(sr => IsKrankAbsenceServiceRecord(sr)).ToList().Sum(sr => sr.DurationMinutes) / 60),
StundenSonstiges = 0,
StundenUrlaub = Convert.ToDecimal(abwesenheitenImZeitraum.Where(sr => IsUrlaubAbsenceServiceRecord(sr)).ToList().Sum(sr => sr.DurationMinutes) / 60)
};
return ath;
}
return false;
}
return null;
}
// Da deren Abwesenheiten als ServiceRecords eingetragen werden und die die Pause automatisch abziehen, muss das hier bei Abwesenheiten verhindert werden
public override decimal BerechneGesetzlichePauseInMinuten(MitarbeiterstundenkontoRO.DayDetail dayDetail, DateTime startDateTime, DateTime endDateTime)
{
if (dayDetail.HoursInVacation > 0 || dayDetail.HoursSick > 0)
return 0;
#region standard
decimal arbeitsstunden = (decimal)endDateTime.Subtract(startDateTime).TotalHours;
decimal gesetzlichePauseMinuten = 0;
if (dayDetail.MaxHoursUntilBreak.HasValue && arbeitsstunden > dayDetail.MaxHoursUntilBreak)
{
gesetzlichePauseMinuten += dayDetail.BreakMinutes ?? 0;
}
arbeitsstunden -= gesetzlichePauseMinuten / 60;
if (dayDetail.MaxHoursUntilBreak2.HasValue && arbeitsstunden > dayDetail.MaxHoursUntilBreak2)
{
gesetzlichePauseMinuten += dayDetail.BreakMinutes2 ?? 0;
}
dayDetail.MinutesTotal -= gesetzlichePauseMinuten;
dayDetail.PauseInMinuten += gesetzlichePauseMinuten;
return gesetzlichePauseMinuten;
#endregion
}
}
}
}

205
ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.designer.cs generated
View File

@@ -33,6 +33,7 @@ namespace VkmHamm
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -41,6 +42,7 @@ namespace VkmHamm
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell67 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -54,6 +56,7 @@ namespace VkmHamm
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -76,6 +79,7 @@ namespace VkmHamm
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell64 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.tcSummeKm = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSumMinutesTotalDecimal = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSumHoursSickDecimal = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSumHoursInVacationDecimal = new DevExpress.XtraReports.UI.XRTableCell();
@@ -85,6 +89,11 @@ namespace VkmHamm
this.cellSumMinutesTotalDecimal2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -115,14 +124,6 @@ namespace VkmHamm
this.fieldSumHoliday2 = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.tcSummeKm = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
@@ -210,6 +211,16 @@ namespace VkmHamm
this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell31.Weight = 0.18569741360572162D;
//
// xrTableCell22
//
this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.Custom2")});
this.xrTableCell22.Multiline = true;
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.StylePriority.UseTextAlignment = false;
this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell22.Weight = 0.084886550335585578D;
//
// xrTableCell12
//
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -346,6 +357,15 @@ namespace VkmHamm
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell11.Weight = 0.20103994697733374D;
//
// xrTableCell14
//
this.xrTableCell14.Multiline = true;
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "km";
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell14.Weight = 0.09189988618225009D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
@@ -586,6 +606,17 @@ namespace VkmHamm
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell13.Weight = 0.14383372403190697D;
//
// tcSummeKm
//
this.tcSummeKm.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom1")});
this.tcSummeKm.Multiline = true;
this.tcSummeKm.Name = "tcSummeKm";
this.tcSummeKm.StylePriority.UseTextAlignment = false;
this.tcSummeKm.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.tcSummeKm.TextFormatString = "{0:0.00}";
this.tcSummeKm.Weight = 0.091851026972941424D;
//
// cellSumMinutesTotalDecimal
//
this.cellSumMinutesTotalDecimal.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -709,6 +740,67 @@ namespace VkmHamm
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell15.Weight = 0.11143078651026214D;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell29,
this.xrTableCell30,
this.xrTableCell32,
this.xrTableCell33});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.8D;
//
// xrTableCell29
//
this.xrTableCell29.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)));
this.xrTableCell29.Multiline = true;
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F);
this.xrTableCell29.StylePriority.UseBorders = false;
this.xrTableCell29.StylePriority.UsePadding = false;
this.xrTableCell29.StylePriority.UseTextAlignment = false;
this.xrTableCell29.Text = "Stunden Urlaub/Krankheit:";
this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell29.Weight = 0.17987241552156494D;
//
// xrTableCell30
//
this.xrTableCell30.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit")});
this.xrTableCell30.Multiline = true;
this.xrTableCell30.Name = "xrTableCell30";
this.xrTableCell30.StylePriority.UseBorders = false;
this.xrTableCell30.StylePriority.UseTextAlignment = false;
this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell30.Weight = 0.089936205759550983D;
//
// xrTableCell32
//
this.xrTableCell32.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrTableCell32.Multiline = true;
this.xrTableCell32.Name = "xrTableCell32";
this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F);
this.xrTableCell32.StylePriority.UseBorders = false;
this.xrTableCell32.StylePriority.UsePadding = false;
this.xrTableCell32.StylePriority.UseTextAlignment = false;
this.xrTableCell32.Text = "Korridorstunden";
this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell32.Weight = 0.22133305845875073D;
//
// xrTableCell33
//
this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom15")});
this.xrTableCell33.Multiline = true;
this.xrTableCell33.Name = "xrTableCell33";
this.xrTableCell33.StylePriority.UseBorders = false;
this.xrTableCell33.StylePriority.UseTextAlignment = false;
this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell33.TextFormatString = "{0:0.00}";
this.xrTableCell33.Weight = 0.11143078651026214D;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
@@ -791,11 +883,13 @@ namespace VkmHamm
//
this.xrTableCell50.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldHours", "{0:0.00}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldHours")});
this.xrTableCell50.Name = "xrTableCell50";
this.xrTableCell50.StylePriority.UseBorders = false;
this.xrTableCell50.StylePriority.UseTextAlignment = false;
this.xrTableCell50.Text = "xrTableCell50";
xrSummary4.FormatString = "{0:0.00}";
xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell50.Summary = xrSummary4;
this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell50.Weight = 0.089936204907624953D;
//
@@ -988,97 +1082,6 @@ namespace VkmHamm
this.fieldUeberstundenGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldUeberstundenGesamt.Name = "fieldUeberstundenGesamt";
//
// xrTableCell14
//
this.xrTableCell14.Multiline = true;
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "km";
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell14.Weight = 0.09189988618225009D;
//
// xrTableCell22
//
this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.Custom2")});
this.xrTableCell22.Multiline = true;
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.StylePriority.UseTextAlignment = false;
this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell22.Weight = 0.084886550335585578D;
//
// tcSummeKm
//
this.tcSummeKm.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom1")});
this.tcSummeKm.Multiline = true;
this.tcSummeKm.Name = "tcSummeKm";
this.tcSummeKm.StylePriority.UseTextAlignment = false;
this.tcSummeKm.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.tcSummeKm.TextFormatString = "{0:0.00}";
this.tcSummeKm.Weight = 0.091851026972941424D;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell29,
this.xrTableCell30,
this.xrTableCell32,
this.xrTableCell33});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.8D;
//
// xrTableCell32
//
this.xrTableCell32.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrTableCell32.Multiline = true;
this.xrTableCell32.Name = "xrTableCell32";
this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F);
this.xrTableCell32.StylePriority.UseBorders = false;
this.xrTableCell32.StylePriority.UsePadding = false;
this.xrTableCell32.StylePriority.UseTextAlignment = false;
this.xrTableCell32.Text = "Korridorüberstunden";
this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell32.Weight = 0.22133305845875073D;
//
// xrTableCell33
//
this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom15")});
this.xrTableCell33.Multiline = true;
this.xrTableCell33.Name = "xrTableCell33";
this.xrTableCell33.StylePriority.UseBorders = false;
this.xrTableCell33.StylePriority.UseTextAlignment = false;
this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell33.TextFormatString = "{0:0.00}";
this.xrTableCell33.Weight = 0.11143078651026214D;
//
// xrTableCell30
//
this.xrTableCell30.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit")});
this.xrTableCell30.Multiline = true;
this.xrTableCell30.Name = "xrTableCell30";
this.xrTableCell30.StylePriority.UseBorders = false;
this.xrTableCell30.StylePriority.UseTextAlignment = false;
this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell30.Weight = 0.089936205759550983D;
//
// xrTableCell29
//
this.xrTableCell29.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)));
this.xrTableCell29.Multiline = true;
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F);
this.xrTableCell29.StylePriority.UseBorders = false;
this.xrTableCell29.StylePriority.UsePadding = false;
this.xrTableCell29.StylePriority.UseTextAlignment = false;
this.xrTableCell29.Text = "Stunden Urlaub/Krankheit:";
this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell29.Weight = 0.17987241552156494D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);

2
ReportImp/VkmHamm/Translation/TranslationDictionary.cs
View File

@@ -18,7 +18,7 @@ namespace VkmHamm.Translation
public override Dictionary<String, String> GetTranslationDictionary()
{
var dict = base.GetTranslationDictionary();
AddOrReplaceTranslation(dict, "Stundensatz", "Korridorstunden");
AddOrReplaceTranslation(dict, "Probezeit (Monate)", "Korridorstunden");
return dict;
}
}