VIVA (Herr Kloss) Ringtausch im Vertretungsmgmt, HPH Freizeit und Reisen Info über Abtretungserklärung in Abrechnung, Humanitas Anpassung des Avise Imports
This commit is contained in:
@@ -445,16 +445,16 @@
|
||||
<Label Grid.Column="0" Grid.Row="1" Margin="3" VerticalAlignment="Center">Vertragsbeginn</Label>
|
||||
<Label Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Center">Befristet bis</Label>
|
||||
<Label Grid.Column="0" Grid.Row="3" Margin="3" VerticalAlignment="Center">beschäftigt als</Label>
|
||||
<Label Grid.Column="0" Grid.Row="4" Margin="3" VerticalAlignment="Center">Stundensatz</Label>
|
||||
<Label Grid.Column="0" Grid.Row="4" Margin="3" VerticalAlignment="Center" Content="{markup:Translate Stundensatz}" />
|
||||
<Label Grid.Column="0" Grid.Row="5" Margin="3" VerticalAlignment="Center" Content="{markup:Translate FLS/Woche}" />
|
||||
<Label Grid.Column="0" Grid.Row="6" Margin="3" VerticalAlignment="Center" Content="{markup:Translate FLS/Monat}" />
|
||||
<Label Grid.Column="0" Grid.Row="7" Margin="3" VerticalAlignment="Center">Gesamtstunden/Woche</Label>
|
||||
<Label Grid.Column="0" Grid.Row="8" Margin="3" VerticalAlignment="Center">Gesamtstunden/Monat</Label>
|
||||
<Label Grid.Column="0" Grid.Row="7" Margin="3" VerticalAlignment="Center" Content="{markup:Translate Gesamtstunden/Woche}" />
|
||||
<Label Grid.Column="0" Grid.Row="8" Margin="3" VerticalAlignment="Center" Content="{markup:Translate Gesamtstunden/Monat}" />
|
||||
<Label x:Name="lbl_ArbeitstageProWoche" Grid.Column="0" Grid.Row="9" Margin="3" VerticalAlignment="Center">Arbeitstage pro Woche</Label>
|
||||
<Label Grid.Column="0" Grid.Row="10" Margin="3" VerticalAlignment="Center">Urlaubstage</Label>
|
||||
<Label Grid.Column="0" Grid.Row="11" Margin="3" VerticalAlignment="Center" Content="{markup:Translate Probezeit (Tage)}"></Label>
|
||||
<Label Grid.Column="0" Grid.Row="12" Margin="3" VerticalAlignment="Center" Content="{markup:Translate Probezeit (Monate)}"></Label>
|
||||
<Label Grid.Column="0" Grid.Row="13" Margin="3" VerticalAlignment="Center">Künd.-frist (Tage)</Label>
|
||||
<Label Grid.Column="0" Grid.Row="13" Margin="3" VerticalAlignment="Center" Content="{markup:Translate Künd.-frist (Tage)}" />
|
||||
|
||||
<Label Grid.Column="3" Grid.Row="0" Margin="3" VerticalAlignment="Center">Bemerkungen</Label>
|
||||
|
||||
|
||||
@@ -867,7 +867,7 @@
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Label Grid.Row="1" Content="Gefahrene Kilometer" Grid.Column="0" x:Name="lblDistance" HorizontalAlignment="Right" />
|
||||
<Label Grid.Row="1" Content="{markup:Translate Gefahrene Kilometer}" Grid.Column="0" x:Name="lblDistance" HorizontalAlignment="Right" />
|
||||
<dxe:SpinEdit Grid.Row="1" Increment="1" MinValue="0" IsFloatValue="True" Mask="########0.0#" MaskUseAsDisplayFormat="True"
|
||||
AllowNullInput="False" x:Name="numerictb_distance" EditValue="{Binding Mode=TwoWay, Path=PrototypeVM.DistanceInMeter, UpdateSourceTrigger=PropertyChanged}"
|
||||
Grid.Column="1" Height="23" Margin="3,0,3,3" Width="52" />
|
||||
@@ -1289,7 +1289,7 @@
|
||||
<dxg:GridColumn FieldName="DauerEinheit" AllowEditing="False" Header="Art (Dauer)" Width="65" x:Name="DutationInSTDHeader">
|
||||
|
||||
</dxg:GridColumn>
|
||||
<dxg:GridColumn x:Name="DistanceGridColumn" FieldName="DistanceInMeter" AllowEditing="False" Header="Gefahrene km" Width="80">
|
||||
<dxg:GridColumn x:Name="DistanceGridColumn" FieldName="DistanceInMeter" AllowEditing="False" Header="{markup:Translate Gefahrene km}" Width="80">
|
||||
<dxg:GridColumn.EditSettings>
|
||||
<dxe:TextEditSettings DisplayFormat="0.##"></dxe:TextEditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
|
||||
@@ -35,6 +35,8 @@ namespace BeWo.View
|
||||
{
|
||||
string nachricht = String.Format("Beschreibung:\n{0}", tb_errorDesciption.Text);
|
||||
|
||||
nachricht += string.Format("\n\n{0}", BeWoApp.Version);
|
||||
|
||||
if (CheckBoxSupportPin.IsChecked.HasValue && CheckBoxSupportPin.IsChecked.Value)
|
||||
{
|
||||
nachricht += string.Format("\n\nPIN: *****");
|
||||
|
||||
@@ -151,6 +151,7 @@
|
||||
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Service\CustomVacationService.cs" />
|
||||
<Compile Include="Service\CustomVertretungsManager.cs" />
|
||||
<Compile Include="Service\ServiceRecordDurationCalculator.cs" />
|
||||
<Compile Include="Teamstundenkonto.cs">
|
||||
<SubType>Component</SubType>
|
||||
|
||||
@@ -47,22 +47,8 @@ namespace AkggMid
|
||||
}
|
||||
}
|
||||
|
||||
if (ro.ApprovedFLSPerWeek == 0)
|
||||
{
|
||||
if (ro.CostBearer2SupportConceptList != null && ro.CostBearer2SupportConceptList.Count > 0)
|
||||
{
|
||||
var c2s = ro.CostBearer2SupportConceptList[0];
|
||||
KorrigiereFLSProWoche(ro);
|
||||
|
||||
foreach (var scap in c2s.ApprovalPeriodList)
|
||||
{
|
||||
if (scap.StartDate <= ro.EndDate && scap.EndDate >= ro.StartDate && scap.ApprovedBEInterval.HasValue && scap.ApprovedBEPerInterval.HasValue && scap.ApprovedBEInterval.Value == BS.Shared.SupportConceptApprovalInterval.Weekly)
|
||||
{
|
||||
ro.ApprovedFLSPerWeek = scap.ApprovedBEPerInterval.Value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
public List<ServicesOverviewRO.ServiceDetail> ErstelleDummyRecords(ServicesOverviewRO pRO)
|
||||
@@ -297,6 +283,35 @@ namespace AkggMid
|
||||
ro.TotalFLM = minutenGesamt;
|
||||
}
|
||||
|
||||
private void KorrigiereFLSProWoche(ServicesOverviewRO ro)
|
||||
{
|
||||
//In Fällen bei denen sich die Bewilligung mitten im Monat ändern, soll die letzte Bewilligung und nicht die erste herangezogen werden
|
||||
if (ro.CostBearer2SupportConceptList != null)
|
||||
{
|
||||
DateTime bewilligungStart = DateTime.MinValue;
|
||||
|
||||
foreach (var c2s in ro.CostBearer2SupportConceptList)
|
||||
{
|
||||
foreach (var scap in c2s.ApprovalPeriodList)
|
||||
{
|
||||
if (scap.StartDate <= ro.EndDate && scap.EndDate >= ro.StartDate && scap.ApprovedBEInterval.HasValue && scap.ApprovedBEPerInterval.HasValue && scap.ApprovedBEInterval.Value == BS.Shared.SupportConceptApprovalInterval.Weekly)
|
||||
{
|
||||
if (scap.StartDate > bewilligungStart)
|
||||
{
|
||||
bewilligungStart = scap.StartDate.Value;
|
||||
var wochenBudget = scap.ApprovedBEPerInterval ?? 0;
|
||||
|
||||
ro.ApprovedFLSPerWeek = wochenBudget;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private double BerechneStundenProWoche(ServicesOverviewRO ro, DateTime datum)
|
||||
{
|
||||
if (ro.SupportConceptCostBearer != null)
|
||||
@@ -306,7 +321,7 @@ namespace AkggMid
|
||||
{
|
||||
if (ap.StartDate <= datum.Date && ap.EndDate >= datum.Date && ap.ApprovedBEInterval.Value == BS.Shared.SupportConceptApprovalInterval.Weekly)
|
||||
{
|
||||
|
||||
|
||||
var wochenBudget = ap.ApprovedBEPerInterval ?? 0;
|
||||
|
||||
decimal prozentualeBetreuung = 0;
|
||||
@@ -325,7 +340,7 @@ namespace AkggMid
|
||||
|
||||
wochenGesamtBudget += wochenBudget;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (wochenGesamtBudget > 0)
|
||||
{
|
||||
return (double)Math.Round(wochenGesamtBudget, 2, MidpointRounding.AwayFromZero);
|
||||
@@ -334,6 +349,7 @@ namespace AkggMid
|
||||
|
||||
return (double)ro.ApprovedFLSPerWeek;
|
||||
}
|
||||
|
||||
|
||||
private List<long> Get1Zu2BetreuungCustomerOids()
|
||||
{
|
||||
@@ -642,14 +658,14 @@ where scap2e.EmployeeOid = {0} and scap.Start <= '{1:yyyy-MM-dd}' and scap.EndDa
|
||||
|
||||
info.NummerAbrechenbarerTag = gesamtAnzahl;
|
||||
|
||||
info.AbwesenheitsNotiz = String.Format("Tag {0:0}/{1:0} (Abwesenheit gem. §6 LV)", info.NummerAbrechenbarerTag, maxAnzahl);
|
||||
info.AbwesenheitsNotiz = String.Format("Tag {0:0}/{1:0} (Abwesenheit gem. § 6 LV)", info.NummerAbrechenbarerTag, maxAnzahl);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (at.AbsenceReason.Description.Contains("<24h_SA"))
|
||||
{
|
||||
info.AbwesenheitsNotiz = "Abwesenheit gem. §8 Ziff3 LV";
|
||||
info.AbwesenheitsNotiz = "Abwesenheit gem. § 8 Ziff. 3 LV";
|
||||
}
|
||||
if (istTandem && !istAbrechenbar)
|
||||
{
|
||||
|
||||
@@ -66,7 +66,9 @@ namespace AkggMid
|
||||
}
|
||||
}
|
||||
if (betreuungsartSb.ToString().Contains("Wegbegleitung"))
|
||||
{
|
||||
lblWegbegleitung.Text = String.Format("Kostenzusicherung: bis zu {0:0.00} Stunden pro Woche (incl.Wegbegleitung)", pRO.ApprovedFLSPerWeek);
|
||||
}
|
||||
}
|
||||
|
||||
this.bindingSource1.DataSource = pRO;
|
||||
|
||||
@@ -73,9 +73,9 @@ namespace AkggMid
|
||||
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.fieldStd = new DevExpress.XtraReports.UI.CalculatedField();
|
||||
this.fieldTotalStd = new DevExpress.XtraReports.UI.CalculatedField();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
|
||||
@@ -94,7 +94,8 @@ namespace AkggMid
|
||||
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
|
||||
this.xrTableDetail.Name = "xrTableDetail";
|
||||
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 1, 0, 100F);
|
||||
@@ -122,7 +123,8 @@ namespace AkggMid
|
||||
//
|
||||
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateString")});
|
||||
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell7.Name = "xrTableCell7";
|
||||
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
|
||||
this.xrTableCell7.StylePriority.UseFont = false;
|
||||
@@ -135,7 +137,8 @@ namespace AkggMid
|
||||
//
|
||||
this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
|
||||
this.xrTableCell33.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell33.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell33.Name = "xrTableCell33";
|
||||
this.xrTableCell33.StylePriority.UseFont = false;
|
||||
this.xrTableCell33.StylePriority.UseTextAlignment = false;
|
||||
@@ -146,7 +149,8 @@ namespace AkggMid
|
||||
//
|
||||
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldStd", "{0:0.00}")});
|
||||
this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell10.FormattingRules.Add(this.ruleIstWochensumme);
|
||||
this.xrTableCell10.Name = "xrTableCell10";
|
||||
this.xrTableCell10.StylePriority.UseFont = false;
|
||||
@@ -158,14 +162,16 @@ namespace AkggMid
|
||||
//
|
||||
this.ruleIstWochensumme.Condition = "[IstFerien]";
|
||||
this.ruleIstWochensumme.DataMember = "Services";
|
||||
this.ruleIstWochensumme.Formatting.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.ruleIstWochensumme.Formatting.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.ruleIstWochensumme.Name = "ruleIstWochensumme";
|
||||
//
|
||||
// xrTableCell8
|
||||
//
|
||||
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")});
|
||||
this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell8.FormattingRules.Add(this.ruleIstWochensumme);
|
||||
this.xrTableCell8.Multiline = true;
|
||||
this.xrTableCell8.Name = "xrTableCell8";
|
||||
@@ -279,7 +285,7 @@ namespace AkggMid
|
||||
this.xrLabel9.StylePriority.UseBorders = false;
|
||||
this.xrLabel9.StylePriority.UseFont = false;
|
||||
this.xrLabel9.StylePriority.UseTextAlignment = false;
|
||||
this.xrLabel9.Text = "!!! Wenn das Kind krank oder abwesend ist - bitte den Tag ankreuzen !!!";
|
||||
this.xrLabel9.Text = "[Costbearer] / Bewilligungszeitraum [ApprovedStartDate]-[ApprovedEndDate]";
|
||||
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
||||
//
|
||||
// lblWegbegleitung
|
||||
@@ -327,7 +333,8 @@ namespace AkggMid
|
||||
//
|
||||
this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrTableDetail});
|
||||
this.Detail3.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.Detail3.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.Detail3.HeightF = 20F;
|
||||
this.Detail3.Name = "Detail3";
|
||||
this.Detail3.StylePriority.UseFont = false;
|
||||
@@ -336,7 +343,8 @@ namespace AkggMid
|
||||
//
|
||||
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrTable1});
|
||||
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.GroupHeader1.HeightF = 40F;
|
||||
this.GroupHeader1.Name = "GroupHeader1";
|
||||
this.GroupHeader1.StylePriority.UseFont = false;
|
||||
@@ -448,7 +456,8 @@ namespace AkggMid
|
||||
this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.Left;
|
||||
this.xrTableCell1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrPictureBox1});
|
||||
this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell1.Name = "xrTableCell1";
|
||||
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F);
|
||||
this.xrTableCell1.StylePriority.UseBorders = false;
|
||||
@@ -463,7 +472,7 @@ namespace AkggMid
|
||||
//
|
||||
this.xrPictureBox1.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")});
|
||||
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")});
|
||||
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(41.25F, 9.999974F);
|
||||
this.xrPictureBox1.Name = "xrPictureBox1";
|
||||
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(178.75F, 50.00007F);
|
||||
@@ -487,7 +496,8 @@ namespace AkggMid
|
||||
this.xrTableCell14.Borders = DevExpress.XtraPrinting.BorderSide.Right;
|
||||
this.xrTableCell14.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrPictureBox2});
|
||||
this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell14.Name = "xrTableCell14";
|
||||
this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F);
|
||||
this.xrTableCell14.StylePriority.UseBorders = false;
|
||||
@@ -502,7 +512,7 @@ namespace AkggMid
|
||||
//
|
||||
this.xrPictureBox2.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Image", null, "CustomerSignature")});
|
||||
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")});
|
||||
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(93.54172F, 9.999974F);
|
||||
this.xrPictureBox2.Name = "xrPictureBox2";
|
||||
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(198.9585F, 50F);
|
||||
@@ -564,6 +574,10 @@ namespace AkggMid
|
||||
this.xrLabel1.Text = "Summe der gel. Stunden: [TotalFLS!0.00]";
|
||||
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
|
||||
//
|
||||
// bindingSource1
|
||||
//
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
|
||||
//
|
||||
// fieldStd
|
||||
//
|
||||
this.fieldStd.DataMember = "Services";
|
||||
@@ -577,10 +591,6 @@ namespace AkggMid
|
||||
this.fieldTotalStd.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
|
||||
this.fieldTotalStd.Name = "fieldTotalStd";
|
||||
//
|
||||
// bindingSource1
|
||||
//
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
|
||||
//
|
||||
// LeistungsnachweisSozialamt
|
||||
//
|
||||
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
|
||||
@@ -595,11 +605,12 @@ namespace AkggMid
|
||||
this.fieldTotalStd});
|
||||
this.DataSource = this.bindingSource1;
|
||||
this.DisplayName = "Stundenzettel";
|
||||
this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
|
||||
this.ruleIstFerien,
|
||||
this.ruleIstWochensumme});
|
||||
this.Margins = new DevExpress.Drawing.DXMargins(40, 40, 50, 40);
|
||||
this.Margins = new DevExpress.Drawing.DXMargins(40F, 40F, 50F, 40F);
|
||||
this.PageHeight = 1169;
|
||||
this.PageWidth = 827;
|
||||
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
|
||||
@@ -608,7 +619,7 @@ namespace AkggMid
|
||||
this.FieldCaption,
|
||||
this.PageInfo,
|
||||
this.DataField});
|
||||
this.Version = "17.1";
|
||||
this.Version = "23.2";
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
|
||||
|
||||
@@ -117,7 +117,4 @@
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
@@ -96,7 +96,8 @@ namespace AkggMid
|
||||
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
|
||||
this.xrTableDetail.Name = "xrTableDetail";
|
||||
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 1, 0, 100F);
|
||||
@@ -125,7 +126,8 @@ namespace AkggMid
|
||||
//
|
||||
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateString")});
|
||||
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell7.Name = "xrTableCell7";
|
||||
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
|
||||
this.xrTableCell7.StylePriority.UseFont = false;
|
||||
@@ -138,7 +140,8 @@ namespace AkggMid
|
||||
//
|
||||
this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
|
||||
this.xrTableCell33.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell33.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell33.Name = "xrTableCell33";
|
||||
this.xrTableCell33.StylePriority.UseFont = false;
|
||||
this.xrTableCell33.StylePriority.UseTextAlignment = false;
|
||||
@@ -149,7 +152,8 @@ namespace AkggMid
|
||||
//
|
||||
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldStd", "{0:0.00}")});
|
||||
this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell10.FormattingRules.Add(this.ruleIstWochensumme);
|
||||
this.xrTableCell10.Name = "xrTableCell10";
|
||||
this.xrTableCell10.StylePriority.UseFont = false;
|
||||
@@ -161,14 +165,16 @@ namespace AkggMid
|
||||
//
|
||||
this.ruleIstWochensumme.Condition = "[IstFerien]";
|
||||
this.ruleIstWochensumme.DataMember = "Services";
|
||||
this.ruleIstWochensumme.Formatting.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.ruleIstWochensumme.Formatting.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.ruleIstWochensumme.Name = "ruleIstWochensumme";
|
||||
//
|
||||
// xrTableCell11
|
||||
//
|
||||
this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice3")});
|
||||
this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell11.Multiline = true;
|
||||
this.xrTableCell11.Name = "xrTableCell11";
|
||||
this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 1, 0, 100F);
|
||||
@@ -182,7 +188,8 @@ namespace AkggMid
|
||||
//
|
||||
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")});
|
||||
this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell8.FormattingRules.Add(this.ruleIstWochensumme);
|
||||
this.xrTableCell8.Multiline = true;
|
||||
this.xrTableCell8.Name = "xrTableCell8";
|
||||
@@ -296,7 +303,7 @@ namespace AkggMid
|
||||
this.xrLabel9.StylePriority.UseBorders = false;
|
||||
this.xrLabel9.StylePriority.UseFont = false;
|
||||
this.xrLabel9.StylePriority.UseTextAlignment = false;
|
||||
this.xrLabel9.Text = "!!! Wenn das Kind krank oder abwesend ist - bitte den Tag ankreuzen !!!";
|
||||
this.xrLabel9.Text = "[Costbearer] / Bewilligungszeitraum [ApprovedStartDate]-[ApprovedEndDate]";
|
||||
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
||||
//
|
||||
// lblWegbegleitung
|
||||
@@ -344,7 +351,8 @@ namespace AkggMid
|
||||
//
|
||||
this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrTableDetail});
|
||||
this.Detail3.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.Detail3.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.Detail3.HeightF = 20F;
|
||||
this.Detail3.Name = "Detail3";
|
||||
this.Detail3.StylePriority.UseFont = false;
|
||||
@@ -353,7 +361,8 @@ namespace AkggMid
|
||||
//
|
||||
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrTable1});
|
||||
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.GroupHeader1.HeightF = 40F;
|
||||
this.GroupHeader1.Name = "GroupHeader1";
|
||||
this.GroupHeader1.StylePriority.UseFont = false;
|
||||
@@ -474,7 +483,8 @@ namespace AkggMid
|
||||
this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.Left;
|
||||
this.xrTableCell1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrPictureBox1});
|
||||
this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell1.Name = "xrTableCell1";
|
||||
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F);
|
||||
this.xrTableCell1.StylePriority.UseBorders = false;
|
||||
@@ -489,7 +499,7 @@ namespace AkggMid
|
||||
//
|
||||
this.xrPictureBox1.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")});
|
||||
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")});
|
||||
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(20F, 9.999974F);
|
||||
this.xrPictureBox1.Name = "xrPictureBox1";
|
||||
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(240.625F, 50.00006F);
|
||||
@@ -513,7 +523,8 @@ namespace AkggMid
|
||||
this.xrTableCell14.Borders = DevExpress.XtraPrinting.BorderSide.Right;
|
||||
this.xrTableCell14.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrPictureBox2});
|
||||
this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell14.Name = "xrTableCell14";
|
||||
this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F);
|
||||
this.xrTableCell14.StylePriority.UseBorders = false;
|
||||
@@ -528,7 +539,7 @@ namespace AkggMid
|
||||
//
|
||||
this.xrPictureBox2.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Image", null, "CustomerSignature")});
|
||||
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")});
|
||||
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(53.95839F, 9.999974F);
|
||||
this.xrPictureBox2.Name = "xrPictureBox2";
|
||||
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(252.0834F, 50.00006F);
|
||||
@@ -621,11 +632,12 @@ namespace AkggMid
|
||||
this.fieldTotalStd});
|
||||
this.DataSource = this.bindingSource1;
|
||||
this.DisplayName = "Stundenzettel";
|
||||
this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
|
||||
this.ruleIstFerien,
|
||||
this.ruleIstWochensumme});
|
||||
this.Margins = new DevExpress.Drawing.DXMargins(40, 40, 50, 40);
|
||||
this.Margins = new DevExpress.Drawing.DXMargins(40F, 40F, 50F, 40F);
|
||||
this.PageHeight = 1169;
|
||||
this.PageWidth = 827;
|
||||
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
|
||||
@@ -634,7 +646,7 @@ namespace AkggMid
|
||||
this.FieldCaption,
|
||||
this.PageInfo,
|
||||
this.DataField});
|
||||
this.Version = "17.1";
|
||||
this.Version = "23.2";
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
|
||||
|
||||
@@ -117,7 +117,4 @@
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
@@ -24,7 +24,7 @@ namespace AkggMid
|
||||
public void SetReportDataSource(ServicesOverviewRO pRO)
|
||||
{
|
||||
var helper = new LeistungsnachweisHelper(pRO, true);
|
||||
|
||||
|
||||
String schuljahr = "";
|
||||
if (pRO.StartDate < new DateTime(2023, 8, 1))
|
||||
{
|
||||
|
||||
@@ -98,7 +98,8 @@ namespace AkggMid
|
||||
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
|
||||
this.xrTableDetail.Name = "xrTableDetail";
|
||||
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 1, 0, 100F);
|
||||
@@ -128,7 +129,8 @@ namespace AkggMid
|
||||
//
|
||||
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateString")});
|
||||
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell7.Name = "xrTableCell7";
|
||||
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
|
||||
this.xrTableCell7.StylePriority.UseFont = false;
|
||||
@@ -141,7 +143,8 @@ namespace AkggMid
|
||||
//
|
||||
this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
|
||||
this.xrTableCell33.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell33.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell33.Name = "xrTableCell33";
|
||||
this.xrTableCell33.StylePriority.UseFont = false;
|
||||
this.xrTableCell33.StylePriority.UseTextAlignment = false;
|
||||
@@ -152,7 +155,8 @@ namespace AkggMid
|
||||
//
|
||||
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldStd", "{0:0.00}")});
|
||||
this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell10.FormattingRules.Add(this.ruleIstWochensumme);
|
||||
this.xrTableCell10.Name = "xrTableCell10";
|
||||
this.xrTableCell10.StylePriority.UseFont = false;
|
||||
@@ -164,14 +168,16 @@ namespace AkggMid
|
||||
//
|
||||
this.ruleIstWochensumme.Condition = "[IstFerien]";
|
||||
this.ruleIstWochensumme.DataMember = "Services";
|
||||
this.ruleIstWochensumme.Formatting.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.ruleIstWochensumme.Formatting.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.ruleIstWochensumme.Name = "ruleIstWochensumme";
|
||||
//
|
||||
// xrTableCell9
|
||||
//
|
||||
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice4", "{0:0.00}")});
|
||||
this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell9.Multiline = true;
|
||||
this.xrTableCell9.Name = "xrTableCell9";
|
||||
this.xrTableCell9.StylePriority.UseFont = false;
|
||||
@@ -183,7 +189,8 @@ namespace AkggMid
|
||||
//
|
||||
this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice3")});
|
||||
this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell11.Multiline = true;
|
||||
this.xrTableCell11.Name = "xrTableCell11";
|
||||
this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 1, 0, 100F);
|
||||
@@ -197,7 +204,8 @@ namespace AkggMid
|
||||
//
|
||||
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")});
|
||||
this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell8.FormattingRules.Add(this.ruleIstWochensumme);
|
||||
this.xrTableCell8.Multiline = true;
|
||||
this.xrTableCell8.Name = "xrTableCell8";
|
||||
@@ -311,7 +319,7 @@ namespace AkggMid
|
||||
this.xrLabel9.StylePriority.UseBorders = false;
|
||||
this.xrLabel9.StylePriority.UseFont = false;
|
||||
this.xrLabel9.StylePriority.UseTextAlignment = false;
|
||||
this.xrLabel9.Text = "!!! Wenn das Kind krank oder abwesend ist - bitte den Tag ankreuzen !!!";
|
||||
this.xrLabel9.Text = "[Costbearer] / Bewilligungszeitraum [ApprovedStartDate]-[ApprovedEndDate]";
|
||||
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
||||
//
|
||||
// lblWegbegleitung
|
||||
@@ -359,7 +367,8 @@ namespace AkggMid
|
||||
//
|
||||
this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrTableDetail});
|
||||
this.Detail3.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.Detail3.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.Detail3.HeightF = 20F;
|
||||
this.Detail3.Name = "Detail3";
|
||||
this.Detail3.StylePriority.UseFont = false;
|
||||
@@ -368,7 +377,8 @@ namespace AkggMid
|
||||
//
|
||||
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrTable1});
|
||||
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.GroupHeader1.HeightF = 40F;
|
||||
this.GroupHeader1.Name = "GroupHeader1";
|
||||
this.GroupHeader1.StylePriority.UseFont = false;
|
||||
@@ -498,7 +508,8 @@ namespace AkggMid
|
||||
this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.Left;
|
||||
this.xrTableCell1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrPictureBox1});
|
||||
this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell1.Name = "xrTableCell1";
|
||||
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(10, 0, 0, 0, 100F);
|
||||
this.xrTableCell1.StylePriority.UseBorders = false;
|
||||
@@ -513,7 +524,7 @@ namespace AkggMid
|
||||
//
|
||||
this.xrPictureBox1.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")});
|
||||
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")});
|
||||
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(32.5F, 9.999949F);
|
||||
this.xrPictureBox1.Name = "xrPictureBox1";
|
||||
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(187.5F, 50.00006F);
|
||||
@@ -537,7 +548,8 @@ namespace AkggMid
|
||||
this.xrTableCell14.Borders = DevExpress.XtraPrinting.BorderSide.Right;
|
||||
this.xrTableCell14.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrPictureBox2});
|
||||
this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell14.Name = "xrTableCell14";
|
||||
this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F);
|
||||
this.xrTableCell14.StylePriority.UseBorders = false;
|
||||
@@ -552,7 +564,7 @@ namespace AkggMid
|
||||
//
|
||||
this.xrPictureBox2.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
|
||||
new DevExpress.XtraReports.UI.XRBinding("Image", null, "CustomerSignature")});
|
||||
new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")});
|
||||
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(47.70839F, 9.999974F);
|
||||
this.xrPictureBox2.Name = "xrPictureBox2";
|
||||
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(229.1667F, 50.00006F);
|
||||
@@ -645,11 +657,12 @@ namespace AkggMid
|
||||
this.fieldTotalStd});
|
||||
this.DataSource = this.bindingSource1;
|
||||
this.DisplayName = "Stundenzettel";
|
||||
this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
|
||||
this.ruleIstFerien,
|
||||
this.ruleIstWochensumme});
|
||||
this.Margins = new DevExpress.Drawing.DXMargins(40, 40, 50, 40);
|
||||
this.Margins = new DevExpress.Drawing.DXMargins(40F, 40F, 50F, 40F);
|
||||
this.PageHeight = 1169;
|
||||
this.PageWidth = 827;
|
||||
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
|
||||
@@ -658,7 +671,7 @@ namespace AkggMid
|
||||
this.FieldCaption,
|
||||
this.PageInfo,
|
||||
this.DataField});
|
||||
this.Version = "17.1";
|
||||
this.Version = "23.2";
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
|
||||
|
||||
@@ -117,7 +117,4 @@
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
@@ -0,0 +1 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
70
ReportImp/AkggMid/Service/CustomVertretungsManager.cs
Normal file
70
ReportImp/AkggMid/Service/CustomVertretungsManager.cs
Normal file
@@ -0,0 +1,70 @@
|
||||
using BeWo.Data.Access;
|
||||
using BeWo.Data.Entities;
|
||||
using BeWo.Service.DCEntityMapper;
|
||||
using BeWo.Service.Plugins;
|
||||
using BeWo.Service.SBD;
|
||||
using BS.Shared;
|
||||
using BS.Shared.DataContracts;
|
||||
using BS.Shared.DataContracts.Compact;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
|
||||
namespace AkggMid.Service
|
||||
{
|
||||
public class CustomVertretungsManager : VertretungsManager
|
||||
{
|
||||
public override List<VertretungsItemDC> CreateVertretungsListe(DateTime start, DateTime end)
|
||||
{
|
||||
var liste = base.CreateVertretungsListe(start, end);
|
||||
|
||||
return liste;
|
||||
}
|
||||
|
||||
public override List<CompactVertreterEmployeeDC> SucheVertreter(VertreterSucheFilterDC filter)
|
||||
{
|
||||
var allEmps = DAOFactory.GenericDAO.GetAllActive<Employee>().ToList();
|
||||
List<CompactVertreterEmployeeDC> result = new List<CompactVertreterEmployeeDC>();
|
||||
var end = filter.EndDate.Date.AddDays(1).AddTicks(-1);
|
||||
var absenceTimes = DAOFactory.SearchDAO.FindAbsenceTimes(filter.StartDate, end).ToList();
|
||||
var vertretungen = DAOFactory.SearchDAO.FindVertretungen(filter.StartDate, end).Where(v => v.VertretenderMitarbeiterOid.HasValue).ToList();
|
||||
var employeeAbsenceTimes = absenceTimes.Where(a => a.EmployeeOid.HasValue).ToList();
|
||||
|
||||
foreach (var emp in allEmps)
|
||||
{
|
||||
//Prüfe ob es ein Schulbegleiter ist
|
||||
if (IstSchulbegleiter(emp, filter.StartDate))
|
||||
{
|
||||
//alle Mitarbeiter, die nicht abwesend sind oder bereits jemand anderen vertreten hinzufügen
|
||||
var at = employeeAbsenceTimes.FirstOrDefault(a => a.EmployeeOid == emp.Oid);
|
||||
var vertretung = vertretungen.FirstOrDefault(v => v.VertretenderMitarbeiterOid == emp.Oid);
|
||||
if (at == null && vertretung == null)
|
||||
{
|
||||
var vitem = MapperFactory.CompactVertreterEmployeeDC_VertreterEmployee.MapToNewDC(emp);
|
||||
result.Add(vitem);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private bool IstSchulbegleiter(Employee emp, DateTime datum)
|
||||
{
|
||||
var c = emp.GetValidContractForDate(datum);
|
||||
if (c != null && c.EmploymentType != null && c.EmploymentType.Name == "Schulassistenz") //Schulbegleitung, Schulassistenz etc.
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ namespace AwoWesel
|
||||
{
|
||||
foreach (var ii in sip.ServiceInvoiceItems)
|
||||
{
|
||||
if (!ii.ServiceDescription.StartsWith("Rechnungsdifferenz"))
|
||||
if (String.IsNullOrEmpty(ii.ServiceDescription) || !ii.ServiceDescription.StartsWith("Rechnungsdifferenz"))
|
||||
{
|
||||
ii.ServiceDescription = "Fachleistungsstunden";
|
||||
SetzeZeitraum(pRO, sip);
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -107,7 +107,7 @@ namespace BewegtSystemischeBeratung
|
||||
//
|
||||
// ReportHeader
|
||||
//
|
||||
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
|
||||
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
|
||||
this.ReportHeader.HeightF = 0F;
|
||||
this.ReportHeader.Name = "ReportHeader";
|
||||
this.ReportHeader.StylePriority.UseFont = false;
|
||||
@@ -131,13 +131,12 @@ namespace BewegtSystemischeBeratung
|
||||
this.xrRichText3,
|
||||
this.xrRichText2,
|
||||
this.xrLine1});
|
||||
this.bottomMarginBand1.HeightF = 100F;
|
||||
this.bottomMarginBand1.Name = "bottomMarginBand1";
|
||||
//
|
||||
// xrRichText5
|
||||
//
|
||||
this.xrRichText5.BorderColor = System.Drawing.Color.Black;
|
||||
this.xrRichText5.Font = new System.Drawing.Font("Calibri", 8F);
|
||||
this.xrRichText5.Font = new DevExpress.Drawing.DXFont("Calibri", 8F);
|
||||
this.xrRichText5.LocationFloat = new DevExpress.Utils.PointFloat(458.7499F, 10.00002F);
|
||||
this.xrRichText5.Name = "xrRichText5";
|
||||
this.xrRichText5.SerializableRtfString = resources.GetString("xrRichText5.SerializableRtfString");
|
||||
@@ -148,7 +147,7 @@ namespace BewegtSystemischeBeratung
|
||||
// xrRichText4
|
||||
//
|
||||
this.xrRichText4.BorderColor = System.Drawing.Color.Black;
|
||||
this.xrRichText4.Font = new System.Drawing.Font("Calibri", 8F);
|
||||
this.xrRichText4.Font = new DevExpress.Drawing.DXFont("Calibri", 8F);
|
||||
this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(300F, 10.00002F);
|
||||
this.xrRichText4.Name = "xrRichText4";
|
||||
this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
|
||||
@@ -159,7 +158,7 @@ namespace BewegtSystemischeBeratung
|
||||
// xrRichText3
|
||||
//
|
||||
this.xrRichText3.BorderColor = System.Drawing.Color.Black;
|
||||
this.xrRichText3.Font = new System.Drawing.Font("Calibri", 8F);
|
||||
this.xrRichText3.Font = new DevExpress.Drawing.DXFont("Calibri", 8F);
|
||||
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(183.0555F, 10.00002F);
|
||||
this.xrRichText3.Name = "xrRichText3";
|
||||
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
|
||||
@@ -170,7 +169,7 @@ namespace BewegtSystemischeBeratung
|
||||
// xrRichText2
|
||||
//
|
||||
this.xrRichText2.BorderColor = System.Drawing.Color.Black;
|
||||
this.xrRichText2.Font = new System.Drawing.Font("Calibri", 8F);
|
||||
this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Calibri", 8F);
|
||||
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00002F);
|
||||
this.xrRichText2.Name = "xrRichText2";
|
||||
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
|
||||
@@ -373,7 +372,8 @@ namespace BewegtSystemischeBeratung
|
||||
//
|
||||
// lblMitarbeiter
|
||||
//
|
||||
this.lblMitarbeiter.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblMitarbeiter.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.lblMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(0F, 335F);
|
||||
this.lblMitarbeiter.Name = "lblMitarbeiter";
|
||||
this.lblMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
@@ -395,7 +395,7 @@ namespace BewegtSystemischeBeratung
|
||||
// xrRichText1
|
||||
//
|
||||
this.xrRichText1.BorderColor = System.Drawing.Color.Black;
|
||||
this.xrRichText1.Font = new System.Drawing.Font("Calibri", 8F);
|
||||
this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Calibri", 8F);
|
||||
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 141.1111F);
|
||||
this.xrRichText1.Name = "xrRichText1";
|
||||
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
|
||||
@@ -697,14 +697,15 @@ namespace BewegtSystemischeBeratung
|
||||
this.DetailReport});
|
||||
this.DataSource = this.bindingSource1;
|
||||
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
|
||||
this.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
|
||||
this.ruleRateFactorNull});
|
||||
this.Margins = new System.Drawing.Printing.Margins(75, 40, 60, 100);
|
||||
this.Margins = new DevExpress.Drawing.DXMargins(75F, 40F, 60F, 100F);
|
||||
this.PageHeight = 1169;
|
||||
this.PageWidth = 827;
|
||||
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
|
||||
this.Version = "17.1";
|
||||
this.Version = "23.2";
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
|
||||
|
||||
@@ -140,7 +140,4 @@ Den Nachweis der geleisteten Fachleistungsstunden entnehmen Sie bitte der Anlage
|
||||
Mit freundlichem Gruß
|
||||
Kathrin Lilly</value>
|
||||
</data>
|
||||
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
88
ReportImp/HPHBersenbrueck/CustomReportCreator.cs
Normal file
88
ReportImp/HPHBersenbrueck/CustomReportCreator.cs
Normal file
@@ -0,0 +1,88 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Runtime.Remoting.Messaging;
|
||||
using System.Text;
|
||||
using System.Windows.Forms;
|
||||
using BeWo.Data.Access;
|
||||
using BeWo.Data.Entities;
|
||||
using BeWo.Report;
|
||||
using BeWo.Report.ReportObjects;
|
||||
using BS.Shared.Core;
|
||||
using DevExpress.XtraReports.UI;
|
||||
|
||||
namespace HphBersenbrueck
|
||||
{
|
||||
|
||||
public class CustomReportCreator : DefaultReportCreator
|
||||
{
|
||||
public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
|
||||
{
|
||||
List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay);
|
||||
|
||||
if (lROs.Count > 0)
|
||||
{
|
||||
var rootReport = CreateServicesOverviewReportForRo(lROs[0]);
|
||||
rootReport.CreateDocument();
|
||||
|
||||
for (int i = 1; i < lROs.Count; i++)
|
||||
{
|
||||
var lNext = CreateServicesOverviewReportForRo(lROs[i]);
|
||||
lNext.CreateDocument();
|
||||
rootReport.Pages.AddRange(lNext.Pages);
|
||||
}
|
||||
|
||||
return rootReport;
|
||||
}
|
||||
return new XtraReport();
|
||||
}
|
||||
|
||||
public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
|
||||
{
|
||||
var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
|
||||
|
||||
return CreateServicesOverviewReportForRo(ro);
|
||||
|
||||
}
|
||||
|
||||
|
||||
private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro)
|
||||
{
|
||||
bool neu = false;
|
||||
|
||||
|
||||
|
||||
if (ro.Services != null)
|
||||
{
|
||||
foreach (ServicesOverviewRO.ServiceDetail s in ro.Services)
|
||||
{
|
||||
if (s.ServiceCategory.Contains("Neu Qualifizierte Assistenz"))
|
||||
{
|
||||
neu = true;
|
||||
}
|
||||
//}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
IBeWoReport<ServicesOverviewRO> qb;
|
||||
if (neu)
|
||||
{
|
||||
qb = new BeWo.HPHBersenbrueck.QuittierungsbelegHannover();
|
||||
}
|
||||
else
|
||||
{
|
||||
qb = new BeWo.HPHBersenbrueck.Stundenzettel();
|
||||
}
|
||||
|
||||
qb.SetReportDataSource(ro);
|
||||
|
||||
return qb as XtraReport;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -137,7 +137,7 @@ CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber
|
||||
}
|
||||
//03002022021500070EURO990037107S000001767690004050 15022200037810037200 RE R03-781 DAK-Gesundhei 00000000
|
||||
sb.Append("0300");
|
||||
sb.Append(String.Format("{0:yyyyMMdd}", data.Datum));
|
||||
sb.Append(String.Format("{0:yyyyMMdd}", data.Datum)); //
|
||||
sb.Append("00070");
|
||||
sb.Append("EURO99");
|
||||
|
||||
|
||||
@@ -71,6 +71,7 @@
|
||||
<Compile Include="CustomerDataReport.Designer.cs">
|
||||
<DependentUpon>CustomerDataReport.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="CustomReportCreator.cs" />
|
||||
<Compile Include="Export\CustomDataExporter.cs" />
|
||||
<Compile Include="Export\MicosExporter.cs" />
|
||||
<Compile Include="Finanzauswertung.cs">
|
||||
@@ -100,6 +101,12 @@
|
||||
<DependentUpon>Mitarbeiterauslastung.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="QuittierungsbelegHannover.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="QuittierungsbelegHannover.Designer.cs">
|
||||
<DependentUpon>QuittierungsbelegHannover.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="RechnungSelbstzahler.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
@@ -148,6 +155,10 @@
|
||||
<DependentUpon>Mitarbeiterauslastung.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Properties\licenses.licx" />
|
||||
<EmbeddedResource Include="QuittierungsbelegHannover.resx">
|
||||
<DependentUpon>QuittierungsbelegHannover.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="RechnungSelbstzahler.resx">
|
||||
<DependentUpon>RechnungSelbstzahler.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
1388
ReportImp/HPHBersenbrueck/QuittierungsbelegHannover.Designer.cs
generated
Normal file
1388
ReportImp/HPHBersenbrueck/QuittierungsbelegHannover.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
203
ReportImp/HPHBersenbrueck/QuittierungsbelegHannover.cs
Normal file
203
ReportImp/HPHBersenbrueck/QuittierungsbelegHannover.cs
Normal file
@@ -0,0 +1,203 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
using BeWo.Data.Entities;
|
||||
using BeWo.Report;
|
||||
using BeWo.Report.ReportObjects;
|
||||
using BeWo.Service.DCEntityMapper;
|
||||
using BeWo.Service.ServiceImplementations;
|
||||
using BS.Shared;
|
||||
using BS.Shared.Core;
|
||||
using BS.Shared.DataContracts;
|
||||
using DevExpress.XtraReports.UI;
|
||||
|
||||
namespace BeWo.HPHBersenbrueck
|
||||
{
|
||||
public partial class QuittierungsbelegHannover : XtraReport, IBeWoReport<ServicesOverviewRO>
|
||||
{
|
||||
public QuittierungsbelegHannover()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
public void SetReportDataSource(ServicesOverviewRO pRO)
|
||||
{
|
||||
// Get calling method name
|
||||
//StackTrace stackTrace = new StackTrace();
|
||||
//Debug.WriteLine(stackTrace.GetFrame(1).GetMethod().Name);
|
||||
|
||||
bool hatGruppen = false;
|
||||
double minuten = 0;
|
||||
CostRatePeriod currentFLSUnit = null;
|
||||
|
||||
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
|
||||
{
|
||||
var cr = pRO.CostBearer2SupportConceptList[0].CostBearer.CostRatePeriods.Where(p => p.CostRateType == CostRatePeriodType.MinutesPerServiceUnit).OrderBy(c => c.EndDate).ToList();
|
||||
currentFLSUnit = cr.FirstOrDefault(c => c.EndDate >= pRO.EndDate);
|
||||
if (currentFLSUnit == null)
|
||||
currentFLSUnit = cr[0];
|
||||
}
|
||||
if (pRO.Services != null)
|
||||
{
|
||||
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
|
||||
int summeWegepauschalen = 0;
|
||||
int summeAusfallstunden = 0;
|
||||
foreach (var sd in pRO.Services)
|
||||
{
|
||||
sd.FLSQualified = sd.Minutes / 50;
|
||||
if (currentFLSUnit != null)
|
||||
{
|
||||
sd.FLSQualified = sd.MinutesQualified / Convert.ToDouble(currentFLSUnit.CostRateValue);
|
||||
}
|
||||
|
||||
if (sd.IsBillable && !sd.ServiceCategory.Contains("Fahrt"))
|
||||
{
|
||||
minuten += sd.Minutes;
|
||||
ServicesOverviewRO.CreateSignatureString(sd);
|
||||
|
||||
if (sd.IsGroup)
|
||||
{
|
||||
//sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
|
||||
hatGruppen = true;
|
||||
sd.Notice3 = "1";
|
||||
}
|
||||
else
|
||||
sd.Notice3 = "";
|
||||
|
||||
// Felder für Wegepauschale setzen (Wenn FLS FaceToFace, dann ja)
|
||||
if (sd.ServiceCategory.ToLower().Contains("fachleistungsstunde") && sd.ServiceDescription.ToLower().Contains("face to face"))
|
||||
{
|
||||
sd.Notice4 = "1";
|
||||
summeWegepauschalen++;
|
||||
}
|
||||
else
|
||||
sd.Notice4 = "";
|
||||
|
||||
// Felder für Ausfallstundnen setzen
|
||||
if (sd.ServiceDescription.ToLower().Contains("ausfallstunde"))
|
||||
{
|
||||
sd.Notice5 = "1";
|
||||
summeAusfallstunden++;
|
||||
}
|
||||
else
|
||||
sd.Notice5 = "";
|
||||
|
||||
servicesBillable.Add(sd);
|
||||
}
|
||||
}
|
||||
pRO.Services = servicesBillable;
|
||||
lblSummeWegepauschalen.Text = string.Format("{0:0}", summeWegepauschalen);
|
||||
lblSummeAusfallstunden.Text = string.Format("{0:0}", summeAusfallstunden);
|
||||
|
||||
}
|
||||
|
||||
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
|
||||
{
|
||||
var c2s = pRO.CostBearer2SupportConceptList[0];
|
||||
var dc = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(c2s);
|
||||
|
||||
foreach (var scap in dc.ApprovalPeriodList)
|
||||
{
|
||||
if (scap.ApprovedBEPerInterval.HasValue && scap.ApprovedBEInterval.HasValue && scap.ServiceCategory != null && scap.ServiceCategory.Name == pRO.Services[0].ServiceCategory)
|
||||
{
|
||||
lblBewilligtFls.Text = String.Format("{0:0.00}", scap.ApprovedBEPerInterval.Value);
|
||||
if (scap.ApprovedBEInterval.HasValue && scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Weekly)
|
||||
pRO.ApprovedFLSTotal = Convert.ToDecimal((scap.EndDate.Value - scap.StartDate.Value).TotalDays / 7) * scap.ApprovedBEPerInterval.Value;
|
||||
else if (scap.ApprovedBEInterval.HasValue && scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Monthly)
|
||||
pRO.ApprovedFLSTotal = Convert.ToDecimal(((scap.EndDate.Value - scap.StartDate.Value).TotalDays + 1) / 30.44) * scap.ApprovedBEPerInterval.Value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pRO.CalculateFLSSollIst2();
|
||||
pRO.TotalFLMBillable = minuten;
|
||||
if (currentFLSUnit != null)
|
||||
{
|
||||
pRO.TotalFLSQualified = pRO.TotalFLMQualified / Convert.ToDouble(currentFLSUnit.CostRateValue);
|
||||
|
||||
|
||||
lblRestbudget.Text = String.Format("{0:0.00}", pRO.ApprovedFLSTotal - pRO.MinutenGeleistetBisVormonat / currentFLSUnit.CostRateValue);
|
||||
}
|
||||
|
||||
bindingSource1.DataSource = pRO;
|
||||
}
|
||||
|
||||
private void picSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
|
||||
{
|
||||
XRPictureBox xrBox = sender as XRPictureBox;
|
||||
//var test = this.GetCurrent
|
||||
string base64String = xrBox.Tag as string;
|
||||
if (!String.IsNullOrWhiteSpace(base64String))
|
||||
{
|
||||
var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
|
||||
var binData = Convert.FromBase64String(base64Data);
|
||||
System.Drawing.Image img = ByteArrayToImage(binData);
|
||||
xrBox.Image = Utils.CropImage(img);
|
||||
}
|
||||
else
|
||||
{
|
||||
xrBox.Image = null;
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Wie anzeigen? Alle?
|
||||
private void EmployeeSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
|
||||
{
|
||||
return;
|
||||
|
||||
if (sender is XRPictureBox pictureBox)
|
||||
{
|
||||
var base64String = pictureBox.Tag as string;
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(base64String))
|
||||
{
|
||||
var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
|
||||
var binaryData = Convert.FromBase64String(base64Data);
|
||||
var image = ByteArrayToImage(binaryData);
|
||||
|
||||
pictureBox.Image = image;
|
||||
}
|
||||
else
|
||||
{
|
||||
pictureBox.Image = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Wie anzeigen? Alle?
|
||||
// TODO: Visibile der Datumstextboxen auf true setzen!
|
||||
private void CustomerSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
|
||||
{
|
||||
return;
|
||||
|
||||
if (sender is XRPictureBox pictureBox)
|
||||
{
|
||||
var base64String = pictureBox.Tag as string;
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(base64String))
|
||||
{
|
||||
var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
|
||||
var binaryData = Convert.FromBase64String(base64Data);
|
||||
var image = ByteArrayToImage(binaryData);
|
||||
|
||||
pictureBox.Image = image;
|
||||
}
|
||||
else
|
||||
{
|
||||
pictureBox.Image = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public System.Drawing.Image ByteArrayToImage(byte[] byteArrayIn)
|
||||
{
|
||||
using (var memoryStream = new MemoryStream(byteArrayIn))
|
||||
{
|
||||
return System.Drawing.Image.FromStream(memoryStream);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
120
ReportImp/HPHBersenbrueck/QuittierungsbelegHannover.resx
Normal file
120
ReportImp/HPHBersenbrueck/QuittierungsbelegHannover.resx
Normal file
@@ -0,0 +1,120 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
||||
@@ -98,15 +98,19 @@ namespace Hiba
|
||||
pRO.CalculateFLSSollIst2();
|
||||
|
||||
// Werte durch die FLS-Einheit teilen
|
||||
var cr = pRO.CostBearer2SupportConceptList[0].CostBearer.CostRatePeriods.Where(p => p.CostRateType == CostRatePeriodType.MinutesPerServiceUnit).OrderBy(c => c.EndDate).ToList();
|
||||
var crp = cr.FirstOrDefault(c => c.EndDate >= pRO.EndDate);
|
||||
if (crp == null)
|
||||
crp = cr[0];
|
||||
|
||||
decimal currentFLSUnit = 60;
|
||||
if (crp.CostRateValue.HasValue)
|
||||
currentFLSUnit = crp.CostRateValue.Value;
|
||||
|
||||
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
|
||||
{
|
||||
var cr = pRO.CostBearer2SupportConceptList[0].CostBearer.CostRatePeriods.Where(p => p.CostRateType == CostRatePeriodType.MinutesPerServiceUnit).OrderBy(c => c.EndDate).ToList();
|
||||
var crp = cr.FirstOrDefault(c => c.EndDate >= pRO.EndDate);
|
||||
if (crp == null && cr.Count > 0)
|
||||
crp = cr[0];
|
||||
|
||||
|
||||
if (crp != null && crp.CostRateValue.HasValue)
|
||||
currentFLSUnit = crp.CostRateValue.Value;
|
||||
}
|
||||
pRO.TotalFLMBillable = minuten;
|
||||
|
||||
lblGesamtMinUndStunden.Text = minuten + " = " + Math.Round(Convert.ToDecimal(minuten) / currentFLSUnit, 2) + " Std"; // Min = xx Std
|
||||
|
||||
@@ -116,6 +116,7 @@
|
||||
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Service\CustomEmployeeService.cs" />
|
||||
<Compile Include="Service\CustomTranslationDictionary.cs" />
|
||||
<Compile Include="Statistics\CustomServiceRecordStatisticFactory.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using BeWo.Service.Plugins;
|
||||
|
||||
namespace HphBersenbrueckAtz.Service
|
||||
{
|
||||
public class CustomTranslationDictionary : TranslationDictionary
|
||||
{
|
||||
public override Dictionary<String, String> GetTranslationDictionary()
|
||||
{
|
||||
var dict = base.GetTranslationDictionary();
|
||||
|
||||
AddOrReplaceTranslation(dict, "FLS/Woche", "FLS Bersenbrück");
|
||||
|
||||
AddOrReplaceTranslation(dict, "FLS/Monat", "FLS Diepholz");
|
||||
|
||||
return dict;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -137,13 +137,14 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
|
||||
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.lblAbtretung = new DevExpress.XtraReports.UI.XRLabel();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableMonat1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
|
||||
//
|
||||
// Detail
|
||||
//
|
||||
this.Detail.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
|
||||
this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.Detail.HeightF = 0F;
|
||||
this.Detail.Name = "Detail";
|
||||
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
@@ -716,21 +717,24 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// lblSummeKontingent
|
||||
//
|
||||
this.lblSummeKontingent.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblSummeKontingent.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.lblSummeKontingent.Name = "lblSummeKontingent";
|
||||
this.lblSummeKontingent.StylePriority.UseFont = false;
|
||||
this.lblSummeKontingent.Weight = 0.39017468854132809D;
|
||||
//
|
||||
// lblSummeErbracht
|
||||
//
|
||||
this.lblSummeErbracht.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblSummeErbracht.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.lblSummeErbracht.Name = "lblSummeErbracht";
|
||||
this.lblSummeErbracht.StylePriority.UseFont = false;
|
||||
this.lblSummeErbracht.Weight = 0.39017469011993239D;
|
||||
//
|
||||
// lblSummeDifferenz
|
||||
//
|
||||
this.lblSummeDifferenz.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblSummeDifferenz.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.lblSummeDifferenz.Name = "lblSummeDifferenz";
|
||||
this.lblSummeDifferenz.StylePriority.UseFont = false;
|
||||
this.lblSummeDifferenz.Weight = 0.39017469011993255D;
|
||||
@@ -758,7 +762,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.lblName,
|
||||
this.xrLabel14,
|
||||
this.xrLabel12});
|
||||
this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.ReportHeader.HeightF = 140F;
|
||||
this.ReportHeader.Name = "ReportHeader";
|
||||
this.ReportHeader.StylePriority.UseFont = false;
|
||||
@@ -793,7 +798,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.lblBeGesamt.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.lblBeGesamt.CanGrow = false;
|
||||
this.lblBeGesamt.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblBeGesamt.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.lblBeGesamt.LocationFloat = new DevExpress.Utils.PointFloat(500.0018F, 100F);
|
||||
this.lblBeGesamt.Name = "lblBeGesamt";
|
||||
this.lblBeGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
@@ -841,7 +847,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.lblBewilligteBe.BackColor = System.Drawing.Color.LightGray;
|
||||
this.lblBewilligteBe.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.lblBewilligteBe.CanGrow = false;
|
||||
this.lblBewilligteBe.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblBewilligteBe.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.lblBewilligteBe.LocationFloat = new DevExpress.Utils.PointFloat(100.0018F, 100F);
|
||||
this.lblBewilligteBe.Name = "lblBewilligteBe";
|
||||
this.lblBewilligteBe.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
|
||||
@@ -973,7 +980,6 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.xrLabel1,
|
||||
this.xrLabel8,
|
||||
this.xrPictureBox1});
|
||||
this.topMarginBand1.HeightF = 100F;
|
||||
this.topMarginBand1.Name = "topMarginBand1";
|
||||
this.topMarginBand1.StylePriority.UseFont = false;
|
||||
//
|
||||
@@ -985,7 +991,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// xrLabel11
|
||||
//
|
||||
this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(338.4165F, 52.08001F);
|
||||
this.xrLabel11.Multiline = true;
|
||||
this.xrLabel11.Name = "xrLabel11";
|
||||
@@ -997,7 +1004,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// xrLabel1
|
||||
//
|
||||
this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel1.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.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 27.08F);
|
||||
this.xrLabel1.Multiline = true;
|
||||
this.xrLabel1.Name = "xrLabel1";
|
||||
@@ -1021,7 +1029,7 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// xrPictureBox1
|
||||
//
|
||||
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
|
||||
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
|
||||
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(537.3123F, 27.08001F);
|
||||
this.xrPictureBox1.Name = "xrPictureBox1";
|
||||
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(72.39581F, 50F);
|
||||
@@ -1035,10 +1043,12 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
// ReportFooter
|
||||
//
|
||||
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.lblAbtretung,
|
||||
this.xrPanel4,
|
||||
this.xrPictureBox3});
|
||||
this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.ReportFooter.HeightF = 113.0209F;
|
||||
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.ReportFooter.HeightF = 122.1876F;
|
||||
this.ReportFooter.Name = "ReportFooter";
|
||||
this.ReportFooter.StylePriority.UseFont = false;
|
||||
//
|
||||
@@ -1052,13 +1062,14 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.xrLine4});
|
||||
this.xrPanel4.LocationFloat = new DevExpress.Utils.PointFloat(190.3117F, 0F);
|
||||
this.xrPanel4.Name = "xrPanel4";
|
||||
this.xrPanel4.SizeF = new System.Drawing.SizeF(419.3964F, 113.0209F);
|
||||
this.xrPanel4.SizeF = new System.Drawing.SizeF(419.3964F, 102.1876F);
|
||||
this.xrPanel4.StylePriority.UseBorders = false;
|
||||
//
|
||||
// donnerstagLabel
|
||||
//
|
||||
this.donnerstagLabel.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.donnerstagLabel.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.donnerstagLabel.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.donnerstagLabel.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 9.999974F);
|
||||
this.donnerstagLabel.Name = "donnerstagLabel";
|
||||
this.donnerstagLabel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
@@ -1072,14 +1083,14 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
// xrLine4
|
||||
//
|
||||
this.xrLine4.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.xrLine4.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 75.71831F);
|
||||
this.xrLine4.LocationFloat = new DevExpress.Utils.PointFloat(9.999985F, 62.17667F);
|
||||
this.xrLine4.Name = "xrLine4";
|
||||
this.xrLine4.SizeF = new System.Drawing.SizeF(397.3129F, 23F);
|
||||
this.xrLine4.StylePriority.UseBorders = false;
|
||||
//
|
||||
// xrPictureBox3
|
||||
//
|
||||
this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image")));
|
||||
this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
|
||||
this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 45.00001F);
|
||||
this.xrPictureBox3.Name = "xrPictureBox3";
|
||||
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(160F, 68.02F);
|
||||
@@ -1108,7 +1119,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrTableMonat1});
|
||||
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.GroupHeader1.HeightF = 360F;
|
||||
this.GroupHeader1.Name = "GroupHeader1";
|
||||
this.GroupHeader1.StylePriority.UseFont = false;
|
||||
@@ -1117,6 +1129,17 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
|
||||
//
|
||||
// lblAbtretung
|
||||
//
|
||||
this.lblAbtretung.LocationFloat = new DevExpress.Utils.PointFloat(190.3117F, 102.1876F);
|
||||
this.lblAbtretung.Name = "lblAbtretung";
|
||||
this.lblAbtretung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.lblAbtretung.SizeF = new System.Drawing.SizeF(419.3965F, 20F);
|
||||
this.lblAbtretung.StylePriority.UseFont = false;
|
||||
this.lblAbtretung.StylePriority.UseTextAlignment = false;
|
||||
this.lblAbtretung.Text = "Eine Abtretungserklärung liegt vor.";
|
||||
this.lblAbtretung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
||||
//
|
||||
// AbrechnungsbogenFuD
|
||||
//
|
||||
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
|
||||
@@ -1131,18 +1154,14 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.fieldBillableFLS,
|
||||
this.fieldAbrechenbareFLS});
|
||||
this.DataSource = this.bindingSource1;
|
||||
this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
|
||||
this.formattingRuleStartDate,
|
||||
this.formattingRuleServiceDesc,
|
||||
this.formattingRuleCostBearer,
|
||||
this.formattingRuleEmployeeName});
|
||||
this.Margins = new System.Drawing.Printing.Margins(75, 75, 100, 30);
|
||||
this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 30F);
|
||||
this.PageHeight = 1169;
|
||||
this.PageWidth = 827;
|
||||
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
|
||||
this.SnapGridSize = 9F;
|
||||
this.Version = "17.1";
|
||||
this.Version = "23.2";
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableMonat1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
|
||||
@@ -1258,5 +1277,6 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
|
||||
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
|
||||
private DevExpress.XtraReports.UI.XRLine xrLine1;
|
||||
private DevExpress.XtraReports.UI.XRLabel lblAbtretung;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -142,6 +142,9 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
lblSummeErbracht.Text = String.Format("{0:0.00}", erbrachtGesamt);
|
||||
lblSummeDifferenz.Text = String.Format("{0:0.00}", bewilligungGesamt - erbrachtGesamt);
|
||||
|
||||
|
||||
lblAbtretung.Visible = VarFieldHelper.HatAbtretungserklaerung(c);
|
||||
|
||||
this.bindingSource1.DataSource = ro;
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -479,6 +479,7 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.xrTableCell266 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell322 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.lblAbtretung = new DevExpress.XtraReports.UI.XRLabel();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableMonat1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
|
||||
@@ -488,7 +489,7 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// Detail
|
||||
//
|
||||
this.Detail.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
|
||||
this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.Detail.HeightF = 0F;
|
||||
this.Detail.Name = "Detail";
|
||||
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
@@ -1860,7 +1861,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.xrLabel14,
|
||||
this.xrLabel13,
|
||||
this.xrLabel12});
|
||||
this.ReportHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.ReportHeader.HeightF = 120F;
|
||||
this.ReportHeader.Name = "ReportHeader";
|
||||
this.ReportHeader.StylePriority.UseFont = false;
|
||||
@@ -1869,7 +1871,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
this.lblMonat2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)));
|
||||
this.lblMonat2.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblMonat2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.lblMonat2.LocationFloat = new DevExpress.Utils.PointFloat(400F, 100F);
|
||||
this.lblMonat2.Multiline = true;
|
||||
this.lblMonat2.Name = "lblMonat2";
|
||||
@@ -1886,7 +1889,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
this.lblMonat1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)));
|
||||
this.lblMonat1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblMonat1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.lblMonat1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100F);
|
||||
this.lblMonat1.Multiline = true;
|
||||
this.lblMonat1.Name = "lblMonat1";
|
||||
@@ -2055,7 +2059,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// xrLabel1
|
||||
//
|
||||
this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel1.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.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 27.08336F);
|
||||
this.xrLabel1.Multiline = true;
|
||||
this.xrLabel1.Name = "xrLabel1";
|
||||
@@ -2095,7 +2100,6 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.xrLabel8,
|
||||
this.xrPictureBox1,
|
||||
this.xrLabel1});
|
||||
this.topMarginBand1.HeightF = 100F;
|
||||
this.topMarginBand1.Name = "topMarginBand1";
|
||||
this.topMarginBand1.StylePriority.UseFont = false;
|
||||
//
|
||||
@@ -2107,7 +2111,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// xrLabel11
|
||||
//
|
||||
this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(341.8749F, 52.08337F);
|
||||
this.xrLabel11.Multiline = true;
|
||||
this.xrLabel11.Name = "xrLabel11";
|
||||
@@ -2130,7 +2135,7 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// xrPictureBox1
|
||||
//
|
||||
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
|
||||
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
|
||||
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(651.4592F, 27.08336F);
|
||||
this.xrPictureBox1.Name = "xrPictureBox1";
|
||||
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(72.39581F, 50F);
|
||||
@@ -2144,20 +2149,22 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
// ReportFooter
|
||||
//
|
||||
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.lblAbtretung,
|
||||
this.xrPictureBox2,
|
||||
this.xrTable2,
|
||||
this.xrPanel4,
|
||||
this.cellPreisGesamt,
|
||||
this.xrLabel3,
|
||||
this.xrTable3});
|
||||
this.ReportFooter.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.ReportFooter.HeightF = 190F;
|
||||
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.ReportFooter.HeightF = 183.0209F;
|
||||
this.ReportFooter.Name = "ReportFooter";
|
||||
this.ReportFooter.StylePriority.UseFont = false;
|
||||
//
|
||||
// xrPictureBox2
|
||||
//
|
||||
this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
|
||||
this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
|
||||
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 105.0001F);
|
||||
this.xrPictureBox2.Name = "xrPictureBox2";
|
||||
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(165.4167F, 68.02088F);
|
||||
@@ -2244,7 +2251,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// xrTableCell275
|
||||
//
|
||||
this.xrTableCell275.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrTableCell275.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell275.Name = "xrTableCell275";
|
||||
this.xrTableCell275.StylePriority.UseFont = false;
|
||||
this.xrTableCell275.StylePriority.UseTextAlignment = false;
|
||||
@@ -2254,7 +2262,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// cellPreis2
|
||||
//
|
||||
this.cellPreis2.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cellPreis2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.cellPreis2.Name = "cellPreis2";
|
||||
this.cellPreis2.StylePriority.UseFont = false;
|
||||
this.cellPreis2.StylePriority.UseTextAlignment = false;
|
||||
@@ -2270,15 +2279,16 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.xrPanel4.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.donnerstagLabel,
|
||||
this.xrLine4});
|
||||
this.xrPanel4.LocationFloat = new DevExpress.Utils.PointFloat(268F, 60F);
|
||||
this.xrPanel4.LocationFloat = new DevExpress.Utils.PointFloat(268.0001F, 60F);
|
||||
this.xrPanel4.Name = "xrPanel4";
|
||||
this.xrPanel4.SizeF = new System.Drawing.SizeF(476.6883F, 113.0209F);
|
||||
this.xrPanel4.SizeF = new System.Drawing.SizeF(476.6883F, 103.0209F);
|
||||
this.xrPanel4.StylePriority.UseBorders = false;
|
||||
//
|
||||
// donnerstagLabel
|
||||
//
|
||||
this.donnerstagLabel.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.donnerstagLabel.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.donnerstagLabel.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.donnerstagLabel.LocationFloat = new DevExpress.Utils.PointFloat(10.00009F, 9.999977F);
|
||||
this.donnerstagLabel.Name = "donnerstagLabel";
|
||||
this.donnerstagLabel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
@@ -2301,7 +2311,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
this.cellPreisGesamt.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.cellPreisGesamt.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cellPreisGesamt.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.cellPreisGesamt.LocationFloat = new DevExpress.Utils.PointFloat(180F, 60F);
|
||||
this.cellPreisGesamt.Multiline = true;
|
||||
this.cellPreisGesamt.Name = "cellPreisGesamt";
|
||||
@@ -2319,7 +2330,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrLabel3.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60F);
|
||||
this.xrLabel3.Multiline = true;
|
||||
this.xrLabel3.Name = "xrLabel3";
|
||||
@@ -2413,7 +2425,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// xrTableCell9
|
||||
//
|
||||
this.xrTableCell9.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell9.Name = "xrTableCell9";
|
||||
this.xrTableCell9.StylePriority.UseFont = false;
|
||||
this.xrTableCell9.StylePriority.UseTextAlignment = false;
|
||||
@@ -2423,7 +2436,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// cellPreis1
|
||||
//
|
||||
this.cellPreis1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cellPreis1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.cellPreis1.Name = "cellPreis1";
|
||||
this.cellPreis1.StylePriority.UseFont = false;
|
||||
this.cellPreis1.StylePriority.UseTextAlignment = false;
|
||||
@@ -2455,7 +2469,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.xrTableMonat2,
|
||||
this.xrTableMonat1});
|
||||
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.GroupHeader1.HeightF = 690F;
|
||||
this.GroupHeader1.Name = "GroupHeader1";
|
||||
this.GroupHeader1.StylePriority.UseFont = false;
|
||||
@@ -3801,6 +3816,18 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
|
||||
//
|
||||
// lblAbtretung
|
||||
//
|
||||
this.lblAbtretung.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
|
||||
this.lblAbtretung.LocationFloat = new DevExpress.Utils.PointFloat(268.0001F, 163.0209F);
|
||||
this.lblAbtretung.Name = "lblAbtretung";
|
||||
this.lblAbtretung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.lblAbtretung.SizeF = new System.Drawing.SizeF(476.6882F, 20F);
|
||||
this.lblAbtretung.StylePriority.UseFont = false;
|
||||
this.lblAbtretung.StylePriority.UseTextAlignment = false;
|
||||
this.lblAbtretung.Text = "Eine Abtretungserklärung liegt vor.";
|
||||
this.lblAbtretung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
||||
//
|
||||
// AbrechnungsbogenReisen
|
||||
//
|
||||
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
|
||||
@@ -3815,18 +3842,19 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.fieldBillableFLS,
|
||||
this.fieldAbrechenbareFLS});
|
||||
this.DataSource = this.bindingSource1;
|
||||
this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
|
||||
this.formattingRuleStartDate,
|
||||
this.formattingRuleServiceDesc,
|
||||
this.formattingRuleCostBearer,
|
||||
this.formattingRuleEmployeeName});
|
||||
this.Margins = new System.Drawing.Printing.Margins(30, 20, 100, 30);
|
||||
this.Margins = new DevExpress.Drawing.DXMargins(30F, 20F, 100F, 30F);
|
||||
this.PageHeight = 1169;
|
||||
this.PageWidth = 827;
|
||||
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
|
||||
this.SnapGridSize = 9F;
|
||||
this.Version = "17.1";
|
||||
this.Version = "23.2";
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableMonat1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
|
||||
@@ -4287,5 +4315,6 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
private DevExpress.XtraReports.UI.XRTableCell cellSumme24;
|
||||
private DevExpress.XtraReports.UI.XRTableCell cellSumme14;
|
||||
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
|
||||
private DevExpress.XtraReports.UI.XRLabel lblAbtretung;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,6 +82,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
cellPreisGesamt.Text = String.Format("{0:c}", totalVerhinderungspflege1 + totalZusatz1 + totalKurzzeit1 + totalSelbstzahler1 +
|
||||
totalVerhinderungspflege2 + totalZusatz2 + totalKurzzeit2 + totalSelbstzahler2);
|
||||
|
||||
lblAbtretung.Visible = VarFieldHelper.HatAbtretungserklaerung(customer);
|
||||
|
||||
this.bindingSource1.DataSource = ro;
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -600,6 +600,7 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.xrTableCell265 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.xrTableCell266 = new DevExpress.XtraReports.UI.XRTableCell();
|
||||
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.lblAbtretung = new DevExpress.XtraReports.UI.XRLabel();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableMonat1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
|
||||
@@ -611,7 +612,7 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// Detail
|
||||
//
|
||||
this.Detail.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
|
||||
this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
|
||||
this.Detail.HeightF = 0F;
|
||||
this.Detail.Name = "Detail";
|
||||
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
|
||||
@@ -1788,7 +1789,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.xrLabel14,
|
||||
this.xrLabel13,
|
||||
this.xrLabel12});
|
||||
this.ReportHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.ReportHeader.HeightF = 120F;
|
||||
this.ReportHeader.Name = "ReportHeader";
|
||||
this.ReportHeader.StylePriority.UseFont = false;
|
||||
@@ -1797,7 +1799,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
this.lblMonat3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)));
|
||||
this.lblMonat3.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblMonat3.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.lblMonat3.LocationFloat = new DevExpress.Utils.PointFloat(537F, 100F);
|
||||
this.lblMonat3.Multiline = true;
|
||||
this.lblMonat3.Name = "lblMonat3";
|
||||
@@ -1814,7 +1817,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
this.lblMonat2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)));
|
||||
this.lblMonat2.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblMonat2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.lblMonat2.LocationFloat = new DevExpress.Utils.PointFloat(267.9998F, 100F);
|
||||
this.lblMonat2.Multiline = true;
|
||||
this.lblMonat2.Name = "lblMonat2";
|
||||
@@ -1831,7 +1835,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
this.lblMonat1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)));
|
||||
this.lblMonat1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblMonat1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.lblMonat1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100F);
|
||||
this.lblMonat1.Multiline = true;
|
||||
this.lblMonat1.Name = "lblMonat1";
|
||||
@@ -1846,7 +1851,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// lblAbrechnungsart
|
||||
//
|
||||
this.lblAbrechnungsart.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblAbrechnungsart.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.lblAbrechnungsart.LocationFloat = new DevExpress.Utils.PointFloat(0F, 65F);
|
||||
this.lblAbrechnungsart.Multiline = true;
|
||||
this.lblAbrechnungsart.Name = "lblAbrechnungsart";
|
||||
@@ -2013,7 +2019,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// xrLabel1
|
||||
//
|
||||
this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel1.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.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 27.08336F);
|
||||
this.xrLabel1.Multiline = true;
|
||||
this.xrLabel1.Name = "xrLabel1";
|
||||
@@ -2053,7 +2060,6 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.xrLabel8,
|
||||
this.xrPictureBox1,
|
||||
this.xrLabel1});
|
||||
this.topMarginBand1.HeightF = 100F;
|
||||
this.topMarginBand1.Name = "topMarginBand1";
|
||||
this.topMarginBand1.StylePriority.UseFont = false;
|
||||
//
|
||||
@@ -2065,7 +2071,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// xrLabel11
|
||||
//
|
||||
this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(340.8282F, 52.08337F);
|
||||
this.xrLabel11.Multiline = true;
|
||||
this.xrLabel11.Name = "xrLabel11";
|
||||
@@ -2088,7 +2095,7 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// xrPictureBox1
|
||||
//
|
||||
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
|
||||
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
|
||||
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(651.4592F, 27.08336F);
|
||||
this.xrPictureBox1.Name = "xrPictureBox1";
|
||||
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(72.39581F, 50F);
|
||||
@@ -2102,6 +2109,7 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
// ReportFooter
|
||||
//
|
||||
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
|
||||
this.lblAbtretung,
|
||||
this.xrPictureBox3,
|
||||
this.xrTable5,
|
||||
this.xrTable2,
|
||||
@@ -2109,14 +2117,15 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.cellPreisGesamt,
|
||||
this.xrLabel3,
|
||||
this.xrTable3});
|
||||
this.ReportFooter.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.ReportFooter.HeightF = 223F;
|
||||
this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.ReportFooter.HeightF = 223.0209F;
|
||||
this.ReportFooter.Name = "ReportFooter";
|
||||
this.ReportFooter.StylePriority.UseFont = false;
|
||||
//
|
||||
// xrPictureBox3
|
||||
//
|
||||
this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image")));
|
||||
this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
|
||||
this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 135F);
|
||||
this.xrPictureBox3.Name = "xrPictureBox3";
|
||||
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(165.4167F, 68.02088F);
|
||||
@@ -2168,7 +2177,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// cellStunden3
|
||||
//
|
||||
this.cellStunden3.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cellStunden3.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.cellStunden3.Multiline = true;
|
||||
this.cellStunden3.Name = "cellStunden3";
|
||||
this.cellStunden3.StylePriority.UseFont = false;
|
||||
@@ -2250,7 +2260,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// xrTableCell413
|
||||
//
|
||||
this.xrTableCell413.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrTableCell413.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell413.Name = "xrTableCell413";
|
||||
this.xrTableCell413.StylePriority.UseFont = false;
|
||||
this.xrTableCell413.StylePriority.UseTextAlignment = false;
|
||||
@@ -2260,7 +2271,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// cellPreis3
|
||||
//
|
||||
this.cellPreis3.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cellPreis3.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.cellPreis3.Name = "cellPreis3";
|
||||
this.cellPreis3.StylePriority.UseFont = false;
|
||||
this.cellPreis3.StylePriority.UseTextAlignment = false;
|
||||
@@ -2314,7 +2326,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// cellStunden2
|
||||
//
|
||||
this.cellStunden2.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cellStunden2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.cellStunden2.Multiline = true;
|
||||
this.cellStunden2.Name = "cellStunden2";
|
||||
this.cellStunden2.StylePriority.UseFont = false;
|
||||
@@ -2396,7 +2409,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// xrTableCell275
|
||||
//
|
||||
this.xrTableCell275.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrTableCell275.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell275.Name = "xrTableCell275";
|
||||
this.xrTableCell275.StylePriority.UseFont = false;
|
||||
this.xrTableCell275.StylePriority.UseTextAlignment = false;
|
||||
@@ -2406,7 +2420,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// cellPreis2
|
||||
//
|
||||
this.cellPreis2.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cellPreis2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.cellPreis2.Name = "cellPreis2";
|
||||
this.cellPreis2.StylePriority.UseFont = false;
|
||||
this.cellPreis2.StylePriority.UseTextAlignment = false;
|
||||
@@ -2430,7 +2445,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
// donnerstagLabel
|
||||
//
|
||||
this.donnerstagLabel.Borders = DevExpress.XtraPrinting.BorderSide.None;
|
||||
this.donnerstagLabel.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.donnerstagLabel.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.donnerstagLabel.LocationFloat = new DevExpress.Utils.PointFloat(10.00009F, 9.999977F);
|
||||
this.donnerstagLabel.Name = "donnerstagLabel";
|
||||
this.donnerstagLabel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
@@ -2453,7 +2469,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
this.cellPreisGesamt.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.cellPreisGesamt.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cellPreisGesamt.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.cellPreisGesamt.LocationFloat = new DevExpress.Utils.PointFloat(180F, 90.00002F);
|
||||
this.cellPreisGesamt.Multiline = true;
|
||||
this.cellPreisGesamt.Name = "cellPreisGesamt";
|
||||
@@ -2471,7 +2488,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
|
||||
| DevExpress.XtraPrinting.BorderSide.Right)
|
||||
| DevExpress.XtraPrinting.BorderSide.Bottom)));
|
||||
this.xrLabel3.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 90.00002F);
|
||||
this.xrLabel3.Multiline = true;
|
||||
this.xrLabel3.Name = "xrLabel3";
|
||||
@@ -2530,7 +2548,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// cellStunden1
|
||||
//
|
||||
this.cellStunden1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cellStunden1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.cellStunden1.Multiline = true;
|
||||
this.cellStunden1.Name = "cellStunden1";
|
||||
this.cellStunden1.StylePriority.UseFont = false;
|
||||
@@ -2612,7 +2631,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// xrTableCell9
|
||||
//
|
||||
this.xrTableCell9.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.xrTableCell9.Name = "xrTableCell9";
|
||||
this.xrTableCell9.StylePriority.UseFont = false;
|
||||
this.xrTableCell9.StylePriority.UseTextAlignment = false;
|
||||
@@ -2622,7 +2642,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
// cellPreis1
|
||||
//
|
||||
this.cellPreis1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cellPreis1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.cellPreis1.Name = "cellPreis1";
|
||||
this.cellPreis1.StylePriority.UseFont = false;
|
||||
this.cellPreis1.StylePriority.UseTextAlignment = false;
|
||||
@@ -2655,7 +2676,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.xrTableMonat3,
|
||||
this.xrTableMonat2,
|
||||
this.xrTableMonat1});
|
||||
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.GroupHeader1.HeightF = 660.0001F;
|
||||
this.GroupHeader1.Name = "GroupHeader1";
|
||||
this.GroupHeader1.StylePriority.UseFont = false;
|
||||
@@ -4944,6 +4966,18 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
//
|
||||
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
|
||||
//
|
||||
// lblAbtretung
|
||||
//
|
||||
this.lblAbtretung.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
|
||||
this.lblAbtretung.LocationFloat = new DevExpress.Utils.PointFloat(268.0001F, 203.0209F);
|
||||
this.lblAbtretung.Name = "lblAbtretung";
|
||||
this.lblAbtretung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
|
||||
this.lblAbtretung.SizeF = new System.Drawing.SizeF(476.6882F, 20F);
|
||||
this.lblAbtretung.StylePriority.UseFont = false;
|
||||
this.lblAbtretung.StylePriority.UseTextAlignment = false;
|
||||
this.lblAbtretung.Text = "Eine Abtretungserklärung liegt vor.";
|
||||
this.lblAbtretung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
|
||||
//
|
||||
// Abrechnungsbogen
|
||||
//
|
||||
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
|
||||
@@ -4958,18 +4992,19 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
this.fieldBillableFLS,
|
||||
this.fieldAbrechenbareFLS});
|
||||
this.DataSource = this.bindingSource1;
|
||||
this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
|
||||
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
|
||||
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
|
||||
this.formattingRuleStartDate,
|
||||
this.formattingRuleServiceDesc,
|
||||
this.formattingRuleCostBearer,
|
||||
this.formattingRuleEmployeeName});
|
||||
this.Margins = new System.Drawing.Printing.Margins(20, 20, 100, 30);
|
||||
this.Margins = new DevExpress.Drawing.DXMargins(20F, 20F, 100F, 30F);
|
||||
this.PageHeight = 1169;
|
||||
this.PageWidth = 827;
|
||||
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
|
||||
this.SnapGridSize = 9F;
|
||||
this.Version = "17.1";
|
||||
this.Version = "23.2";
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTableMonat1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
|
||||
@@ -5553,5 +5588,6 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
private DevExpress.XtraReports.UI.XRLabel lblMonat3;
|
||||
private DevExpress.XtraReports.UI.XRLabel lblMonat2;
|
||||
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
|
||||
private DevExpress.XtraReports.UI.XRLabel lblAbtretung;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -134,7 +134,8 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
cellPreisGesamt.Text = String.Format("{0:c}", GetPreisGesamt());
|
||||
|
||||
lblAbrechnungsart.Text = GetAbrechnungsText(ro);
|
||||
|
||||
|
||||
lblAbtretung.Visible = VarFieldHelper.HatAbtretungserklaerung(customer);
|
||||
|
||||
this.bindingSource1.DataSource = ro;
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -8,18 +8,33 @@ namespace HphBersenbrueckFreizeitUndReisen
|
||||
{
|
||||
public static String GetVarFieldForOid(long oid, Customer c)
|
||||
{
|
||||
foreach (var vv in c.VarFieldValueList)
|
||||
if (c != null)
|
||||
{
|
||||
if (vv.VarFieldDefOid.Value == oid)
|
||||
foreach (var vv in c.VarFieldValueList)
|
||||
{
|
||||
var varFieldValue = Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName));
|
||||
if (varFieldValue != null)
|
||||
if (vv.VarFieldDefOid.Value == oid)
|
||||
{
|
||||
return varFieldValue.ToString();
|
||||
var varFieldValue = Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName));
|
||||
if (varFieldValue != null)
|
||||
{
|
||||
return varFieldValue.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static bool HatAbtretungserklaerung(Customer c)
|
||||
{
|
||||
var vf = GetVarFieldForOid(9, c);
|
||||
|
||||
if (!String.IsNullOrEmpty(vf) && vf.ToLower() == "true")
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -65,6 +65,7 @@
|
||||
<Compile Include="Finanzauswertung.designer.cs">
|
||||
<DependentUpon>Finanzauswertung.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Import\AbschlagszahlungImport.cs" />
|
||||
<Compile Include="Mitarbeiterauslastung.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
@@ -155,5 +156,6 @@
|
||||
<ItemGroup>
|
||||
<None Include="app.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
21
ReportImp/Humanitas/Import/AbschlagszahlungImport.cs
Normal file
21
ReportImp/Humanitas/Import/AbschlagszahlungImport.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using BeWo.Data.Access;
|
||||
using BeWo.Data.Entities;
|
||||
using BeWo.Service.MessageContracts;
|
||||
using BeWo.Service.Plugins;
|
||||
using DevExpress.XtraPrinting.Native;
|
||||
|
||||
namespace Humanitas.Import
|
||||
{
|
||||
public class AbschlagszahlungImport : DataImporter
|
||||
{
|
||||
|
||||
public override UploadImportFileResult ImportData(string filename, byte[] daten)
|
||||
{
|
||||
return ImportLvrAvise(filename, daten);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -217,14 +217,18 @@ namespace PerspektivenEV.Invoicing
|
||||
{
|
||||
LG = (decimal)GetLeistungsgruppe(supportConceptApprovalPeriod.ApprovedBEPerInterval, cat);
|
||||
ii.Notice = LG.ToString();
|
||||
if (cat.Abbreviation.ToLower().Substring(cat.Abbreviation.Length - 3) == "alt")
|
||||
if (data != null && data.Count != 0)
|
||||
{
|
||||
ii.AmountPerUnit = LG * (decimal)Math.Round((double)data[0].AmountTotal / 60, 4, MidpointRounding.AwayFromZero);
|
||||
}
|
||||
else
|
||||
{
|
||||
ii.AmountPerUnit = (decimal)Math.Round((double)data[0].AmountTotal * Math.Round((double)LG / 60, 2, MidpointRounding.AwayFromZero), 2, MidpointRounding.AwayFromZero);
|
||||
if (cat.Abbreviation.ToLower().Substring(cat.Abbreviation.Length - 3) == "alt")
|
||||
{
|
||||
ii.AmountPerUnit = LG * (decimal)Math.Round((double)data[0].AmountTotal / 60, 4, MidpointRounding.AwayFromZero);
|
||||
}
|
||||
else
|
||||
{
|
||||
ii.AmountPerUnit = (decimal)Math.Round((double)data[0].AmountTotal * Math.Round((double)LG / 60, 2, MidpointRounding.AwayFromZero), 2, MidpointRounding.AwayFromZero);
|
||||
}
|
||||
}
|
||||
|
||||
// Leistung
|
||||
if (cat.Abbreviation.Substring(cat.Abbreviation.Length - 2) == "QA" || cat.Abbreviation.Substring(cat.Abbreviation.Length - 5) == "QAAlt")
|
||||
{
|
||||
|
||||
@@ -64,7 +64,7 @@ namespace BeWo.Service.Import.AvisImport
|
||||
{
|
||||
if (ergebnis.Length > 0)
|
||||
ergebnis.Append("\n");
|
||||
ergebnis.Append(avis.Verwendungszweck);
|
||||
ergebnis.Append(String.Format("{0}, {1}, {2:MMMM.yyyy}", avis.Klient, avis.Aktenzeichen, avis.GueltigkeitsDatum));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -101,28 +101,32 @@ namespace BeWo.Service.Import.AvisImport
|
||||
public virtual bool VergleicheAvisMitHilfeplan(Avis avis, HilfeplanInfo hp)
|
||||
{
|
||||
//Prüfe ob Aktenzeichen vorkommt
|
||||
|
||||
//Prüfe ob Klientname vorkommt
|
||||
var nameBuchung = avis.Verwendungszweck.ToLower();
|
||||
|
||||
var nachname = hp.CustomerLastName.ToLower();
|
||||
var vorname = hp.CustomerFirstName.ToLower();
|
||||
nachname = nachname.Replace("ö", "oe");
|
||||
nachname = nachname.Replace("ü", "ue");
|
||||
nachname = nachname.Replace("ä", "ae");
|
||||
nachname = nachname.Replace("ß", "ss");
|
||||
vorname = vorname.Replace("ö", "oe");
|
||||
vorname = vorname.Replace("ü", "ue");
|
||||
vorname = vorname.Replace("ä", "ae");
|
||||
vorname = vorname.Replace("ß", "ss");
|
||||
|
||||
var name = String.Format("{0}{1}", nachname, vorname);
|
||||
|
||||
if (nameBuchung.Contains(name))
|
||||
if (!String.IsNullOrEmpty(hp.Aktenzeichen) && hp.Aktenzeichen.Contains(avis.Aktenzeichen))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
//Prüfe ob Klientname vorkommt
|
||||
//var nameBuchung = avis.Verwendungszweck.ToLower();
|
||||
|
||||
//var nachname = hp.CustomerLastName.ToLower();
|
||||
//var vorname = hp.CustomerFirstName.ToLower();
|
||||
//nachname = nachname.Replace("ö", "oe");
|
||||
//nachname = nachname.Replace("ü", "ue");
|
||||
//nachname = nachname.Replace("ä", "ae");
|
||||
//nachname = nachname.Replace("ß", "ss");
|
||||
//vorname = vorname.Replace("ö", "oe");
|
||||
//vorname = vorname.Replace("ü", "ue");
|
||||
//vorname = vorname.Replace("ä", "ae");
|
||||
//vorname = vorname.Replace("ß", "ss");
|
||||
|
||||
//var name = String.Format("{0}{1}", nachname, vorname);
|
||||
|
||||
//if (nameBuchung.Contains(name))
|
||||
//{
|
||||
// return true;
|
||||
//}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -11,14 +11,7 @@ namespace BeWo.Service.Plugins
|
||||
//muss überschrieben werden. Es gibt keinen Standardimport
|
||||
#if DEBUG
|
||||
//das ist nur zum Testen
|
||||
var aviseImport = new LvrAviseImporter();
|
||||
var message = aviseImport.ImportAvise(filename, daten);
|
||||
|
||||
var result = new UploadImportFileResult();
|
||||
result.Success = true;
|
||||
result.ResultMessage = message;
|
||||
|
||||
return result;
|
||||
return ImportLvrAvise(filename, daten);
|
||||
|
||||
#endif
|
||||
return new UploadImportFileResult
|
||||
@@ -29,5 +22,17 @@ namespace BeWo.Service.Plugins
|
||||
|
||||
}
|
||||
|
||||
public virtual UploadImportFileResult ImportLvrAvise(string filename, byte[] daten)
|
||||
{
|
||||
var aviseImport = new LvrAviseImporter();
|
||||
var message = aviseImport.ImportAvise(filename, daten);
|
||||
|
||||
var result = new UploadImportFileResult();
|
||||
result.Success = true;
|
||||
result.ResultMessage = message;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ namespace BeWo.Service.Plugins
|
||||
//t = "1193188501"; // Aids Hilfe Dortmund
|
||||
//t = "7860351957"; // SKF Alsdorf
|
||||
//t = "3311520228"; // Die Düne
|
||||
t = "1352143437"; // Sewo
|
||||
//t = "1352143437"; // Sewo
|
||||
//t = "7107514623"; // BeWo Neuss
|
||||
//t = "9098141768"; // Fib e.V. Marburg
|
||||
//t = "1505148718"; // VSD Hamm
|
||||
@@ -105,7 +105,7 @@ namespace BeWo.Service.Plugins
|
||||
//t = "3350425974"; // BeWo Rückenwind
|
||||
//t = "9447917179"; // LH Rodenkirchen
|
||||
//t = "4690407894"; // Bleib im Leben
|
||||
t = "2509786400"; // LH Stade
|
||||
//t = "2509786400"; // LH Stade
|
||||
//t = "8677523325"; // BeWo Richartz
|
||||
//t = "1765854593"; // Mein Betreutes Wohnen
|
||||
//t = "6802909544"; // Lebenshilfe Coburg
|
||||
@@ -153,7 +153,7 @@ namespace BeWo.Service.Plugins
|
||||
//t = "7381352241"; // Ressource e.V.
|
||||
//t = "3607551608"; // Betreuungsbüro Scholz
|
||||
//t = "3104936392"; // B.A.P. Bielefelder Ambulante Pflege
|
||||
//t = "1106039294"; // Hph Bersenbrück ATZ
|
||||
t = "1106039294"; // Hph Bersenbrück ATZ
|
||||
//t = "5562845955"; // Praunheimer Werkstätten
|
||||
//t = "4801617798"; // Severin
|
||||
//t = "1172092025"; // Flingern
|
||||
|
||||
@@ -88,9 +88,6 @@ namespace BeWo.Service.SBD
|
||||
|
||||
public virtual List<VertretungsItemDC> CreateSubstitutions(DateTime start, DateTime end)
|
||||
{
|
||||
Dictionary<String, bool> employeeIsAbsenceDict = new Dictionary<String, bool>();
|
||||
Dictionary<String, bool> customerIsAbsenceDict = new Dictionary<String, bool>();
|
||||
|
||||
var vertretungsItems = new List<VertretungsItemDC>();
|
||||
|
||||
end = end.Date.AddDays(1).AddTicks(-1);
|
||||
@@ -130,140 +127,27 @@ namespace BeWo.Service.SBD
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if (employee.Person.LastName == "Pernusch")
|
||||
|
||||
List<VertretungsItemDC> items = CreateVertretungsItemsForAbsenceEmployee(employee, vertretungen, absenceTime, start, end);
|
||||
employeeVertretungsItems.AddRange(items);
|
||||
|
||||
}
|
||||
|
||||
// Vertretungen deren Klient wiederrum vertreten werden muss
|
||||
foreach (var vertretung in vertretungen)
|
||||
{
|
||||
if (vertretung.VertretenderMitarbeiterOid.HasValue)
|
||||
{
|
||||
int test = 0;
|
||||
}
|
||||
|
||||
var employeeDC = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(employee);
|
||||
var employeeAddressString = GetEmployeeAddressInfo(employee);
|
||||
var employeeContactInformationList = LoadContactInformationForEntity<Employee>(employee.Person);
|
||||
|
||||
var absenceTimeDC = MapperFactory.AbsenceTimeDC_AbsenceTime.MapToNewDC(absenceTime);
|
||||
|
||||
foreach (var employee2Customer in employee.Employee2CustomerList.Where(e2C => e2C.IsActive == ActivationTypeId.Active && (!e2C.StartDate.HasValue || e2C.StartDate.Value.Date <= end.Date) && (!e2C.EndDate.HasValue || e2C.EndDate.Value.Date >= start.Date)))
|
||||
{
|
||||
foreach (var valueListEntry2Object in employee2Customer.ValueList.Where(entry2Object => entry2Object.Entry.Type == ValueListEntryType.StaffRoleType))
|
||||
if (employeeAbsenceTimes.Count(ea => ea.EmployeeOid.HasValue && ea.EmployeeOid.Value == vertretung.VertretenderMitarbeiterOid.Value) == 0)
|
||||
{
|
||||
var customer = employee2Customer.Customer;
|
||||
var customerDC = MapperFactory.CompactCustomerDC_Customer.MapToNewDC(customer);
|
||||
if (customer.Person.LastName == "Beran")
|
||||
{
|
||||
var employee = DAOFactory.GenericDAO.LoadByID<Employee>(vertretung.VertretenderMitarbeiterOid.Value);
|
||||
|
||||
}
|
||||
var customerContactInformationList = LoadContactInformationForEntity<Customer>(customer.Person);
|
||||
var c2oList = customer.Customer2OrganisationList.Where(customer2Organisation => customer2Organisation.ValueList.Any(b => b.Entry.Type == ValueListEntryType.EnvironmentOrganisationType && IstSchule(b.Entry.Value))).ToList();
|
||||
var schools = MapperFactory.CustomerOrganisationRelationDC_Customer2Organisation.MapToNewDCs(c2oList);
|
||||
Organisation schule = null;
|
||||
if (c2oList.Count > 0)
|
||||
{
|
||||
schule = c2oList[0].Organisation;
|
||||
|
||||
}
|
||||
var assistanceTimeEntries = GetAssistanceTimesForCustomer(customer, employee, absenceTime, start, end);
|
||||
|
||||
var dateTime = start;
|
||||
while (dateTime <= end)
|
||||
{
|
||||
if (LiegtImZeitraum(dateTime, absenceTime))
|
||||
{
|
||||
AddToDict(employeeIsAbsenceDict, dateTime, employee.Oid.Value);
|
||||
|
||||
var dateTimeCopy = dateTime;
|
||||
var relevantAssistanceTimeEntries = assistanceTimeEntries.Where(entry => IsAbsenceTimeInAssistanceTime(dateTimeCopy, entry, absenceTime));
|
||||
|
||||
foreach (var assistanceTimeEntry in relevantAssistanceTimeEntries)
|
||||
{
|
||||
var vertretungsObjekte = vertretungen.Where(w => w.EmployeeOid.HasValue && w.EmployeeOid.Equals(employee.Oid) && w.CustomerOid.HasValue && w.CustomerOid.Equals(customer.Oid) && w.VertretungsZeitraumVon.Date <= dateTimeCopy && w.VertretungsZeitraumBis.Date >= dateTimeCopy);
|
||||
var lastSubstitutions = DAOFactory.SearchDAO.GetLastSubstitutionItems(employee.Oid.Value, 3);
|
||||
var lastSubstitutionDCs = MapperFactory.VertretungDC_Vertretung.MapToNewDCs(lastSubstitutions);
|
||||
var assistanceTimeEntryDC = MapperFactory.ArbeitszeitEintragDC_ArbeitszeitEintrag.MapToNewDC(assistanceTimeEntry);
|
||||
|
||||
var newVertretungsItem = new VertretungsItemDC
|
||||
{
|
||||
Id = Guid.NewGuid(),
|
||||
Datum = dateTime,
|
||||
Absencetime = absenceTimeDC,
|
||||
AssistanceTime = assistanceTimeEntryDC,
|
||||
BetreuungszeitenAmDatum = assistanceTimeEntryDC != null ? assistanceTimeEntryDC.ToString() : String.Empty,
|
||||
AlleBetreuungszeiten = GetBetreuungszeitenString(assistanceTimeEntries),
|
||||
Employee = employeeDC,
|
||||
EmployeeAddressString = employeeAddressString,
|
||||
LastSubstitutions = lastSubstitutionDCs,
|
||||
Customer = customerDC,
|
||||
CustomerContactInformation = customerContactInformationList,
|
||||
EmployeeContactInformation = employeeContactInformationList,
|
||||
Schools = schools,
|
||||
Bemerkung = absenceTime.Notice
|
||||
};
|
||||
|
||||
AddKrankheitsZeitraumAndMeldungToItem(newVertretungsItem, newVertretungsItem.Absencetime);
|
||||
GetVertretungsstatus(newVertretungsItem, dateTime, absenceTime.Start.Value, customer);
|
||||
|
||||
//Es kann in Ausnahmen mehrere Vertretungen für den gleichen erkrankten MA geben. Z.B. wenn die erste Vertretung selber erkrankt und eine zweite ausgewählt wird.
|
||||
|
||||
Vertretung vertretung = null;
|
||||
Employee vertreter = null;
|
||||
|
||||
foreach (var vo in vertretungsObjekte)
|
||||
{
|
||||
if (vo.VertretenderMitarbeiterOid.HasValue)
|
||||
{
|
||||
vertreter = DAOFactory.GenericDAO.LoadByID<Employee>(vo.VertretenderMitarbeiterOid.Value);
|
||||
|
||||
if (!IstAbwesend(vertreter.AbsenceTimes, dateTime))
|
||||
{
|
||||
vertretung = vo;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (vertretung?.VertretenderMitarbeiterOid != null)
|
||||
{
|
||||
if (GetIsSubstitutedCompletely(new List<ArbeitszeitEintrag> {assistanceTimeEntry}, vertretung, dateTime))
|
||||
{
|
||||
if (vertreter == null)
|
||||
{
|
||||
vertreter = DAOFactory.GenericDAO.LoadByID<Employee>(vertretung.VertretenderMitarbeiterOid.Value);
|
||||
}
|
||||
var substitutionEmployeeDC = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(vertreter);
|
||||
|
||||
newVertretungsItem.Vertreter = substitutionEmployeeDC;
|
||||
|
||||
newVertretungsItem.VertreterInfoString = GetEmployeeAddressInfo(vertreter);
|
||||
|
||||
newVertretungsItem.Vertretung = MapperFactory.VertretungDC_Vertretung.MapToNewDC(vertretung);
|
||||
newVertretungsItem.Bemerkung = vertretung.Notice;
|
||||
|
||||
newVertretungsItem.VertretungsStatus = VertretungsStatus.MaKrankVertretungVorhanden;
|
||||
|
||||
//if (IstAbwesend(vertreter.AbsenceTimes, dateTime))
|
||||
//{
|
||||
// newVertretungsItem.VertretungsStatus = VertretungsStatus.MaKrankVertretungBenoetigt;
|
||||
// newVertretungsItem.Vertreter = null;
|
||||
// newVertretungsItem.VertreterInfoString = null;
|
||||
// newVertretungsItem.Vertretung = null;
|
||||
//}
|
||||
}
|
||||
}
|
||||
|
||||
SetSubstitutionColor(newVertretungsItem);
|
||||
|
||||
SetSBDInformation(newVertretungsItem, customer, employee, true);
|
||||
SetMailInfos(newVertretungsItem, customer, employee, vertreter, schule);
|
||||
SetTeamleitung(employee, newVertretungsItem);
|
||||
|
||||
employeeVertretungsItems.Add(newVertretungsItem);
|
||||
}
|
||||
}
|
||||
|
||||
dateTime = dateTime.AddDays(1);
|
||||
}
|
||||
List<VertretungsItemDC> items = CreateVertretungsItemsForAbsenceEmployee(employee, vertretungen, null, start, end);
|
||||
employeeVertretungsItems.AddRange(items);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
// Klientenabwesenheiten
|
||||
@@ -344,8 +228,6 @@ namespace BeWo.Service.SBD
|
||||
{
|
||||
if (LiegtImZeitraum(dateTime, absenceTime))
|
||||
{
|
||||
AddToDict(customerIsAbsenceDict, dateTime, customer.Oid.Value);
|
||||
|
||||
var dateTimeCopy = dateTime;
|
||||
var relevantAssistanceTimeEntries = assistanceTimeEntries.Where(entry => IsAbsenceTimeInAssistanceTime(dateTime, entry, absenceTime) && (entry.Employee != null && entry.Employee.Equals(employee) || entry.Employee == null && employee.Equals(hauptbetreuer))).ToList();
|
||||
var vertretungsObjekte = vertretungen.Where(w => w.EmployeeOid.HasValue && w.EmployeeOid.Equals(employee.Oid) && w.CustomerOid.HasValue && w.CustomerOid.Equals(customer.Oid) && w.VertretungsZeitraumVon.Date <= dateTimeCopy && w.VertretungsZeitraumBis.Date >= dateTimeCopy).ToList();
|
||||
@@ -527,6 +409,153 @@ namespace BeWo.Service.SBD
|
||||
return vertretungsItems;
|
||||
}
|
||||
|
||||
|
||||
//Erstellt Vertretungsitems für abwesenden MA oder MA, der als Vertreter bei einem anderen Klienten eingesetzt ist, so dass sein eigener Klient betreut werden muss
|
||||
public virtual List<VertretungsItemDC> CreateVertretungsItemsForAbsenceEmployee(Employee employee, List<Vertretung> vorhandeneVertretungen, AbsenceTime absenceTime, DateTime start, DateTime end)
|
||||
{
|
||||
var result = new List<VertretungsItemDC>();
|
||||
|
||||
var employeeDC = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(employee);
|
||||
var employeeAddressString = GetEmployeeAddressInfo(employee);
|
||||
var employeeContactInformationList = LoadContactInformationForEntity<Employee>(employee.Person);
|
||||
AbsenceTimeDC absenceTimeDC = null;
|
||||
if (absenceTime != null)
|
||||
{
|
||||
absenceTimeDC = MapperFactory.AbsenceTimeDC_AbsenceTime.MapToNewDC(absenceTime);
|
||||
}
|
||||
|
||||
foreach (var employee2Customer in employee.Employee2CustomerList.Where(e2C => e2C.IsActive == ActivationTypeId.Active && (!e2C.StartDate.HasValue || e2C.StartDate.Value.Date <= end.Date) && (!e2C.EndDate.HasValue || e2C.EndDate.Value.Date >= start.Date)))
|
||||
{
|
||||
foreach (var valueListEntry2Object in employee2Customer.ValueList.Where(entry2Object => entry2Object.Entry.Type == ValueListEntryType.StaffRoleType))
|
||||
{
|
||||
var customer = employee2Customer.Customer;
|
||||
var customerDC = MapperFactory.CompactCustomerDC_Customer.MapToNewDC(customer);
|
||||
|
||||
var customerContactInformationList = LoadContactInformationForEntity<Customer>(customer.Person);
|
||||
var c2oList = customer.Customer2OrganisationList.Where(customer2Organisation => customer2Organisation.ValueList.Any(b => b.Entry.Type == ValueListEntryType.EnvironmentOrganisationType && IstSchule(b.Entry.Value))).ToList();
|
||||
var schools = MapperFactory.CustomerOrganisationRelationDC_Customer2Organisation.MapToNewDCs(c2oList);
|
||||
Organisation schule = null;
|
||||
if (c2oList.Count > 0)
|
||||
{
|
||||
schule = c2oList[0].Organisation;
|
||||
|
||||
}
|
||||
|
||||
var assistanceTimeEntries = GetAssistanceTimesForCustomer(customer, employee, absenceTime, start, end);
|
||||
|
||||
var dateTime = start;
|
||||
while (dateTime <= end)
|
||||
{
|
||||
if (absenceTime == null || LiegtImZeitraum(dateTime, absenceTime))
|
||||
{
|
||||
var dateTimeCopy = dateTime;
|
||||
var relevantAssistanceTimeEntries = assistanceTimeEntries.Where(entry => IsAbsenceTimeInAssistanceTime(dateTimeCopy, entry, absenceTime));
|
||||
|
||||
foreach (var assistanceTimeEntry in relevantAssistanceTimeEntries)
|
||||
{
|
||||
var vertretungsObjekte = vorhandeneVertretungen.Where(w => w.EmployeeOid.HasValue && w.EmployeeOid.Equals(employee.Oid) && w.CustomerOid.HasValue && w.CustomerOid.Equals(customer.Oid) && w.VertretungsZeitraumVon.Date <= dateTimeCopy && w.VertretungsZeitraumBis.Date >= dateTimeCopy);
|
||||
var lastSubstitutions = DAOFactory.SearchDAO.GetLastSubstitutionItems(employee.Oid.Value, 3);
|
||||
var lastSubstitutionDCs = MapperFactory.VertretungDC_Vertretung.MapToNewDCs(lastSubstitutions);
|
||||
var assistanceTimeEntryDC = MapperFactory.ArbeitszeitEintragDC_ArbeitszeitEintrag.MapToNewDC(assistanceTimeEntry);
|
||||
|
||||
var newVertretungsItem = new VertretungsItemDC
|
||||
{
|
||||
Id = Guid.NewGuid(),
|
||||
Datum = dateTime,
|
||||
Absencetime = absenceTimeDC,
|
||||
AssistanceTime = assistanceTimeEntryDC,
|
||||
BetreuungszeitenAmDatum = assistanceTimeEntryDC != null ? assistanceTimeEntryDC.ToString() : String.Empty,
|
||||
AlleBetreuungszeiten = GetBetreuungszeitenString(assistanceTimeEntries),
|
||||
Employee = employeeDC,
|
||||
EmployeeAddressString = employeeAddressString,
|
||||
LastSubstitutions = lastSubstitutionDCs,
|
||||
Customer = customerDC,
|
||||
CustomerContactInformation = customerContactInformationList,
|
||||
EmployeeContactInformation = employeeContactInformationList,
|
||||
Schools = schools,
|
||||
Bemerkung = absenceTime?.Notice
|
||||
};
|
||||
if (newVertretungsItem.Absencetime != null)
|
||||
{
|
||||
AddKrankheitsZeitraumAndMeldungToItem(newVertretungsItem, newVertretungsItem.Absencetime);
|
||||
}
|
||||
DateTime absenceTimeStartDate = newVertretungsItem.Datum;
|
||||
if (absenceTime != null)
|
||||
{
|
||||
absenceTimeStartDate = absenceTime.Start.Value;
|
||||
}
|
||||
GetVertretungsstatus(newVertretungsItem, dateTime, absenceTimeStartDate, customer);
|
||||
if (absenceTime == null && newVertretungsItem.VertretungsStatus == VertretungsStatus.MaKrankKeineVertretungBenoetigt)
|
||||
{
|
||||
newVertretungsItem.VertretungsStatus = VertretungsStatus.MaKrankVertretungBenoetigt;
|
||||
}
|
||||
//Es kann in Ausnahmen mehrere Vertretungen für den gleichen erkrankten MA geben. Z.B. wenn die erste Vertretung selber erkrankt und eine zweite ausgewählt wird.
|
||||
Vertretung vertretung = null;
|
||||
Employee vertreter = null;
|
||||
|
||||
foreach (var vo in vertretungsObjekte)
|
||||
{
|
||||
if (vo.VertretenderMitarbeiterOid.HasValue)
|
||||
{
|
||||
vertreter = DAOFactory.GenericDAO.LoadByID<Employee>(vo.VertretenderMitarbeiterOid.Value);
|
||||
|
||||
if (!IstAbwesend(vertreter.AbsenceTimes, dateTime))
|
||||
{
|
||||
vertretung = vo;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (vertretung?.VertretenderMitarbeiterOid != null)
|
||||
{
|
||||
if (GetIsSubstitutedCompletely(new List<ArbeitszeitEintrag> { assistanceTimeEntry }, vertretung, dateTime))
|
||||
{
|
||||
if (vertreter == null)
|
||||
{
|
||||
vertreter = DAOFactory.GenericDAO.LoadByID<Employee>(vertretung.VertretenderMitarbeiterOid.Value);
|
||||
}
|
||||
var substitutionEmployeeDC = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(vertreter);
|
||||
|
||||
newVertretungsItem.Vertreter = substitutionEmployeeDC;
|
||||
|
||||
newVertretungsItem.VertreterInfoString = GetEmployeeAddressInfo(vertreter);
|
||||
|
||||
newVertretungsItem.Vertretung = MapperFactory.VertretungDC_Vertretung.MapToNewDC(vertretung);
|
||||
newVertretungsItem.Bemerkung = vertretung.Notice;
|
||||
|
||||
newVertretungsItem.VertretungsStatus = VertretungsStatus.MaKrankVertretungVorhanden;
|
||||
|
||||
//if (IstAbwesend(vertreter.AbsenceTimes, dateTime))
|
||||
//{
|
||||
// newVertretungsItem.VertretungsStatus = VertretungsStatus.MaKrankVertretungBenoetigt;
|
||||
// newVertretungsItem.Vertreter = null;
|
||||
// newVertretungsItem.VertreterInfoString = null;
|
||||
// newVertretungsItem.Vertretung = null;
|
||||
//}
|
||||
}
|
||||
}
|
||||
|
||||
SetSubstitutionColor(newVertretungsItem);
|
||||
|
||||
SetSBDInformation(newVertretungsItem, customer, employee, true);
|
||||
SetMailInfos(newVertretungsItem, customer, employee, vertreter, schule);
|
||||
SetTeamleitung(employee, newVertretungsItem);
|
||||
|
||||
result.Add(newVertretungsItem);
|
||||
}
|
||||
}
|
||||
|
||||
dateTime = dateTime.AddDays(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private bool IstAbwesend(IList<AbsenceTime> absenceTimes, DateTime datum)
|
||||
{
|
||||
foreach (var at in absenceTimes)
|
||||
@@ -593,15 +622,6 @@ namespace BeWo.Service.SBD
|
||||
return newList;
|
||||
}
|
||||
|
||||
private void AddToDict(Dictionary<string, bool> dict, DateTime dateTime, long oid)
|
||||
{
|
||||
String key = String.Format("{0:ddMMyyyy}_{1}", dateTime, oid);
|
||||
if (!dict.ContainsKey(key))
|
||||
{
|
||||
dict.Add(key, true);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual List<VertretungsItemDC> CreateVertretungsListe(DateTime start, DateTime end)
|
||||
{
|
||||
return CreateSubstitutions(start, end);
|
||||
@@ -1416,11 +1436,14 @@ namespace BeWo.Service.SBD
|
||||
|
||||
public virtual bool IsAbsenceTimeInAssistanceTime(DateTime currentDate, ArbeitszeitEintrag assistanceTime, AbsenceTime absenceTime)
|
||||
{
|
||||
if (currentDate.DayOfWeek != DateTimeUtils.ConvertAppointmentDayOfWeekToDayOfWeek(assistanceTime.Tag) || absenceTime.Start == null)
|
||||
if (currentDate.DayOfWeek != DateTimeUtils.ConvertAppointmentDayOfWeekToDayOfWeek(assistanceTime.Tag))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (absenceTime == null)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
var assistanceTimeDates = DateTimeUtils.GetAssistanceTimeComparisonDateTime(assistanceTime.UhrzeitVon, assistanceTime.UhrzeitBis, currentDate);
|
||||
|
||||
var absenceTimeEnd = absenceTime.End;
|
||||
@@ -1485,7 +1508,7 @@ namespace BeWo.Service.SBD
|
||||
var dateTime = start;
|
||||
while (dateTime <= end)
|
||||
{
|
||||
if (LiegtImZeitraum(dateTime, absenceTime))
|
||||
if (absenceTime == null || LiegtImZeitraum(dateTime, absenceTime))
|
||||
{
|
||||
customerAssistanceTimes.AddRange(allCustomerAssistanceTimes.Where(w => IsArbeitszeitValid(w, dateTime)));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user